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 @@
-
-
+
+