增加 设备历史数据接口

master
wangh 2 years ago
parent e38a4e872f
commit e61f01617f

@ -1,6 +1,7 @@
package com.haiwei.web.controller.broad;
import com.haiwei.common.core.domain.AjaxResult;
import static com.haiwei.common.core.domain.AjaxResult.*;
import com.haiwei.manage.service.IApiService;
@ -15,6 +16,8 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.Date;
/**
* @author wanghao
@ -36,32 +39,33 @@ public class ApiController {
@ApiOperation(tags = {"首页"}, value = "获取客户展示")
@GetMapping("/home/queryCustomer")
public AjaxResult queryCustomer(){
public AjaxResult queryCustomer() {
return success(baseCustomerService.selectBaseCustomerList(null));
}
@ApiOperation(tags = {"首页"}, value = "获取产品列表")
@GetMapping("/home/queryDevice")
public AjaxResult queryDevice(){
public AjaxResult queryDevice() {
return success(baseDeviceTypeService.selectBaseDeviceTypeList(null));
}
@ApiOperation(tags = {"60脱水机"}, value = "获取实时数据")
@GetMapping("/home/queryParam")
public AjaxResult queryPram(){
public AjaxResult queryPram() {
return success(iApiService.queryPram());
}
@ApiOperation(tags = {"60脱水机"}, value = "获取设备状态 1=绿灯 0红灯")
@GetMapping("/home/queryDeviceState")
public AjaxResult queryDeviceState(){
public AjaxResult queryDeviceState() {
return success(iApiService.queryDeviceState());
}
@ApiOperation(tags = {"60脱水机"}, value = "获取历史趋势")
@ApiOperation(tags = {"60脱水机"}, value = "获取历史趋势、获取数据记录")
@GetMapping("/home/queryParamList")
public AjaxResult queryPramList(){
return success(iApiService.queryPram());
public AjaxResult queryPramList(Date beginTime, Date endTime) {
return success(iApiService.queryPramList(beginTime, endTime));
}

@ -11,8 +11,8 @@
<link href="../static/css/main/animate.min.css" th:href="@{/css/main/animate.min.css}" rel="stylesheet"/>
<link href="../static/css/main/style.min862f.css" th:href="@{/css/main/style.min862f.css}" rel="stylesheet"/>
</head>
<body style="background: url(../img/index.jpg) ">
<body >
<img style="max-width:100%;max-height:100%;height: auto; width: auto\9; width:100%; overflow:hidden;" src="../img/index.jpg" alt="">
</body>
<!--<body class="gray-bg">

@ -0,0 +1,71 @@
package com.haiwei.manage.domain;
/**
* @author wanghao
* @date 2023/8/31 14:01
*/
public class RecordRaramData {
private String time,
A,
A,
A,
A,
A,
A;
public String getTime() {
return time;
}
public void setTime(String time) {
this.time = time;
}
public String getA() {
return A;
}
public void setA(String A) {
this.A = A;
}
public String getA() {
return A;
}
public void setA(String A) {
this.A = A;
}
public String getA() {
return A;
}
public void setA(String A) {
this.A = A;
}
public String getA() {
return A;
}
public void setA(String A) {
this.A = A;
}
public String getA() {
return A;
}
public void setA(String A) {
this.A = A;
}
public String getA() {
return A;
}
public void setA(String A) {
this.A = A;
}
}

@ -1,8 +1,11 @@
package com.haiwei.manage.mapper;
import com.haiwei.manage.domain.ParamVo;
import com.haiwei.manage.domain.RecordRaramData;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.Date;
import java.util.List;
/**
@ -13,4 +16,6 @@ import java.util.List;
public interface ApiMapper {
List<ParamVo> queryPram();
List<ParamVo> queryDeviceState();
List<RecordRaramData> queryPramList(@Param("beginTime") Date beginTime,@Param("endTime") Date endTime);
}

@ -1,7 +1,9 @@
package com.haiwei.manage.service;
import com.haiwei.manage.domain.ParamVo;
import com.haiwei.manage.domain.RecordRaramData;
import java.util.Date;
import java.util.List;
/**
@ -12,4 +14,6 @@ public interface IApiService {
List<ParamVo> queryPram();
List<ParamVo> queryDeviceState();
List<RecordRaramData> queryPramList(Date beginTime, Date endTime);
}

@ -1,11 +1,13 @@
package com.haiwei.manage.service.impl;
import com.haiwei.manage.domain.ParamVo;
import com.haiwei.manage.domain.RecordRaramData;
import com.haiwei.manage.mapper.ApiMapper;
import com.haiwei.manage.service.IApiService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
/**
@ -26,4 +28,9 @@ public class ApiServiceImpl implements IApiService {
public List<ParamVo> queryDeviceState() {
return mapper.queryDeviceState();
}
@Override
public List<RecordRaramData> queryPramList(Date beginTime, Date endTime) {
return mapper.queryPramList(beginTime,endTime);
}
}

@ -1,35 +1,58 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.haiwei.manage.mapper.ApiMapper">
<select id="queryPram" resultType="com.haiwei.manage.domain.ParamVo">
SELECT
ee.name,
info.PointName as pointname,
ed.Data as data
FROM EPointData ed
right join (
SELECT PID, MAX(CreateTime) AS LatestTime
FROM EPointData
GROUP BY PID
) ld on ld.PID = ed.PID and ld.LatestTime = CreateTime
right join EPointsInfo info on ed.PID = info.ID
left join EEquipmentMaintenance ee on ee.ID = info.EID
where ee.EquipmentType =1
</select>
<select id="queryDeviceState" resultType="com.haiwei.manage.domain.ParamVo">
SELECT name,
DataType as data
FROM EEquipmentState
where PID=7
</select>
<select id="queryPram" resultType="com.haiwei.manage.domain.ParamVo">
SELECT ee.name,
info.PointName as pointname,
ed.Data as data
FROM EPointData ed
right join (
SELECT PID, MAX(CreateTime) AS LatestTime
FROM EPointData
GROUP BY PID
) ld on ld.PID = ed.PID and ld.LatestTime = CreateTime
right join EPointsInfo info on ed.PID = info.ID
left join EEquipmentMaintenance ee on ee.ID = info.EID
where ee.EquipmentType = 1
</select>
<select id="queryDeviceState" resultType="com.haiwei.manage.domain.ParamVo">
SELECT name,
DataType as data
FROM EEquipmentState
where PID = 7
</select>
<select id="queryPramList" resultType="com.haiwei.manage.domain.RecordRaramData">
select * from (
SELECT ee.name + info.PointName as pointname,
ed.Data as data,
CONVERT(varchar, ed.CreateTime, 120) time
FROM EPointData ed
right join EPointsInfo info on ed.PID = info.ID
left join EEquipmentMaintenance ee on ee.ID = info.EID
where ee.EquipmentType = 1
) a
PIVOT
(max(data) FOR pointname IN (
一体机A转速,
一体机A电流,
一体机切刀A转速,
一体机切刀A电流,
一体机A机头温度,
一体机A机头压力
))t
<where>
<if test="beginTime !=null and endTime !=null">
time between #{beginTime} and #{endTime}
</if>
</where>
</select>
</mapper>

Loading…
Cancel
Save