From 8cf143a196e20ddd68cbf9855290f2d3a0b78da0 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期五, 05 二月 2021 12:10:19 +0800
Subject: [PATCH] update
---
src/main/java/com/fgkj/controller/BattPower_offController.java | 53 +++++++++++++++++++++++++++++------------------------
1 files changed, 29 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/fgkj/controller/BattPower_offController.java b/src/main/java/com/fgkj/controller/BattPower_offController.java
index 6c4edd1..e131ac1 100644
--- a/src/main/java/com/fgkj/controller/BattPower_offController.java
+++ b/src/main/java/com/fgkj/controller/BattPower_offController.java
@@ -1,15 +1,10 @@
package com.fgkj.controller;
-import com.fgkj.util.*;
-
-import com.fgkj.dto.BattPower_off;
-import com.fgkj.dto.Batt_Maint_Dealarm;
-import com.fgkj.dto.ServiceModel;
-import com.fgkj.dto.User_inf;
+import com.fgkj.dto.*;
import com.fgkj.services.BattPower_offService;
+import com.fgkj.util.ActionUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -23,9 +18,8 @@
private BattPower_offService service;
@PostMapping("/")
- @ApiOperation(notes = "",value="鏂板")
+ @ApiOperation(value="鏂板")
public ServiceModel add(@RequestBody BattPower_off bpo) {
- // BattPower_off bpo = getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, BattPower_off.class);
ServiceModel model = service.add(bpo);
return model;
@@ -33,32 +27,42 @@
}
@PutMapping("/")
- @ApiOperation(notes = "",value="淇敼")
+ @ApiOperation(value="淇敼")
public ServiceModel update(@RequestBody BattPower_off bpo) {
- // BattPower_off bpo = getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, BattPower_off.class);
ServiceModel model = service.update(bpo);
return model;
}
@DeleteMapping("/")
- @ApiOperation(notes = "",value="鍒犻櫎")
- public ServiceModel delete(@RequestBody BattPower_off bpo) {
+ @ApiOperation(value="鍒犻櫎")
+ public ServiceModel delete(@RequestParam int devId) {
// BattPower_off bpo = getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, BattPower_off.class);
- ServiceModel model = service.delete(bpo);
+ ServiceModel model = service.delete(devId);
return model;
}
//鏈烘埧鏂數缁熻鏌ヨ
- /*
- * 鏃堕棿娈甸�夋嫨鏀惧湪锛歜inf鐨刡attproductdate*/
- @GetMapping("byCondition")
- @ApiOperation(notes = "鏃堕棿娈甸�夋嫨鏀惧湪锛歜inf鐨刡attproductdate",value="鏈烘埧鏂數缁熻鏌ヨ")
- public ServiceModel serchByCondition(@RequestBody Batt_Maint_Dealarm bmd){
- // Batt_Maint_Dealarm bmd = getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Batt_Maint_Dealarm.class);
+ /**
+ * 鏃堕棿娈甸�夋嫨鏀惧湪锛歜inf鐨刡attproductdate
+ * 浼犲叆鍙傛暟锛歱oweroff_starttime涓や釜->binf.BattProductDate鍜孊attProductDate1
+ * power_state->binf.num鏁板�� 鍘嗗彶鎴栬�呭疄鏃�
+ * stationName->binf.stationName
+ * stationName1->binf.stationName1
+ * page
+ *
+ * */
+ @PostMapping("byCondition")
+ @ApiOperation(notes = "浼犲叆鍙傛暟:battProductDate(鏌ヨ鏃堕棿1),battProductDate1(鏌ヨ鏃堕棿2),num(瀹炴椂涓�1,鍘嗗彶涓�0),stationName,stationName1, " +
+ "pageNum,pageSize," +
+ "鍏朵腑pageNum鍜宲ageSize鏀惧湪url涓�,鍏朵粬鍙傛暟鏀惧湪body閲�",value="鏈烘埧鏂數缁熻鏌ヨ")
+ public ServiceModel serchByCondition(@RequestBody BattInf battInf,@RequestParam int pageNum,@RequestParam int pageSize){
User_inf uinf=(User_inf) ActionUtil.getUser();
- bmd.setUinf(uinf);
- ServiceModel model = service.serchByCondition(bmd);
+ battInf.setMonNum(uinf.getuId());
+ PageBean pageBean = new PageBean();
+ pageBean.setPageNum(pageNum);
+ pageBean.setPageSize(pageSize);
+ ServiceModel model = service.getByCondition(battInf,pageBean);
return model;
}
@@ -72,13 +76,14 @@
return model;
}
- @GetMapping("all")
+
+ /*@GetMapping("all")
@ApiOperation(notes = "",value="all")
public ServiceModel searchAll(){
ServiceModel model = service.searchAll();
return model;
- }
+ }*/
--
Gitblit v1.9.1