From 0f24731e84183146193ed19d1a51f7f63a98cd1a Mon Sep 17 00:00:00 2001
From: whycrzg <ruanzhigang@whycst.com>
Date: 星期五, 29 一月 2021 10:25:00 +0800
Subject: [PATCH] update
---
src/main/java/com/fgkj/controller/Batt_realdataController.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/fgkj/controller/Batt_realdataController.java b/src/main/java/com/fgkj/controller/Batt_realdataController.java
index 4e84f40..89c22c8 100644
--- a/src/main/java/com/fgkj/controller/Batt_realdataController.java
+++ b/src/main/java/com/fgkj/controller/Batt_realdataController.java
@@ -5,12 +5,11 @@
import com.fgkj.services.history.Batt_realdataService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.ApiParam;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.Date;
@RequestMapping("battRealData")
@RestController
@@ -21,11 +20,14 @@
private Batt_realdataService service;
//鎸夌収鏃堕棿鍊掑簭鏌ュ嚭鍏蜂綋鐢垫睜缁勭殑鎵�鏈変俊鎭�
- @GetMapping("byCondition")
+ @PostMapping("byCondition")
@ApiOperation(notes = "",value="鎸夌収鏃堕棿鍊掑簭鏌ュ嚭鍏蜂綋鐢垫睜缁勭殑鎵�鏈変俊鎭�")
- public ServiceModel serchByCondition(@RequestBody Batt_realdata realData) {
- // Batt_realdata breal=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Batt_realdata.class);
- ServiceModel model=service.serchByCondition(realData);
+ public ServiceModel serchByCondition(@ApiParam(value = "battGroupId 1000002", required = true) @RequestParam Integer battGroupId, @ApiParam(value = "鍓嶄竴鏃堕棿 鏍煎紡2017/12/29 09:28:31", required = true) @RequestParam Date record_time, @ApiParam(value = "鍚庝竴鏃堕棿", required = true) @RequestParam Date record_time1,@RequestParam Integer pageNum,@RequestParam Integer pageSize) {
+ Batt_realdata realData = new Batt_realdata();
+ realData.setBattGroupId(battGroupId);
+ realData.setRecord_time(record_time);
+ realData.setRecord_time1(record_time1);
+ ServiceModel model = service.serchByCondition(realData,pageNum,pageSize);
return model;
}
--
Gitblit v1.9.1