From af54b4a9889abdcd846b419736f09a65fe05bdfe Mon Sep 17 00:00:00 2001
From: whycrzg <ruanzhigang@whycst.com>
Date: 星期一, 22 二月 2021 10:23:26 +0800
Subject: [PATCH] update
---
src/main/java/com/fgkj/controller/ram/Fbs9100_stateController.java | 92 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 75 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/fgkj/controller/ram/Fbs9100_stateController.java b/src/main/java/com/fgkj/controller/ram/Fbs9100_stateController.java
index f518b67..7ee5430 100644
--- a/src/main/java/com/fgkj/controller/ram/Fbs9100_stateController.java
+++ b/src/main/java/com/fgkj/controller/ram/Fbs9100_stateController.java
@@ -1,6 +1,7 @@
package com.fgkj.controller.ram;
import com.fgkj.dto.BattInf;
+import com.fgkj.dto.PageBean;
import com.fgkj.dto.ServiceModel;
import com.fgkj.dto.User_inf;
import com.fgkj.dto.ram.Fbs9100_state;
@@ -23,7 +24,27 @@
private Fbs9100_stateService service;
@PostMapping("/")
- @ApiOperation(notes = "",value="娣诲姞")
+ @ApiOperation(notes = "dev_id 鍞竴 {\n" +
+ " \"dev_ip\": \"\",\n" +
+ " \"dev_id\": 618500009,\n" +
+ " \"op_cmd\": 0,\n" +
+ " \"dev_datetime\": \"\",\n" +
+ " \"dev_testtype\": 0,\n" +
+ " \"dev_testgroupnum\": 0,\n" +
+ " \"dev_workstate\": 0,\n" +
+ " \"dev_alarmstate\": 0,\n" +
+ " \"dev_onlinevollow\": 0,\n" +
+ " \"dev_eachgroup_battsum\": 0,\n" +
+ " \"dev_captest_onlinevol\": 0.0,\n" +
+ " \"dev_captest_groupvol\": 0.0,\n" +
+ " \"dev_captest_curr\": 0.0,\n" +
+ " \"dev_captest_cap\": 0.0,\n" +
+ " \"dev_captest_timelong\": 0,\n" +
+ " \"dev_restest_moncount\": 0,\n" +
+ " \"dev_restest_monindex\": 0,\n" +
+ " \"dev_commcount\": 0,\n" +
+ " \"dev_errcommcount\": 0\n" +
+ "}",value="娣诲姞")
public ServiceModel add(@RequestBody Fbs9100_state state) {
// Fbs9100_state state = getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Fbs9100_state.class);
ServiceModel model = service.add(state);
@@ -32,7 +53,28 @@
}
@PutMapping("/")
- @ApiOperation(notes = "",value="淇敼")
+ @ApiOperation(notes = "{\n" +
+ "\t\"dev_ip\":\"\",\n" +
+ " \"dev_id\":\"-\",\n" +
+ " \"op_cmd\":\"-\",\n" +
+ " \"dev_datetime\":\"-\",\n" +
+ " \"dev_testtype\":\"-\",\n" +
+ " \"dev_testgroupnum\":\"-\",\n" +
+ " \"dev_workstate\":\"-\",\n" +
+ " \"dev_alarmstate\":\"-\",\n" +
+ " \"dev_onlinevollow\":\"-\",\n" +
+ " \"dev_eachgroup_battsum\":\"-\",\n" +
+ " \"dev_captest_onlinevol\":\"-\",\n" +
+ " \"dev_captest_groupvol\":\"-\",\n" +
+ " \"dev_captest_curr\":\"-\",\n" +
+ " \"dev_captest_cap\":\"-\",\n" +
+ " \"dev_captest_timelong\":\"-\",\n" +
+ " \"dev_restest_moncount\":\"-\",\n" +
+ " \"dev_restest_monindex\":\"-\",\n" +
+ " \"dev_commcount\":\"-\",\n" +
+ " \"dev_errcommcount\":\"-\",\n" +
+ " \"num\":\"-\"\n" +
+ "}",value="淇敼")
public ServiceModel update(@RequestBody Fbs9100_state state) {
// Fbs9100_state state = getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Fbs9100_state.class);
ServiceModel model = service.update(state);
@@ -41,7 +83,12 @@
//fbs9600璁惧鍐呴樆娴嬭瘯
@PutMapping("/updatePro")
- @ApiOperation(notes = "",value="fbs9600璁惧鍐呴樆娴嬭瘯")
+ @ApiOperation(notes = "[\n" +
+ " {\n" +
+ " \"op_cmd\": \"1\",\n" +
+ " \"dev_id\": \"-\"\n" +
+ " }\n" +
+ "]",value="fbs9600璁惧鍐呴樆娴嬭瘯")
public ServiceModel updatePro(@RequestBody List<Fbs9100_state> list) {
// List<Fbs9100_state> list =getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, new TypeToken<List<Fbs9100_state>>(){}.getType());
ServiceModel model = service.updatePro(list);
@@ -50,7 +97,9 @@
@DeleteMapping("/")
@ApiOperation(notes = "",value="鍒犻櫎")
- public ServiceModel delete(@RequestBody Fbs9100_state state) {
+ public ServiceModel delete(@RequestParam Integer num) {
+ Fbs9100_state state = new Fbs9100_state();
+ state.setNum(num);
// Fbs9100_state state = getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Fbs9100_state.class);
ServiceModel model = service.delete(state);
return model;
@@ -66,10 +115,15 @@
}
//11.1FBS9100璁惧閫氫俊鐘舵�佹煡璇�
- @GetMapping("byCondition")
+ @PostMapping("byCondition")
@ApiOperation(notes = "",value="FBS9100璁惧閫氫俊鐘舵�佹煡璇�")
- public ServiceModel serchByCondition(@RequestBody Fbs9100_state state){
- // Fbs9100_state state = getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Fbs9100_state.class);
+ public ServiceModel serchByCondition(@RequestParam Integer dev_errcommcount,@RequestParam Integer pageNum,@RequestParam Integer pageSize) {
+ Fbs9100_state state = new Fbs9100_state();
+ state.setDev_errcommcount(dev_errcommcount);
+ PageBean pageBean = new PageBean();
+ pageBean.setPageNum(pageNum);
+ pageBean.setPageSize(pageSize);
+ state.setPageBean(pageBean);
User_inf uinf=(User_inf) ActionUtil.getUser();
state.setNum(uinf.getuId());//灏嗙敤鎴穒d瀛樻斁鍦‵bs9100_state鐨刵um涓敤浜庡鐞嗙敤鎴风鐞嗙殑鏈烘埧闂
ServiceModel model = service.serchByCondition(state);
@@ -78,20 +132,22 @@
}
//瀹炴椂鐩戞祴鐣岄潰鏍规嵁dev_alarmstate鐘舵�佸垽鏂帴瑙﹀櫒鐘舵��
- @GetMapping("contactorState")
+ @PostMapping("contactorState")
@ApiOperation(notes = "",value="瀹炴椂鐩戞祴鐣岄潰鏍规嵁dev_alarmstate鐘舵�佸垽鏂帴瑙﹀櫒鐘舵��")
- public ServiceModel serchContactorState(@RequestBody Fbs9100_state state) {
- // Fbs9100_state state = getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Fbs9100_state.class);
+ public ServiceModel serchContactorState(@RequestParam Integer dev_id) {
+ Fbs9100_state state = new Fbs9100_state();
+ state.setDev_id(dev_id);
ServiceModel model = service.serchContactorState(state);
return model;
}
//鏀剧數娴嬭瘯鐣岄潰鏍规嵁璁惧id鏌ヨ缃戠粶鎷撴墤鍥�
- @GetMapping("byInfo")
+ @PostMapping("byInfo")
@ApiOperation(notes = "",value="鏀剧數娴嬭瘯鐣岄潰鏍规嵁璁惧id鏌ヨ缃戠粶鎷撴墤鍥�")
- public ServiceModel serchByInfo(@RequestBody BattInf binf) {
- // BattInf binf = getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, BattInf.class);
+ public ServiceModel serchByInfo(@RequestParam Integer battGroupId) {
+ BattInf binf = new BattInf();
+ binf.setBattGroupId(battGroupId);
ServiceModel model = service.serchByInfo(binf);
return model;
@@ -115,10 +171,12 @@
}
//鏌ヨ61850璁惧鐨�6绉嶅伐浣滅姸鎬�
- @GetMapping("devWorkState")
+ @PostMapping("devWorkState")
@ApiOperation(notes = "",value="鏌ヨ61850璁惧鐨�6绉嶅伐浣滅姸鎬�")
- public ServiceModel searchDevWorkstate(@RequestBody Fbs9100_state state){
- // Fbs9100_state state = getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Fbs9100_state.class);
+ public ServiceModel searchDevWorkstate(@RequestParam Integer dev_id,@RequestParam Integer dev_workstate){
+ Fbs9100_state state = new Fbs9100_state();
+ state.setDev_id(dev_id);
+ state.setDev_workstate(dev_workstate);
User_inf uinf=(User_inf) ActionUtil.getUser();
//鐢ㄦ埛id鏆傚瓨鍦╪um涓�
state.setNum(uinf.getuId());
@@ -139,7 +197,7 @@
//11.1FBS9100璁惧閫氫俊鐘舵�佹煡璇� <-- 璺ㄥ煙 -->
@GetMapping("byConditionKy")
- @ApiOperation(tags = "璺ㄥ煙", notes = "",value="FBS9100璁惧閫氫俊鐘舵�佹煡璇�")
+ @ApiOperation(tags = "璺ㄥ煙", notes = "",value="FBS9100璁惧閫氫俊鐘舵�佹煡璇� 璺ㄥ煙")
public ServiceModel serchByCondition_ky(){
//isAllowHeaders(); //鍏佽璺ㄥ煙璁块棶
ServiceModel model = service.serchByCondition_ky();
--
Gitblit v1.9.1