From e61f01617fe56cc31adf9346fa8984ea7f7fc08f Mon Sep 17 00:00:00 2001
From: wangh <123456>
Date: Thu, 31 Aug 2023 14:26:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E8=AE=BE=E5=A4=87?=
=?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=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 | 18 +++--
.../src/main/resources/templates/main.html | 4 +-
.../haiwei/manage/domain/RecordRaramData.java | 71 +++++++++++++++++
.../com/haiwei/manage/mapper/ApiMapper.java | 5 ++
.../haiwei/manage/service/IApiService.java | 4 +
.../manage/service/impl/ApiServiceImpl.java | 7 ++
.../resources/mapper/manage/ApiMapper.xml | 77 ++++++++++++-------
7 files changed, 150 insertions(+), 36 deletions(-)
create mode 100644 haiwei-manage/src/main/java/com/haiwei/manage/domain/RecordRaramData.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 e551982..859c1ae 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
@@ -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));
}
diff --git a/haiwei-admin/src/main/resources/templates/main.html b/haiwei-admin/src/main/resources/templates/main.html
index 9b316ba..a2c0daa 100644
--- a/haiwei-admin/src/main/resources/templates/main.html
+++ b/haiwei-admin/src/main/resources/templates/main.html
@@ -11,8 +11,8 @@
-
-
+
+