From 351b9a53cb9ecebdf8f79db0117f540d9c42c2a4 Mon Sep 17 00:00:00 2001
From: whycrzg <ruanzhigang@whycst.com>
Date: 星期二, 23 二月 2021 17:19:23 +0800
Subject: [PATCH] update
---
src/main/java/com/fgkj/controller/Batt_devalarm_dataController.java | 96 +++++++++++++++++++++++++++--------------------
1 files changed, 55 insertions(+), 41 deletions(-)
diff --git a/src/main/java/com/fgkj/controller/Batt_devalarm_dataController.java b/src/main/java/com/fgkj/controller/Batt_devalarm_dataController.java
index 61b1b16..5fa3c5d 100644
--- a/src/main/java/com/fgkj/controller/Batt_devalarm_dataController.java
+++ b/src/main/java/com/fgkj/controller/Batt_devalarm_dataController.java
@@ -1,73 +1,73 @@
package com.fgkj.controller;
-import com.fgkj.util.*;
-
-
import com.fgkj.dto.*;
import com.fgkj.services.Batt_devalarm_dataService;
import com.fgkj.services.Battalarm_dataService;
+import com.fgkj.util.ActionUtil;
import io.swagger.annotations.Api;
-import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
import java.util.List;
@RequestMapping("battDevAlarmData")
@RestController
-@Api
+@Api(tags = "battDevAlarmData鎺ュ彛")
public class Batt_devalarm_dataController{
- @Autowired
+ @Resource
private Batt_devalarm_dataService service;
- @Autowired
+ @Resource
private Battalarm_dataService battAlarmDataService;
-
+
//3.3璁惧鍛婅瀹炴椂鏌ヨ
- @GetMapping("byInfo")
- public ServiceModel serchByInfo(@RequestBody Batt_devalarm_data bdd) {
- // Batt_devalarm_data bdd = getGson().fromJson(json, Batt_devalarm_data.class);
+ @PostMapping("byInfo")
+ @ApiOperation(notes = "{ \"pageBean\": { \"pageNum\": 1, \"pageSize\": 3 },\"stationName\": \"\", \"stationName1\": \"\", \"alm_type\": \"\" }",value="璁惧鍛婅瀹炴椂鏌ヨ")
+ public ServiceModel getByInfo(@RequestBody Batt_devalarm_data bdd) {
User_inf uinf=(User_inf) ActionUtil.getUser();
bdd.setUinf(uinf);
- ServiceModel model= service.serchByInfo(bdd);
-
+ ServiceModel model= service.serchByInfo(bdd);
return model;
}
//3.4璁惧鍛婅鍘嗗彶璁板綍鏌ヨ
- @GetMapping("byCondition")
+ @PostMapping("byCondition")
+ @ApiOperation(notes = "{ \"pageBean\": { \"pageNum\": 1, \"pageSize\": 3 },\"binf\": { \"stationName\": \"婀栧寳鐪乗", \"stationName1\": \"婀栧寳鐪乗" },\"adata_H\": { \"alm_start_time\": \"2017-12-15 09:09:57\", \"alm_start_time1\": \"2020-12-15 09:09:57\" } }",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);
User_inf uinf=(User_inf) ActionUtil.getUser();
bmd.setUinf(uinf);
ServiceModel model = service.serchByCondition(bmd);
-
return model;
}
-
+
//3.4璁惧瀹炴椂鍛婅(纭鍛婅)<澶氭暟鎹慨鏀�>
- @PutMapping("/")
+ @PutMapping("/batch")
+ @ApiOperation(notes = "[{ \"alm_is_confirmed\": \"0\", \"alm_confirmed_time\": \"2020-11-19 16:26:01\", \"num\": \"226\" }]",value="璁惧瀹炴椂鍛婅(纭鍛婅)<澶氭暟鎹慨鏀�>")
public ServiceModel updatePro(@RequestBody List<Batt_devalarm_data> list) {
- // List<Batt_devalarm_data> list = getGson().fromJson(json,new TypeToken<List<Batt_devalarm_data>>(){}.getType());
ServiceModel model = service.updatePro(list);
return model;
}
-
+
//3.4璁惧瀹炴椂鍛婅(鍙栨秷鍛婅)<澶氭暟鎹慨鏀�>
- @PutMapping("/cancel")
+ @PutMapping("/cancelBatch")
+ @ApiOperation(notes = "[{ \"num\": 0, \"record_id\": 0, \"alm_end_time\": \"2021-01-28 08:22:34\", \"alm_cleared_type\": 0, \"note\": \"\", \"stationName\": \"\" }]",value="璁惧瀹炴椂鍛婅(鍙栨秷鍛婅)<澶氭暟鎹慨鏀�>")
public ServiceModel cancelPro(@RequestBody List<Batt_devalarm_data> list) {
- // List<Batt_devalarm_data> list = getGson().fromJson(json,new TypeToken<List<Batt_devalarm_data>>(){}.getType());
ServiceModel model = service.cancelPro(list);
return model;
}
//3.4璁惧瀹炴椂鍛婅/鍘嗗彶鍛婅(鍒犻櫎鍛婅)<澶氭暟鎹垹闄�>
- @DeleteMapping("/")
+ @DeleteMapping("/batch")
+ @ApiOperation(notes = "[{ \"alm_is_confirmed\": \"0\", \"alm_confirmed_time\": \"2020-11-19 16:26:01\", \"num\": \"226\" }]",value="璁惧瀹炴椂鍛婅/鍘嗗彶鍛婅(鍒犻櫎鍛婅)<澶氭暟鎹垹闄�>")
public ServiceModel deletePro(@RequestBody List<Batt_devalarm_data> list) {
- // List<Batt_devalarm_data> list = getGson().fromJson(json,new TypeToken<List<Batt_devalarm_data>>(){}.getType());
ServiceModel model = service.deletePro(list);
return model;
@@ -75,26 +75,34 @@
//鏌ヨ璁惧鍛婅鎬绘暟
@GetMapping("nums")
+ @ApiOperation(notes = "",value="鏌ヨ璁惧鍛婅鎬绘暟")
public ServiceModel searchNums() {
- User_inf uinf=(User_inf) ActionUtil.getUser();
- ServiceModel model = service.searchNums(uinf);
+ User_inf userInf=(User_inf) ActionUtil.getUser();
+ ServiceModel model = service.searchNums(userInf);
return model;
}
//鐐瑰嚮椤圭洰涓嬫柟鐨勬粴鍔紝鏌ヨ璇ヨ澶囧憡璀︾殑瀹炴椂淇℃伅
- @GetMapping("devAlarm")
- public ServiceModel serchDev_alarm(@RequestBody Batt_devalarm_data ddata) {
- // Batt_devalarm_data ddata=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Batt_devalarm_data.class);
+ @PostMapping("devAlarm")
+ @ApiOperation(notes = "",value="鐐瑰嚮椤圭洰涓嬫柟鐨勬粴鍔紝鏌ヨ璇ヨ澶囧憡璀︾殑瀹炴椂淇℃伅")
+ public ServiceModel serchDev_alarm(@ApiParam(value = "ID" ,required = true)@RequestParam Integer dev_id, @ApiParam(value = "绫诲瀷" ,required = true)@RequestParam Integer alm_type, @ApiParam(value = "寮�濮嬫椂闂存鏍煎紡 2021/01/28 08:22:34" ,required = true)@RequestParam Date alm_start_time) {
+ Batt_devalarm_data ddata= new Batt_devalarm_data();
+ ddata.setDev_id(dev_id);
+ ddata.setAlm_type(alm_type);
+ ddata.setAlm_start_time(alm_start_time);
ServiceModel model = service.serchDev_alarm(ddata);
return model;
}
//鏍规嵁璁惧id鏌ヨ璁惧鏄惁瀛樺湪璁惧鍛婅
- @GetMapping("levelDevAlarmOrBattAlarm_ky")
- public String serchlevelDev_alarmOrBatt_alarm_ky(@RequestBody BattInf binf){
- // BattInf binf=getGson().fromJson(json, BattInf.class);
+ @PostMapping("levelDevAlarmOrBattAlarm_ky")
+ @ApiOperation(notes = "-1绾т负battGroupId鏈煡璇㈠埌鏁版嵁",value="璁惧id鏌ヨ璁惧鏄惁瀛樺湪璁惧鍛婅")
+ public ServiceModel serchlevelDev_alarmOrBatt_alarm_ky(@ApiParam(value = "鐢垫睜缁処D",required = true)@RequestParam Integer battGroupId,@ApiParam(value = "璁惧id" ,required = true)@RequestParam Integer fbsDeviceId){
+ BattInf binf= new BattInf();
+ binf.setBattGroupId(battGroupId);
+ binf.setFbsDeviceId(fbsDeviceId);
int level_d=service.serchlevelDev_alarm(binf);
int level_b=battAlarmDataService.serchlevelBatt_alarm(binf);
String status="";
@@ -103,15 +111,17 @@
}else{
status=level_b+"绾у憡璀�";
}
- return status;
+ return new ServiceModel().set(1,status);
}
/* 鏌ヨ璁惧瀹炴椂鍛婅璁板綍(璺ㄥ煙鏂板)
* @param obj
* @return
*/
- @GetMapping("devAlarm_ky")
- public ServiceModel searchDevAlarm_ky(@RequestBody Batt_devalarm_data ddata ) {
- // Batt_devalarm_data ddata=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Batt_devalarm_data.class);
+ @PostMapping("devAlarm_ky")
+ @ApiOperation(tags = "璺ㄥ煙", notes = "",value="鏌ヨ璁惧瀹炴椂鍛婅璁板綍(璺ㄥ煙鏂板)")
+ public ServiceModel searchDevAlarm_ky(@ApiParam(value = "璁惧ID",required = true)@RequestParam Integer dev_id ) {
+ Batt_devalarm_data ddata=new Batt_devalarm_data();
+ ddata.setDev_id(dev_id);
ServiceModel model = service.searchDevAlarm(ddata);
return model;
@@ -119,15 +129,16 @@
//3.4璁惧瀹炴椂鍛婅(纭鍛婅)<澶氭暟鎹慨鏀�><-----------璺ㄥ煙------------->
@PutMapping("ky")
+ @ApiOperation(tags = "璺ㄥ煙", notes = "[{ \"num\": 0, \"alm_is_confirmed\": 0, \"alm_confirmed_time\": \"2021-01-28 08:22:34\", \"note\": \"\", \"stationName\": \"\" }]",value="璁惧瀹炴椂鍛婅(纭鍛婅)<澶氭暟鎹慨鏀�>")
public ServiceModel updatePro_ky(@RequestBody List<Batt_devalarm_data> list) {
- // List<Batt_devalarm_data> list = getGson().fromJson(json,new TypeToken<List<Batt_devalarm_data>>(){}.getType());
ServiceModel model = service.updatePro(list);
return model;
}
-
+
//3.4璁惧瀹炴椂鍛婅(鍙栨秷鍛婅)<澶氭暟鎹慨鏀�><-----------璺ㄥ煙------------->
- @PutMapping("/cancel_ky")
+ @PutMapping("/cancelBatch_ky")
+ @ApiOperation(tags = "璺ㄥ煙", notes = "[{ \"num\": 0, \"record_id\": 0, \"alm_end_time\": \"2021-01-28 08:22:34\", \"alm_cleared_type\": 0, \"note\": \"\", \"stationName\": \"\" }]", value = "璁惧瀹炴椂鍛婅(鍙栨秷鍛婅)<澶氭暟鎹慨鏀�> 璺ㄥ煙")
public ServiceModel cancelPro_ky(@RequestBody List<Batt_devalarm_data> list) {
// List<Batt_devalarm_data> list = getGson().fromJson(json,new TypeToken<List<Batt_devalarm_data>>(){}.getType());
ServiceModel model = service.cancelPro(list);
@@ -136,7 +147,8 @@
}
//3.4璁惧瀹炴椂鍛婅/(鍒犻櫎鍛婅)<澶氭暟鎹垹闄�><-----------璺ㄥ煙------------->
- @DeleteMapping("/ky")
+ @DeleteMapping("/batch_ky")
+ @ApiOperation(tags = "璺ㄥ煙", notes = "[{ \"num\": 0 }] ",value="璁惧瀹炴椂鍛婅/(鍒犻櫎鍛婅)<澶氭暟鎹垹闄�>")
public ServiceModel deletePro_ky(@RequestBody List<Batt_devalarm_data> list) {
// List<Batt_devalarm_data> list = getGson().fromJson(json,new TypeToken<List<Batt_devalarm_data>>(){}.getType());
ServiceModel model = service.deletePro(list);
@@ -144,7 +156,9 @@
return model;
}
//绱櫠灞辫タ鏍规嵁璁惧id鍜岀數姹犵粍id鏌ヨ鏈烘埧鍛婅淇℃伅
- @GetMapping("stationAlarm")
+ //TODO 鏆備笉闇�瑕�
+ @PostMapping("stationAlarm")
+ @ApiOperation(notes = "TODO 鏆備笉闇�瑕�",value="绱櫠灞辫タ鏍规嵁璁惧id鍜岀數姹犵粍id鏌ヨ鏈烘埧鍛婅淇℃伅")
public ServiceModel seachStationAlarm(@RequestBody BattInf binf) {
// BattInf binf = getGson(ActionUtil.time_yyyyMMddHHmmss).fromJson(json,BattInf.class);
ServiceModel model = service.seachStationAlarm(binf);
--
Gitblit v1.9.1