From 1c6f32cc6674dea616f220920f06b455153ded56 Mon Sep 17 00:00:00 2001
From: whycrzg <ruanzhigang@whycst.com>
Date: 星期六, 20 二月 2021 17:08:31 +0800
Subject: [PATCH] update battMaintInf# etc
---
src/main/java/com/fgkj/controller/Batt_maint_infController.java | 59 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 34 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/fgkj/controller/Batt_maint_infController.java b/src/main/java/com/fgkj/controller/Batt_maint_infController.java
index 83e6838..b8331cc 100644
--- a/src/main/java/com/fgkj/controller/Batt_maint_infController.java
+++ b/src/main/java/com/fgkj/controller/Batt_maint_infController.java
@@ -4,6 +4,7 @@
import com.fgkj.services.Batt_maint_infService;
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;
@@ -24,12 +25,11 @@
//2.1鐢垫睜鏁呴殰缁存姢璁板綍鏌ヨ
- @GetMapping("maint")
- @ApiOperation(notes = "",value="鐢垫睜鏁呴殰缁存姢璁板綍鏌ヨ")
+ @PostMapping("maint")
+ @ApiOperation(notes = "TODO have no data",value="鐢垫睜鏁呴殰缁存姢璁板綍鏌ヨ")
public ServiceModel serchMaint(@RequestBody Batt_Maint_Dealarm bd){
- //System.out.println(bd);
- // bd = ActionUtil.getGson("yyyy-MM-dd").fromJson(result, Batt_Maint_Dealarm.class);
- ServiceModel model=service.serchMaint(bd);
+ System.out.println(bd);
+ ServiceModel model=service.serchMaint(bd);//222涓嶅甫鏉′欢鏌ヨ鏃犳暟鎹�
return model;
}
@@ -40,8 +40,8 @@
* master_check瀛樻斁鍖呮満浜�
* remark瀛樻斁鍝佺墝
*/
- @GetMapping("byCondition")
- @ApiOperation(notes = "",value="鐢垫睜鏁呴殰澶勭悊缁熻鏌ヨ")
+ @PostMapping("byCondition")
+ @ApiOperation(notes = "TODO have no data",value="鐢垫睜鏁呴殰澶勭悊缁熻鏌ヨ")
public List serchByCondition(@RequestBody Batt_User_Permit bup){
// bup= ActionUtil.getGson("yyyy-MM-dd").fromJson(result, Batt_User_Permit.class);
List list=service.serchByCondition(bup);
@@ -50,7 +50,7 @@
//0.3鏌ヨ鎵�鏈夌殑缁存姢璁板綍锛堝彧浼爌age瀵硅薄锛�
@GetMapping("/")
- @ApiOperation(notes = "",value="鏌ヨ鎵�鏈夌殑缁存姢璁板綍锛堝彧浼爌age瀵硅薄锛�")
+ @ApiOperation(notes = "TODO have no data",value="鏌ヨ鎵�鏈夌殑缁存姢璁板綍锛堝彧浼爌age瀵硅薄锛�")
public ServiceModel search(){
ServiceModel model=service.search();
return model;
@@ -58,33 +58,40 @@
//0.4鐢垫睜缁勬晠闅滅巼
@GetMapping("all")
- @ApiOperation(notes = "",value="鐢垫睜缁勬晠闅滅巼")
- public ServiceModel searchAll(){
- ServiceModel model=service.searchAll();
- return model;
+ @ApiOperation(notes = "newsum 鎵�鏈夋晠闅滅殑鐢垫睜缁�;sum 鎵�鏈夌殑鐢垫睜缁�",value="鐢垫睜缁勬晠闅滅巼")
+ public ServiceModelOnce searchAll(){
+
+ return service.searchAll();
}
//0.4/0.8鐢垫睜缁勬晠闅滅巼/缁存姢鐜�(鏈�鏂�)
- @GetMapping("byStationName")
- @ApiOperation(notes = "",value="鐢垫睜缁勬晠闅滅巼/缁存姢鐜�(鏈�鏂�)")
- public ServiceModel searchByStationName(@RequestBody Batt_Maint_Dealarm bd) {
- ServiceModel model=service.searchByStationName(bd);
-
- return model;
+ @PostMapping("byStationName")
+ @ApiOperation(notes = "code 鏁呴殰缁存姢鏁�;newsum 鐢垫睜缁勬暟;sum 鏁呴殰鏁�; maint_done 100姹傛晠闅滅巼",value="鐢垫睜缁勬晠闅滅巼/缁存姢鐜�(鏈�鏂�) TODO 寰呮祴")
+ public ServiceModelOnce searchByStationName(@ApiParam(value = "绔欑偣", required = true) @RequestParam String stationName,
+ @ApiParam(value = "100姹傛晠闅滅巼/1姹傜淮鎶ょ巼/鍏朵粬鍏ㄩ儴", required = true) @RequestParam Integer maint_done) {
+ Batt_Maint_Dealarm bd = new Batt_Maint_Dealarm();
+ BattInf binf = new BattInf();
+ binf.setStationName(stationName);
+ Batt_maint_inf batt_maint_inf = new Batt_maint_inf();
+ batt_maint_inf.setMaint_done(maint_done);
+ bd.setMainf(batt_maint_inf);
+ bd.setBinf(binf);
+ return service.searchByStationName(bd);//鏁版嵁涓嶈冻寰呮祴
}
//鏍规嵁鐢垫睜缁刬d鏌ヨ鐢垫睜鐨勬晠闅滀俊鎭�
- @GetMapping("byBattGroupId")
- @ApiOperation(notes = "",value="鐢垫睜缁刬d鏌ヨ鐢垫睜鐨勬晠闅滀俊鎭�")
- public ServiceModel searchByBattgroupId(@RequestBody Batt_maint_inf bmi){
- // bmi=ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(result, Batt_maint_inf.class);
- ServiceModel model=service.searchByBattgroupId(bmi);
+ @PostMapping("byBattGroupId")
+ @ApiOperation(notes = "TODO have no data",value="鐢垫睜缁刬d鏌ヨ鐢垫睜鐨勬晠闅滀俊鎭疶ODO 寰呮祴")
+ public ServiceModel searchByBattgroupId(@RequestParam Integer battGroupId){
+ Batt_maint_inf bmi = new Batt_maint_inf();
+ bmi.setBattGroupId(battGroupId);
+ ServiceModel model=service.searchByBattgroupId(bmi);// have no data
return model;
}
//2.1 鐢垫睜缁存姢璁板綍鏌ヨ(缂栬緫璁板綍)
@PutMapping("/")
- @ApiOperation(notes = "",value="鐢垫睜缁存姢璁板綍鏌ヨ(缂栬緫璁板綍)")
+ @ApiOperation(notes = "",value="鐢垫睜缁存姢璁板綍鏌ヨ(缂栬緫璁板綍)TODO 寰呭畬鎴�")
public ServiceModel update(@RequestBody Batt_maint_inf bmi,@RequestBody List<Batt_maint_process> process) {
// bmi=ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(result, Batt_maint_inf.class);
// List<Batt_maint_process> process = ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, new TypeToken<List<Batt_maint_process>>(){}.getType());
@@ -94,8 +101,10 @@
//2.1 鐢垫睜缁存姢璁板綍鏌ヨ锛堝垹闄よ褰曪級
@DeleteMapping("/")
@ApiOperation(notes = "",value="鐢垫睜缁存姢璁板綍鏌ヨ锛堝垹闄よ褰曪級")
- public ServiceModel delete(@RequestBody Batt_maint_inf bmi) {
+ public ServiceModel delete(@RequestParam Integer num){
// bmi=ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(result, Batt_maint_inf.class);
+ Batt_maint_inf bmi = new Batt_maint_inf();
+ bmi.setNum(num);
ServiceModel model=service.delete(bmi);
return model;
}
--
Gitblit v1.9.1