wangh
/
dlts_device_cockpit
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加 设备历史数据接口

Browse Source
master
wangh 2 years ago
parent e38a4e872f
commit e61f01617f
7 changed files with 150 additions and 36 deletions
Show Stats Download Patch File Download Diff File

10
haiwei-admin/src/main/java/com/haiwei/web/controller/broad/ApiController.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.haiwei.web.controller.broad; package com.haiwei.web.controller.broad;
import com.haiwei.common.core.domain.AjaxResult; import com.haiwei.common.core.domain.AjaxResult;
import static com.haiwei.common.core.domain.AjaxResult.*; import static com.haiwei.common.core.domain.AjaxResult.*;
import com.haiwei.manage.service.IApiService; 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.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.Date;
/** /**
* @author wanghao * @author wanghao
@ -52,16 +55,17 @@ public class ApiController {
public AjaxResult queryPram() { public AjaxResult queryPram() {
return success(iApiService.queryPram()); return success(iApiService.queryPram());
} }
@ApiOperation(tags = {"60脱水机"}, value = "获取设备状态 1=绿灯 0红灯") @ApiOperation(tags = {"60脱水机"}, value = "获取设备状态 1=绿灯 0红灯")
@GetMapping("/home/queryDeviceState") @GetMapping("/home/queryDeviceState")
public AjaxResult queryDeviceState() { public AjaxResult queryDeviceState() {
return success(iApiService.queryDeviceState()); return success(iApiService.queryDeviceState());
} }
@ApiOperation(tags = {"60脱水机"}, value = "获取历史趋势") @ApiOperation(tags = {"60脱水机"}, value = "获取历史趋势、获取数据记录")
@GetMapping("/home/queryParamList") @GetMapping("/home/queryParamList")
public AjaxResult queryPramList(){ public AjaxResult queryPramList(Date beginTime, Date endTime) {
return success(iApiService.queryPram()); return success(iApiService.queryPramList(beginTime, endTime));
} }

4
haiwei-admin/src/main/resources/templates/main.html
Unescape Escape View File

@ -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/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"/> <link href="../static/css/main/style.min862f.css" th:href="@{/css/main/style.min862f.css}" rel="stylesheet"/>
</head> </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>
<!--<body class="gray-bg"> <!--<body class="gray-bg">

71
haiwei-manage/src/main/java/com/haiwei/manage/domain/RecordRaramData.java
Unescape Escape View File

@ -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 get一体机A转速() {
return 一体机A转速;
}
public void set一体机A转速(String 一体机A转速) {
this.一体机A转速 = 一体机A转速;
}
public String get一体机A电流() {
return 一体机A电流;
}
public void set一体机A电流(String 一体机A电流) {
this.一体机A电流 = 一体机A电流;
}
public String get一体机切刀A转速() {
return 一体机切刀A转速;
}
public void set一体机切刀A转速(String 一体机切刀A转速) {
this.一体机切刀A转速 = 一体机切刀A转速;
}
public String get一体机切刀A电流() {
return 一体机切刀A电流;
}
public void set一体机切刀A电流(String 一体机切刀A电流) {
this.一体机切刀A电流 = 一体机切刀A电流;
}
public String get一体机A机头温度() {
return 一体机A机头温度;
}
public void set一体机A机头温度(String 一体机A机头温度) {
this.一体机A机头温度 = 一体机A机头温度;
}
public String get一体机A机头压力() {
return 一体机A机头压力;
}
public void set一体机A机头压力(String 一体机A机头压力) {
this.一体机A机头压力 = 一体机A机头压力;
}
}

5
haiwei-manage/src/main/java/com/haiwei/manage/mapper/ApiMapper.java
Unescape Escape View File

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

4
haiwei-manage/src/main/java/com/haiwei/manage/service/IApiService.java
Unescape Escape View File

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

7
haiwei-manage/src/main/java/com/haiwei/manage/service/impl/ApiServiceImpl.java
Unescape Escape View File

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

29
haiwei-manage/src/main/resources/mapper/manage/ApiMapper.xml
Unescape Escape View File

@ -5,10 +5,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<mapper namespace="com.haiwei.manage.mapper.ApiMapper"> <mapper namespace="com.haiwei.manage.mapper.ApiMapper">
<select id="queryPram" resultType="com.haiwei.manage.domain.ParamVo"> <select id="queryPram" resultType="com.haiwei.manage.domain.ParamVo">
SELECT SELECT ee.name,
ee.name,
info.PointName as pointname, info.PointName as pointname,
ed.Data as data ed.Data as data
FROM EPointData ed FROM EPointData ed
@ -30,6 +28,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </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> </mapper>

Write Preview
Loading…
Cancel
Save