From 2ae8e060fb88e2814c63bfbdedb9c891a6fce37a Mon Sep 17 00:00:00 2001
From: whycrzh <ruanzhigang@whycst.com>
Date: 星期四, 28 一月 2021 14:47:39 +0800
Subject: [PATCH] update Fbs9600_state and relatedReference
---
src/main/java/com/fgkj/controller/Batt_DevdischargeController.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/fgkj/controller/Batt_DevdischargeController.java b/src/main/java/com/fgkj/controller/Batt_DevdischargeController.java
index 827f30c..463d743 100644
--- a/src/main/java/com/fgkj/controller/Batt_DevdischargeController.java
+++ b/src/main/java/com/fgkj/controller/Batt_DevdischargeController.java
@@ -9,13 +9,15 @@
import com.fgkj.services.User_logService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.Date;
@RequestMapping("battDevDischarge")
@RestController
-@Api(tags = "battDevDischarge鎺ュ彛")
+@Api(tags = "battDevDischarge鎺ュ彛 TODO")
public class Batt_DevdischargeController{
@Resource
@@ -24,9 +26,8 @@
private User_logService uservice;
@PostMapping("/")
- @ApiOperation(notes = "",value="鏂板")
+ @ApiOperation(notes = "{ \"dev_id\": 0, \"dev_name\": \"dev_name\", \"dev_recordtime\": \"2021-01-07 08:16:26\", \"dev_vol\": 0.0, \"dev_curr\": 0.0, \"dev_power\": 0.0, \"note\": \"c\" }",value="鏂板")
public ServiceModel add(@RequestBody Batt_Devdischarge bd){
- // Batt_Devdischarge bd = getGson("yyyy-MM-dd").fromJson(json, Batt_Devdischarge.class);
ServiceModel model = service.add(bd);
{
String msg="娣诲姞瀵�"+bd.getDev_name()+"璁惧鐨勮褰�";
@@ -38,7 +39,7 @@
}
@PutMapping("/")
- @ApiOperation(notes = "",value="淇敼")
+ @ApiOperation(notes = "{ \"num\": 33308, \"dev_id\": 0, \"dev_name\": \"\", \"dev_recordtime\": \"2021-01-07 08:16:26\", \"dev_vol\": 0.0, \"dev_curr\": 0.0, \"dev_power\": 0.0, \"note\": \"\" }",value="淇敼")
public ServiceModel update(@RequestBody Batt_Devdischarge bd){
// Batt_Devdischarge bd = getGson("yyyy-MM-dd").fromJson(json, Batt_Devdischarge.class);
ServiceModel model = service.update(bd);
@@ -48,7 +49,9 @@
@DeleteMapping("/")
@ApiOperation(notes = "",value="鍒犻櫎")
- public ServiceModel del(@RequestBody Batt_Devdischarge bd){
+ public ServiceModel del(@RequestParam Integer num){
+ Batt_Devdischarge bd= new Batt_Devdischarge();
+ bd.setNum(num);
// Batt_Devdischarge bd = getGson("yyyy-MM-dd").fromJson(json, Batt_Devdischarge.class);
ServiceModel model = service.del(bd);
@@ -56,7 +59,7 @@
}
@GetMapping("all")
- @ApiOperation(notes = "",value="all")
+ @ApiOperation(notes = "鏁版嵁杈冨ぇ锛屾槸鍚﹀垎椤碉紵Total: 33297",value="all")
public ServiceModel searchAll(){
ServiceModel model = service.searchAll();
@@ -68,9 +71,13 @@
/*
* 璁板綍鏃堕棿鏀惧湪battinf鐨刡attproducer
* 缁熻绫诲瀷鏀惧湪moncount涓細 1锛氱數鍘嬶紝2鐢垫祦锛�3鍔熺巼*/
- @GetMapping("byCondition")
- public ServiceModel serchByCondition(@RequestBody BattInf binf){
- // BattInf binf = getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, BattInf.class);
+ @PostMapping("byCondition")
+ @ApiOperation(notes = "璁板綍鏃堕棿鏀惧湪battinf鐨刡attproducer 缁熻绫诲瀷鏀惧湪moncount涓細1锛氱數鍘嬶紝2鐢垫祦锛�3鍔熺巼", value = "璁惧id杩瀊attinf鍜宐att_devdischarge琛�")
+ public ServiceModel serchByCondition(@ApiParam(value = "璁惧id 42010007", required = true) @RequestParam String stationId, @ApiParam(value = "鐢熶骇鏃ユ湡娈� 鏍煎紡2000/01/28 08:22:34", required = true) @RequestParam Date battProductDate, @ApiParam(value = "鐢熶骇鏃ユ湡娈�", required = true) @RequestParam Date battProductDate1) {
+ BattInf binf = new BattInf();
+ binf.setStationId(stationId);
+ binf.setBattProductDate(battProductDate);
+ binf.setBattProductDate1(battProductDate1);
//System.out.println(binf);
ServiceModel model = service.serchByCondition(binf);
--
Gitblit v1.9.1