From 1cd0642304ec68d36c8df19378feb4f6066c2980 Mon Sep 17 00:00:00 2001 From: wangh <123456> Date: Tue, 16 Jul 2024 09:46:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/broad/ApiController.java | 71 ++++++++++---- .../resources/templates/board/board3.html | 28 +++--- .../manage/domain/RecordRaramDataB.java | 94 +++++++++++++++++++ .../com/haiwei/manage/mapper/ApiMapper.java | 6 ++ .../haiwei/manage/service/IApiService.java | 4 + .../manage/service/impl/ApiServiceImpl.java | 11 +++ .../resources/mapper/manage/ApiMapper.xml | 33 +++++++ 7 files changed, 216 insertions(+), 31 deletions(-) create mode 100644 haiwei-manage/src/main/java/com/haiwei/manage/domain/RecordRaramDataB.java 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 725d132..e39f9cf 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 @@ -7,6 +7,7 @@ import static com.haiwei.common.core.domain.AjaxResult.*; import com.haiwei.common.utils.poi.ExcelUtil_2; import com.haiwei.manage.domain.DeviceState; import com.haiwei.manage.domain.RecordRaramData; +import com.haiwei.manage.domain.RecordRaramDataB; import com.haiwei.manage.service.IApiService; import com.haiwei.manage.service.IBaseCustomerService; import com.haiwei.manage.service.IBaseDeviceInfoService; @@ -66,36 +67,40 @@ public class ApiController { @ApiOperation(tags = {"60脱水机"}, value = "获取设备状态 msg字段") @GetMapping("/home/queryDeviceState") public AjaxResult queryDeviceState(String name) { - int i=name.equals("60型一体机A")?2:8; - return success(iApiService.queryDeviceState(i,i+2)); + int i = name.equals("60型一体机A") ? 2 : 8; + return success(iApiService.queryDeviceState(i, i + 2)); } - @ApiOperation(tags = {"60脱水机"}, value = "获取历史趋势") - @GetMapping("/home/queryParamList") - public AjaxResult queryPramList( Date beginTime, Date endTime) { - - return success(iApiService.queryPramList(beginTime, endTime)); + @ApiOperation(tags = {"60脱水机"}, value = "设备介绍") + @GetMapping("/home/deviceInfo") + public AjaxResult deviceInfo(String name) { + return success(baseDeviceInfoService.selectBaseDeviceInfoListByName(name)); } + + // //查询数据 + // @ApiOperation(tags = {"60脱水机"}, value = "获取历史趋势") + // @GetMapping("/home/queryParamList") + // public AjaxResult queryPramList( Date beginTime, Date endTime) { + // + // return success(iApiService.queryPramList(beginTime, endTime)); + // } @ApiOperation(tags = {"60脱水机"}, value = "获取数据记录") @GetMapping("/home/queryParamData") public AjaxResult queryParamData(@RequestParam(defaultValue = "1") int timeInterval, Date beginTime, Date endTime) { - System.out.println("时间间隔"+timeInterval); - return success(iApiService.queryParamData(timeInterval,beginTime, endTime)); + System.out.println("时间间隔" + timeInterval); + return success(iApiService.queryParamData(timeInterval, beginTime, endTime)); } @ApiOperation(tags = {"60脱水机"}, value = "导出数据记录") @PostMapping("/home/exportParamList") @ResponseBody - public AjaxResult export(String name, String type, String colms,@RequestParam(defaultValue = "1") int timeInterval, Date beginTime, Date endTime) { - System.out.println("显示列："+colms); - List list = iApiService.queryParamData(timeInterval,beginTime, endTime); + public AjaxResult export(String name, String type, String colms, @RequestParam(defaultValue = "1") int timeInterval, Date beginTime, Date endTime) { + System.out.println("显示列：" + colms); + List list = iApiService.queryParamData(timeInterval, beginTime, endTime); ExcelUtil_2 util = new ExcelUtil_2(RecordRaramData.class); if (colms != null) { List tags = Arrays.asList(colms.split(",")); - List tagsF = new ArrayList<>(Arrays.asList( - "采集时间", "一体机A转速", "一体机A电流", - "一体机A切刀转速", "一体机A切刀电流", - "一体机A机头温度", "一体机A机头压力")); + List tagsF = new ArrayList<>(Arrays.asList("采集时间", "一体机A转速", "一体机A电流", "一体机A切刀转速", "一体机A切刀电流", "一体机A机头温度", "一体机A机头压力")); for (String s : tags) { tagsF.remove(s); } @@ -110,10 +115,36 @@ public class ApiController { return util.exportExcel(list, "数据记录", name + "," + type); } - @ApiOperation(tags = {"60脱水机"}, value = "设备介绍") - @GetMapping("/home/deviceInfo") - public AjaxResult deviceInfo(String name) { - return success(baseDeviceInfoService.selectBaseDeviceInfoListByName(name)); + //查询数据B + @ApiOperation(tags = {"60脱水机"}, value = "获取数据记录") + @GetMapping("/home/queryParamDataB") + public AjaxResult queryParamDataB(@RequestParam(defaultValue = "1") int timeInterval, Date beginTime, Date endTime) { + System.out.println("时间间隔" + timeInterval); + return success(iApiService.queryParamData_B(timeInterval, beginTime, endTime)); + } + + @ApiOperation(tags = {"60脱水机"}, value = "导出数据记录") + @PostMapping("/home/exportParamListB") + @ResponseBody + public AjaxResult exportB(String name, String type, String colms, @RequestParam(defaultValue = "1") int timeInterval, Date beginTime, Date endTime) { + System.out.println("显示列：" + colms); + List list = iApiService.queryParamData_B(timeInterval, beginTime, endTime); + ExcelUtil_2 util = new ExcelUtil_2(RecordRaramDataB.class); + if (colms != null) { + List tags = Arrays.asList(colms.split(",")); + List tagsF = new ArrayList<>(Arrays.asList("采集时间", "一体机B转速", "一体机B电流", "一体机B切刀转速", "一体机B切刀电流", "一体机B机头温度", "一体机B机头压力")); + 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); } diff --git a/haiwei-admin/src/main/resources/templates/board/board3.html b/haiwei-admin/src/main/resources/templates/board/board3.html index 326333e..e95ee9e 100644 --- a/haiwei-admin/src/main/resources/templates/board/board3.html +++ b/haiwei-admin/src/main/resources/templates/board/board3.html @@ -99,7 +99,7 @@ params.endTime = new Date($('#endTime1').val()) } params.timeInterval=$('#timeInterval1').val(); - $.get(ctx + 'broad/home/queryParamData', params, (e) => { + $.get(ctx + 'broad/home/queryParamDataB', params, (e) => { if (e.data.length > 0) { $('#chart1').remove() $("#modal1 .centerModal .centerModalInfo").append('
') @@ -120,24 +120,30 @@ params.endTime = new Date($('#endTime2').val()) } console.log(params) - $.get(ctx + 'broad/home/queryParamData', params, (e) => { + $.get(ctx + 'broad/home/queryParamDataB', params, (e) => { $("#chart2").empty() tableHeadChangeArr =[ "采集时间", - "一体机A转速", - "一体机A电流", - "一体机A机头压力", - "一体机A机头温度", - "一体机A切刀电流", - "一体机A切刀转速" + "一体机B转速", + "一体机B电流", + "一体机B机头压力", + "一体机B机头温度", + "一体机B切刀电流", + "一体机B切刀转速" ] if (e.data.length > 0) { dynamicTable({ el: '#chart2', rowNum: 10, timeout: 5, - header: ['序号', ' 采集时间', ' 一体机A转速', ' 一体机A电流', ' 一体机A机头压力', ' 一体机A机头温度', ' 一体机A切刀电流', ' 一体机A切刀转速'], - data: e.data.map((val, i) => [i, val.time, val['一体机A转速'], val['一体机A电流'], val['一体机A机头压力'], val['一体机A机头温度'], val['一体机A切刀电流'], val['一体机A切刀转速']]), + header: ['序号', ' 采集时间', + ' 一体机B转速', + ' 一体机B电流', + ' 一体机B机头压力', + ' 一体机B机头温度', + ' 一体机B切刀电流', + ' 一体机B切刀转速'], + data: e.data.map((val, i) => [i, val.time, val['一体机B转速'], val['一体机B电流'], val['一体机B机头压力'], val['一体机B机头温度'], val['一体机B切刀电流'], val['一体机B切刀转速']]), index: true, fontColor: '#03BCD4 ', indexBGC: '#86F3FF', @@ -177,7 +183,7 @@ if ($('#type').val()) { params.type = $('#type').val() } - $.post(ctx + 'broad/home/exportParamList', params, (e) => { + $.post(ctx + 'broad/home/exportParamListB', params, (e) => { window.location.href = ctx + "common/download?fileName=" + encodeURI(e.msg) + "&delete=" + true; }) } diff --git a/haiwei-manage/src/main/java/com/haiwei/manage/domain/RecordRaramDataB.java b/haiwei-manage/src/main/java/com/haiwei/manage/domain/RecordRaramDataB.java new file mode 100644 index 0000000..8f671fe --- /dev/null +++ b/haiwei-manage/src/main/java/com/haiwei/manage/domain/RecordRaramDataB.java @@ -0,0 +1,94 @@ +package com.haiwei.manage.domain; + +import com.haiwei.common.annotation.Excel; + +/** + * @author wanghao + * @date 2023/8/31 14:01 + */ +public class RecordRaramDataB { + + @Excel(name = "采集时间") + private String time; + @Excel(name = "一体机B转速") + private String 一体机B转速; + @Excel(name = "一体机B电流") + private String 一体机B电流; + @Excel(name = "一体机B切刀转速") + private String 一体机B切刀转速; + @Excel(name = "一体机B切刀电流") + private String 一体机B切刀电流; + @Excel(name = "一体机B机头温度") + private String 一体机B机头温度; + @Excel(name = "一体机B机头压力") + private String 一体机B机头压力; + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + + public String get一体机B转速() { + return 一体机B转速; + } + + public void set一体机B转速(String 一体机B转速) { + this.一体机B转速 = 一体机B转速; + } + + public String get一体机B电流() { + return 一体机B电流; + } + + public void set一体机B电流(String 一体机B电流) { + this.一体机B电流 = 一体机B电流; + } + + public String get一体机B切刀转速() { + return 一体机B切刀转速; + } + + public void set一体机B切刀转速(String 一体机B切刀转速) { + this.一体机B切刀转速 = 一体机B切刀转速; + } + + public String get一体机B切刀电流() { + return 一体机B切刀电流; + } + + public void set一体机B切刀电流(String 一体机B切刀电流) { + this.一体机B切刀电流 = 一体机B切刀电流; + } + + public String get一体机B机头温度() { + return 一体机B机头温度; + } + + public void set一体机B机头温度(String 一体机B机头温度) { + this.一体机B机头温度 = 一体机B机头温度; + } + + public String get一体机B机头压力() { + return 一体机B机头压力; + } + + public void set一体机B机头压力(String 一体机B机头压力) { + this.一体机B机头压力 = 一体机B机头压力; + } + + @Override + public String toString() { + return "RecordRaramData{" + + "time='" + time + '\'' + + ", 一体机B转速='" + 一体机B转速 + '\'' + + ", 一体机B电流='" + 一体机B电流 + '\'' + + ", 一体机B切刀转速='" + 一体机B切刀转速 + '\'' + + ", 一体机B切刀电流='" + 一体机B切刀电流 + '\'' + + ", 一体机B机头温度='" + 一体机B机头温度 + '\'' + + ", 一体机B机头压力='" + 一体机B机头压力 + '\'' + + '}'; + } +} diff --git a/haiwei-manage/src/main/java/com/haiwei/manage/mapper/ApiMapper.java b/haiwei-manage/src/main/java/com/haiwei/manage/mapper/ApiMapper.java index eb69622..8cde1d7 100644 --- a/haiwei-manage/src/main/java/com/haiwei/manage/mapper/ApiMapper.java +++ b/haiwei-manage/src/main/java/com/haiwei/manage/mapper/ApiMapper.java @@ -3,6 +3,7 @@ package com.haiwei.manage.mapper; import com.haiwei.manage.domain.DeviceState; import com.haiwei.manage.domain.ParamVo; import com.haiwei.manage.domain.RecordRaramData; +import com.haiwei.manage.domain.RecordRaramDataB; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -21,4 +22,9 @@ public interface ApiMapper { List queryPramList(@Param("beginTime") Date beginTime,@Param("endTime") Date endTime); List queryParamData(@Param("timeInterval") int timeInterval, @Param("beginTime")Date beginTime,@Param("endTime") Date endTime); + List queryPramList_B(@Param("beginTime") Date beginTime,@Param("endTime") Date endTime); + + List queryParamData_B(@Param("timeInterval") int timeInterval, @Param("beginTime")Date beginTime, @Param("endTime") Date endTime); + + } diff --git a/haiwei-manage/src/main/java/com/haiwei/manage/service/IApiService.java b/haiwei-manage/src/main/java/com/haiwei/manage/service/IApiService.java index e99af50..9ac69bc 100644 --- a/haiwei-manage/src/main/java/com/haiwei/manage/service/IApiService.java +++ b/haiwei-manage/src/main/java/com/haiwei/manage/service/IApiService.java @@ -3,6 +3,7 @@ package com.haiwei.manage.service; import com.haiwei.manage.domain.DeviceState; import com.haiwei.manage.domain.ParamVo; import com.haiwei.manage.domain.RecordRaramData; +import com.haiwei.manage.domain.RecordRaramDataB; import java.util.Date; import java.util.List; @@ -19,4 +20,7 @@ public interface IApiService { List queryPramList(Date beginTime, Date endTime); List queryParamData(int timeInterval, Date beginTime, Date endTime); + List queryParamData_B(int timeInterval, Date beginTime, Date endTime); + + List queryPramList_B(Date beginTime, Date endTime); } diff --git a/haiwei-manage/src/main/java/com/haiwei/manage/service/impl/ApiServiceImpl.java b/haiwei-manage/src/main/java/com/haiwei/manage/service/impl/ApiServiceImpl.java index 0e5e012..948f152 100644 --- a/haiwei-manage/src/main/java/com/haiwei/manage/service/impl/ApiServiceImpl.java +++ b/haiwei-manage/src/main/java/com/haiwei/manage/service/impl/ApiServiceImpl.java @@ -3,6 +3,7 @@ package com.haiwei.manage.service.impl; import com.haiwei.manage.domain.DeviceState; import com.haiwei.manage.domain.ParamVo; import com.haiwei.manage.domain.RecordRaramData; +import com.haiwei.manage.domain.RecordRaramDataB; import com.haiwei.manage.mapper.ApiMapper; import com.haiwei.manage.service.IApiService; import org.springframework.beans.factory.annotation.Autowired; @@ -39,4 +40,14 @@ public class ApiServiceImpl implements IApiService { public List queryParamData(int timeInterval, Date beginTime, Date endTime) { return mapper.queryParamData(timeInterval,beginTime,endTime); } + + @Override + public List queryParamData_B(int timeInterval, Date beginTime, Date endTime) { + return mapper.queryParamData_B(timeInterval,beginTime,endTime); + } + + @Override + public List queryPramList_B(Date beginTime, Date endTime) { + return mapper.queryPramList_B(beginTime,endTime); + } } diff --git a/haiwei-manage/src/main/resources/mapper/manage/ApiMapper.xml b/haiwei-manage/src/main/resources/mapper/manage/ApiMapper.xml index 65289ea..c95d543 100644 --- a/haiwei-manage/src/main/resources/mapper/manage/ApiMapper.xml +++ b/haiwei-manage/src/main/resources/mapper/manage/ApiMapper.xml @@ -51,6 +51,19 @@ + + +