From 067d0541cbd3a423132d695f4c434cc9a3513947 Mon Sep 17 00:00:00 2001
From: whycrzg <ruanzhigang@whycst.com>
Date: 星期一, 01 二月 2021 17:06:44 +0800
Subject: [PATCH] update /battInf/beyondTime
---
src/main/java/com/fgkj/controller/BattInfController.java | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/fgkj/controller/BattInfController.java b/src/main/java/com/fgkj/controller/BattInfController.java
index d6ef6ef..ded61d3 100644
--- a/src/main/java/com/fgkj/controller/BattInfController.java
+++ b/src/main/java/com/fgkj/controller/BattInfController.java
@@ -5,6 +5,7 @@
import com.fgkj.util.ActionUtil;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
+import com.sun.xml.internal.bind.v2.TODO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -12,6 +13,7 @@
import javax.annotation.Resource;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
@RequestMapping("battInf")
@@ -292,18 +294,32 @@
return service.serchBatt(binf);
}
+ //TODO 鏁版嵁涓嶈冻寰呮祴
//6.4.7鎸夊湴鍩熷拰鏍囩О鐢靛帇鍒嗙粍缁熻钃勭數姹犵粍鏈嶅焦瓒呮湡鐨勬暟閲�
/*
* 鍖哄煙灞傛鏀惧湪stationid涓�
* battgroupnum 涓瓨鏀剧粺璁℃柟寮忥細骞村害缁熻涓�0 瀛ｅ害缁熻涓�1
- * moncount涓瓨鏀剧粺璁″搴︼細涓�瀛ｅ害涓�1 浠ユ绫绘帹
- * monnum 涓瓨鏀惧勾浠�*/
- @GetMapping("beyondTime")
+ * moncount涓瓨鏀剧粺璁″搴︼細涓�瀛ｅ害涓�1 浠ユ绫绘帹 -3
+ * monnum 涓瓨鏀惧勾浠� -2020*/
+ @PostMapping("beyondTime")
@ApiOperation(notes = "鍖哄煙灞傛鏀惧湪stationid涓� battgroupnum 涓瓨鏀剧粺璁℃柟寮忥細骞村害缁熻涓�0 瀛ｅ害缁熻涓�1 moncount涓瓨鏀剧粺璁″搴︼細涓�瀛ｅ害涓�1 浠ユ绫绘帹 monnum 涓瓨鏀惧勾浠�",value="鎸夊湴鍩熷拰鏍囩О鐢靛帇鍒嗙粍缁熻钃勭數姹犵粍鏈嶅焦瓒呮湡鐨勬暟閲�")
- public ServiceModel serchBeyondTime(@RequestBody BattInf bif){
- // bif=ActionUtil.getGson("yyyy-MM-dd").fromJson(result,BattInf.class);
-
- return service.serchBeyondTime(bif);
+ public ServiceModel serchBeyondTime(@ApiParam(value = "鍖哄煙灞傛(瀛楃涓叉暟瀛�)",required = true) @RequestParam String stationId,@ApiParam(value = "缁熻鏂瑰紡锛氬勾搴︾粺璁′负0 瀛ｅ害缁熻涓�1",required = true) @RequestParam Integer battGroupNum,@ApiParam(value = "骞翠唤",required = true) @RequestParam Integer monNum,@ApiParam(value = "缁熻瀛ｅ害锛氫竴瀛ｅ害涓�1 浠ユ绫绘帹",required = true) @RequestParam Integer monCount,@ApiParam(value = "",required = true) @RequestParam Date BattInUseDate,@ApiParam(value = "浣跨敤鏃ユ湡娈� 鏍煎紡2021/02/01 08:16:35",required = true) @RequestParam Date BattInUseDate1) {
+ ServiceModel model= new ServiceModel();
+ try {
+ Integer.parseInt(stationId);
+ } catch (NumberFormatException e) {
+ e.printStackTrace();
+ model.setMsg("鍙傛暟涓嶅悎娉�");
+ return model;
+ }
+ BattInf binf = new BattInf();
+ binf.setStationId(stationId);
+ binf.setBattGroupNum(battGroupNum);
+ binf.setMonNum(monNum);
+ binf.setMonCount(monCount);
+ binf.setBattInUseDate(BattInUseDate);
+ binf.setBattInUseDate1(BattInUseDate1);
+ return service.serchBeyondTime(binf);
}
//6.4.8鎸夊湴鍩熷拰鏍囩О鐢靛帇鍒嗙粍缁熻钃勭數姹犵粍鐨勬暟閲�(钃勭數姹犵粍鏁伴噺缁熻)
--
Gitblit v1.9.1