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_historyController.java | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/fgkj/controller/Batt_historyController.java b/src/main/java/com/fgkj/controller/Batt_historyController.java
index c811742..f35af4f 100644
--- a/src/main/java/com/fgkj/controller/Batt_historyController.java
+++ b/src/main/java/com/fgkj/controller/Batt_historyController.java
@@ -6,28 +6,31 @@
import com.fgkj.util.ActionUtil;
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("battHistory")
@RestController
-@Api(tags = "battHistory鎺ュ彛")
+@Api(tags = "battHistory鎺ュ彛 TODO")
public class Batt_historyController{
@Resource
private Batt_historyService service;
//鏌ヨ鎵�鏈夌殑鍘嗗彶瀹炴椂鏁版嵁
- //TODO 鏁版嵁搴撲笉鍚岋紝浣跨敤杩欎釜琛ㄥ悕娴嬭瘯 db_batt_history.tb_batt_910000001_2017_12
- @GetMapping("serchByCondition")
- @ApiOperation(notes = "TODO 鏁版嵁搴撲笉鍚岃〃锛屽緟娴�",value="鏌ヨ鎵�鏈夌殑鍘嗗彶瀹炴椂鏁版嵁")
- public ServiceModel serchByCondition(@RequestBody Batt_history batt_his){
-// Batt_history batt_his= ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Batt_history.class);
- ServiceModel model=service.serchByCondition(batt_his);
+ //TODO 鏁版嵁搴撲笉鍚岋紝浣跨敤杩欎釜琛ㄥ悕娴嬭瘯 db_batt_history.tb_batt_910000001_2017_12
+ @PostMapping("serchByCondition")
+ @ApiOperation(notes = "TODO 鏁版嵁搴撲笉鍚岃〃瀛楁涓嶅悓锛屽緟娴� db_batt_history.tb_batt_910000001_2017_12", value = "鏌ヨ鎵�鏈夌殑鍘嗗彶瀹炴椂鏁版嵁")
+ public ServiceModel serchByCondition(@ApiParam(value = "璁惧id 910000001", required = true) @RequestParam Integer dev_id, @ApiParam(value = "battGroupId 1005059", required = true) @RequestParam Integer battGroupId, @ApiParam(value = "鏃ユ湡 鏍煎紡2017/12/29 09:28:31", required = true) @RequestParam Date rec_datetime, @ApiParam(value = "鏃ユ湡 2018/12/29 09:28:31", required = true) @RequestParam Date rec_datetime1) {
+ Batt_history batt_his = new Batt_history();
+ batt_his.setDev_id(dev_id);
+ batt_his.setBattGroupId(battGroupId);
+ batt_his.setRec_datetime(rec_datetime);
+ batt_his.setRec_datetime1(rec_datetime1);
+ ServiceModel model = service.serchByCondition(batt_his);
return model;
}
--
Gitblit v1.9.1