From b421fde8f3499b638c117cc2cb9a49f260fb3481 Mon Sep 17 00:00:00 2001
From: whycrzg <ruanzhigang@whycst.com>
Date: 星期五, 29 一月 2021 16:34:30 +0800
Subject: [PATCH] update

---
 src/main/java/com/fgkj/controller/Battalarm_data_historyController.java |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/fgkj/controller/Battalarm_data_historyController.java b/src/main/java/com/fgkj/controller/Battalarm_data_historyController.java
index 42934d7..5a9abea 100644
--- a/src/main/java/com/fgkj/controller/Battalarm_data_historyController.java
+++ b/src/main/java/com/fgkj/controller/Battalarm_data_historyController.java
@@ -26,17 +26,16 @@
 
 	//3.2鐢垫睜鍛婅鏌ヨ(鍒犻櫎璁板綍)
 	@DeleteMapping("/")
-	@ApiOperation(notes = "",value="鐢垫睜鍛婅鏌ヨ(鍒犻櫎璁板綍)")
+	@ApiOperation(notes = "[{ \"num\": 1816, \"stationname\": \"\", \"note\": \"\" }]",value="鐢垫睜鍛婅鏌ヨ(鍒犻櫎璁板綍)")
 	public ServiceModel delete(@RequestBody List<Battalarm_data_history> list) {
-		// List<Battalarm_data_history> list=getGson().fromJson(json, new TypeToken<List<Battalarm_data_history>>(){}.getType());
-		ServiceModel model=service.delete(list);
+		ServiceModel model = service.delete(list);
 		return model;
 	}
+
 	//3.2鐢垫睜鍛婅鍘嗗彶璁板綍鏌ヨ
-	@GetMapping("byInfo")
-	@ApiOperation(notes = "",value="鐢垫睜鍛婅鍘嗗彶璁板綍鏌ヨ")
+	@PostMapping("byInfo")
+	@ApiOperation(notes = "binf.stationName1&binf.stationName 妯$硦鏌ヨ { \"binf\": { \"stationName\": \"\", \"stationName1\": \"\", \"battGroupId\": 0 },\"mainf\": { \"num\": 0, \"battGroupId\": 0, \"uname\": \"\", \"fault_level\": 0, \"fault_type_id\": 0, \"record_uid\": 0, \"maint_type_id\": 0, \"maint_done\": 0, \"maint_close\": 0, \"master_audit\": 0, \"appoint_uid\": 0 },\"pageBean\": { \"pageSize\": 10, \"pageNum\": 0 },\"adata_H\": { \"alm_id\": 0, \"alm_signal_id\": 0, \"alm_start_time\": \"2021-01-29 09:40:11\", \"alm_start_time1\": \"2021-01-29 09:40:11\" } }",value="鐢垫睜鍛婅鍘嗗彶璁板綍鏌ヨ")
 	public ServiceModel serchByInfo(@RequestBody Batt_Maint_Dealarm bmd){
-		// Batt_Maint_Dealarm bmd = ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Batt_Maint_Dealarm.class);
 		User_inf uinf=(User_inf) ActionUtil.getUser();
 		bmd.setUinf(uinf);
 		ServiceModel model=service.serchByInfo(bmd);

--
Gitblit v1.9.1