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 207bae7..42b3279 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 @@ -64,7 +64,7 @@ public class ApiController extends BaseController { return AjaxResult.success(iApiService.queryPram(name)); } - @ApiOperation(tags = {"60脱水机"}, value = "获取设备状态") + @ApiOperation(tags = {"60脱水机"}, value = "获取设备状态 msg字段") @GetMapping("/home/queryDeviceState") public AjaxResult queryDeviceState(String name) { if (name.equals("60型一体机A") ){ @@ -89,47 +89,19 @@ public class ApiController extends BaseController { // } @ApiOperation(tags = {"60脱水机"}, value = "获取数据记录") @GetMapping("/home/queryParamData") - public TableDataInfo queryParamData(QueryParam param) { - - startPage(); - List recordRaramData = iApiService.queryParamData(param.getTimeInterval(), - param.getBeginTime(),param.getEndTime()); - return getDataTable(recordRaramData); - - - } - //查询数据B - @ApiOperation(tags = {"60脱水机"}, value = "获取一体机B数据记录") - @GetMapping("/home/queryParamDataB") - public TableDataInfo queryParamDataB(@RequestParam(defaultValue = "1") int timeInterval, Date beginTime, Date endTime) { + public TableDataInfo queryParamData(@RequestParam(defaultValue = "1") int timeInterval, Date beginTime, Date endTime) { + System.out.println("时间间隔" + timeInterval); startPage(); - List data = iApiService.queryParamData_B(timeInterval, beginTime, endTime); - return getDataTable(data); - } - - - //查询数据B - @ApiOperation(tags = {"60脱水机"}, value = "获取一体机B趋势") - @GetMapping("/home/queryBTrend") - public AjaxResult queryBTrend(@RequestParam(defaultValue = "1") int timeInterval, Date beginTime, Date endTime) { - - return AjaxResult.success(iApiService.queryParamData_B(timeInterval, beginTime, endTime)); + return getDataTable( 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); - ExcelUtil_2 util = new ExcelUtil_2(RecordRaramData.class); + 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机头压力")); @@ -147,6 +119,13 @@ public class ApiController extends BaseController { return util.exportExcel(list, "数据记录", name + "," + type); } + //查询数据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 AjaxResult.success(iApiService.queryParamData_B(timeInterval, beginTime, endTime)); + } @ApiOperation(tags = {"60脱水机"}, value = "导出数据记录") @PostMapping("/home/exportParamListB") diff --git a/haiwei-admin/src/main/resources/templates/board/board1.html b/haiwei-admin/src/main/resources/templates/board/board1.html index dfb0691..3439986 100644 --- a/haiwei-admin/src/main/resources/templates/board/board1.html +++ b/haiwei-admin/src/main/resources/templates/board/board1.html @@ -99,8 +99,8 @@ params.endTime = new Date($('#endTime1').val()) } params.timeInterval=$('#timeInterval1').val(); - $.get(ctx + 'broad/home/queryParamDataA', params, (e) => { - let data = e.rows + $.get(ctx + 'broad/home/queryParamData', params, (e) => { + let data = e.data if (data.length > 0) { $('#chart1').remove() $("#modal1 .centerModal .centerModalInfo").append('
') @@ -133,8 +133,15 @@ el: '#chart2', rowNum: 10, timeout: 5, - header: ['序号', ' 采集时间', ' 一体机A转速', ' 一体机A电流', ' 一体机A机头压力', ' 一体机A机头温度', ' 一体机A切刀电流', ' 一体机A切刀转速'], - data: data.map((val, i) => [i, val.time, val['一体机A转速'], val['一体机A电流'], val['一体机A机头压力'], val['一体机A机头温度'], val['一体机A切刀电流'], val['一体机A切刀转速']]), + header: ['序号', ' 采集时间', + ' 一体机A转速', + ' 一体机A电流', + ' 一体机A机头压力', + ' 一体机A机头温度', + ' 一体机A切刀电流', + ' 一体机A切刀转速'], + data: data.map((val, i) => [i, val.recordTime, val['speedA'], + val['currentA'], val['pressureHead'], val['tempHead'], val['currentCutter'], val['speedCutter']]), index: true, fontColor: '#03BCD4 ', indexBGC: '#86F3FF', diff --git a/haiwei-manage/src/main/java/com/haiwei/manage/domain/RecordPiontData.java b/haiwei-manage/src/main/java/com/haiwei/manage/domain/RecordPiontData.java index 643c293..1eaf704 100644 --- a/haiwei-manage/src/main/java/com/haiwei/manage/domain/RecordPiontData.java +++ b/haiwei-manage/src/main/java/com/haiwei/manage/domain/RecordPiontData.java @@ -24,27 +24,27 @@ public class RecordPiontData extends BaseEntity private Date recordTime; /** 一体机A转速 */ - @Excel(name = "一体机A转速") + @Excel(name = "一体机转速") private Double speedA; /** 一体机A电流 */ - @Excel(name = "一体机A电流") + @Excel(name = "一体机电流") private Double currentA; /** 一体机A切刀转速 */ - @Excel(name = "一体机A切刀转速") + @Excel(name = "切刀转速") private Double speedCutter; /** 一体机A切刀电流 */ - @Excel(name = "一体机A切刀电流") + @Excel(name = "切刀电流") private Double currentCutter; /** 一体机A机头温度 */ - @Excel(name = "一体机A机头温度") + @Excel(name = "机头温度") private Double tempHead; /** 一体机A机头压力 */ - @Excel(name = "一体机A机头压力") + @Excel(name = "机头压力") private Double pressureHead; public void setObjid(Long objid) 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 588ef33..9089d97 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 @@ -1,9 +1,6 @@ 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 com.haiwei.manage.domain.*; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -21,7 +18,7 @@ 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 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 2d8e35b..3f2c059 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 @@ -1,9 +1,6 @@ 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 com.haiwei.manage.domain.*; import java.util.Date; import java.util.List; @@ -19,7 +16,7 @@ public interface IApiService { List queryPramList(Date beginTime, Date endTime); - List queryParamData(int timeInterval, 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 893bc34..3e926d6 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 @@ -1,9 +1,6 @@ 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.domain.*; import com.haiwei.manage.mapper.ApiMapper; import com.haiwei.manage.service.IApiService; import org.springframework.beans.factory.annotation.Autowired; @@ -37,7 +34,7 @@ public class ApiServiceImpl implements IApiService { } @Override - public List queryParamData(int timeInterval, Date beginTime, Date endTime) { + public List queryParamData(int timeInterval, Date beginTime, Date endTime) { return mapper.queryParamData(timeInterval,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 3a40baa..7aabc3e 100644 --- a/haiwei-manage/src/main/resources/mapper/manage/ApiMapper.xml +++ b/haiwei-manage/src/main/resources/mapper/manage/ApiMapper.xml @@ -83,27 +83,35 @@ - + select * + from (SELECT row_number() over (order by record_time asc) AS row_num, + record_time, + MAX(CASE WHEN pointname = '一体机A转速' THEN data END) AS speed_a, + MAX(CASE WHEN pointname = '一体机A电流' THEN data END) AS current_a, + MAX(CASE WHEN pointname = '一体机A切刀转速' THEN data END) AS speed_cutter, + MAX(CASE WHEN pointname = '一体机A切刀电流' THEN data END) AS current_cutter, + MAX(CASE WHEN pointname = '一体机A机头温度' THEN data END) AS temp_head, + MAX(CASE WHEN pointname = '一体机A机头压力' THEN data END) AS pressure_head + FROM (SELECT ee.point_name + info.PointName AS pointname, + ed.Data AS data, + CONVERT(VARCHAR, ed.CreateTime, 120) AS record_time + FROM EPointData ed + RIGHT JOIN EPointsInfo info ON ed.PID = info.ID + LEFT JOIN base_point_info ee ON ee.objid = info.EID + + device_name = '60型一体机A' + + and ed.CreateTime between #{beginTime} and #{endTime} + + + ) table_a + GROUP BY record_time) table_b - - ed.CreateTime between #{beginTime} and #{endTime} + + row_num % #{timeInterval} = 0 - ) a PIVOT (max(data) FOR pointname IN ( 一体机A转速, 一体机A电流, 一体机A切刀转速, 一体机A切刀电流, 一体机A机头温度, 一体机A机头压力 )) t - - ) - SELECT * - FROM CTE - WHERE row_num % #{timeInterval} = 0 - ORDER BY row_num;