From 656bd1b190ed296a7bf63623dc8e9fe2bc9d3098 Mon Sep 17 00:00:00 2001
From: whycrzg <ruanzhigang@whycst.com>
Date: 星期五, 19 二月 2021 16:29:49 +0800
Subject: [PATCH] update
---
src/main/java/com/fgkj/controller/ram/Fbs9100_setparamController.java | 282 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 206 insertions(+), 76 deletions(-)
diff --git a/src/main/java/com/fgkj/controller/ram/Fbs9100_setparamController.java b/src/main/java/com/fgkj/controller/ram/Fbs9100_setparamController.java
index 4e1b60d..bbc2e4e 100644
--- a/src/main/java/com/fgkj/controller/ram/Fbs9100_setparamController.java
+++ b/src/main/java/com/fgkj/controller/ram/Fbs9100_setparamController.java
@@ -17,7 +17,7 @@
@RequestMapping("fbs9100SetParam")
@RestController
-@Api(tags = "fbs9100SetParam鎺ュ彛")
+@Api(tags = "fbs9100SetParam鎺ュ彛 TODO寰呮祴 ")
public class Fbs9100_setparamController{
@Resource
@@ -27,60 +27,108 @@
private User_logService uservice;
//鏍规嵁鏈烘埧缂栧彿鍜岀淮鎶ゅ尯鏌ヨ鏀剧數鏈烘埧鐨勪俊鎭拰鏀剧數鍙傛暟
- @GetMapping("byCondition")
+ @PostMapping("byCondition")
@ApiOperation(notes = "",value="鏈烘埧缂栧彿鍜岀淮鎶ゅ尯鏌ヨ鏀剧數鏈烘埧鐨勪俊鎭拰鏀剧數鍙傛暟")
- public ServiceModel serchByCondition(@RequestBody BattInf binf){
- // BattInf binf = getGson().fromJson(json, BattInf.class);
+ public ServiceModel serchByCondition(@RequestParam Integer num,@RequestParam String stationName1,
+ @RequestParam String stationName,@RequestParam Integer battGroupId) {
+ BattInf binf = new BattInf();
+ binf.setNum(num);
+ binf.setStationName1(stationName1);
+ binf.setStationName(stationName);
+ binf.setBattGroupId(battGroupId);
ServiceModel model = service.serchByCondition(binf);
return model;
}
//鏍规嵁璁惧id鏌ヨ璁惧鐨勬斁鐢靛弬鏁�
- @GetMapping("devParamById")
+ @PostMapping("devParamById")
@ApiOperation(notes = "",value="璁惧id鏌ヨ璁惧鐨勬斁鐢靛弬鏁�")
- public ServiceModel serchdevParam(@RequestBody BattInf binf){
+ public ServiceModel serchdevParam(@RequestParam Integer fbsDeviceId) {
+ BattInf binf = new BattInf();
+ binf.setFbsDeviceId(fbsDeviceId);
ServiceModel model = service.serchdevParam(binf);
return model;
}
//寮瑰嚭妗嗙殑纭畾鎿嶄綔
@PutMapping("update")
- @ApiOperation(notes = "",value="寮瑰嚭妗嗙殑纭畾鎿嶄綔")
+ @ApiOperation(notes = "{\n" +
+ " \"num\": 82,\n" +
+ " \"dev_id\": 961100001,\n" +
+ " \"testCmd\": 0,\n" +
+ " \"hourRate\": 0,\n" +
+ " \"disCurr\": 0.0,\n" +
+ " \"disCap\": 0.0,\n" +
+ " \"disTime\": 0,\n" +
+ " \"groupVol_Low\": 0.0,\n" +
+ " \"monomerVol_Low\": 0.0,\n" +
+ " \"monomerLowCount\": 0,\n" +
+ " \"battGroupNum\": 0,\n" +
+ " \"onlineLowAction\": 0,\n" +
+ " \"dCVolHighLimit\": 0.0,\n" +
+ " \"chargeCurrSet\": 0.0,\n" +
+ " \"monomerTmp_High\": 0.0\n" +
+ "}",value="寮瑰嚭妗嗙殑纭畾鎿嶄綔 TODO 寰呮祴")
public ServiceModel update(@RequestBody Fbs9100_setparam fbs) {
- ServiceModel model = service.update(fbs);
- { String msg="";
- if(fbs.getNum()==FBS9100_ComBase.CMD_SetDischargeParm){
- msg="淇敼"+fbs.getDev_id()+"鐨勮澶囨斁鐢靛弬鏁�";
- }else if(fbs.getNum()==FBS9100_ComBase.CMD_Start){
- msg="鍚姩"+fbs.getDev_id()+"鐨勮澶囨斁鐢�";
- }else if(fbs.getNum()==FBS9100_ComBase.CMD_Stop){
- msg="鍋滄"+fbs.getDev_id()+"鐨勮澶囨斁鐢�";
+ ServiceModel model = new ServiceModel();
+ try {
+ model = service.update(fbs);
+ { String msg="";
+ if(fbs.getNum()==FBS9100_ComBase.CMD_SetDischargeParm){
+ msg="淇敼"+fbs.getDev_id()+"鐨勮澶囨斁鐢靛弬鏁�";
+ }else if(fbs.getNum()==FBS9100_ComBase.CMD_Start){
+ msg="鍚姩"+fbs.getDev_id()+"鐨勮澶囨斁鐢�";
+ }else if(fbs.getNum()==FBS9100_ComBase.CMD_Stop){
+ msg="鍋滄"+fbs.getDev_id()+"鐨勮澶囨斁鐢�";
+ }
+ User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
+ uservice.add(ulog);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
}
- User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
- uservice.add(ulog);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
+ } catch (Exception e) {
+ e.printStackTrace();
+ model.setCode(0);
+ model.setMsg("淇敼寮傚父!");
+ return model;
}
return model;
}
//绂荤嚎鍏绘姢鍔熻兘
@PutMapping("maintain")
- @ApiOperation(notes = "",value="绂荤嚎鍏绘姢鍔熻兘")
+ @ApiOperation(notes = "{\n" +
+ " \"dev_id\": 0,\n" +
+ " \"op_cmd\": 81,\n" +
+ " \"monomerTmp_High\": 0.0,\n" +
+ " \"offLineYH_Cycle\": 0,\n" +
+ " \"offLineYHstarttime\": \"2021-01-25 08:19:35\",\n" +
+ " \"offLineYHTimes\": 0,\n" +
+ " \"offLineYHOnceCycle\": 0,\n" +
+ " \"onLineVol_Low\": 0.0\n" +
+ "}",value="绂荤嚎鍏绘姢鍔熻兘 TODO 寰呮祴")
public ServiceModel updateMaintain(@RequestBody Fbs9100_setparam fbs) {
- ServiceModel model = service.updateMaintain(fbs);
- { String msg="";
- if(fbs.getOp_cmd()==FBS9100_ComBase.CMD_SetOffLineYHParam){
- msg="璁剧疆"+fbs.getDev_id()+"鐨勮澶囩绾垮吇鎶ゅ姛鑳�";
- }else if(fbs.getOp_cmd()==FBS9100_ComBase.CMD_StartOffLine){
- msg="鍚姩"+fbs.getDev_id()+"鐨勮澶囩绾垮吇鎶ゅ姛鑳�";
- }else if(fbs.getOp_cmd()==FBS9100_ComBase.CMD_StopOffLine){
- msg="鍋滄"+fbs.getDev_id()+"鐨勮澶囩绾垮吇鎶ゅ姛鑳�";
- }else if(fbs.getOp_cmd()==FBS9100_ComBase.CMD_GetOffLineYHParam){
- msg="璇诲彇"+fbs.getDev_id()+"鐨勮澶囩绾垮吇鎶ゅ姛鑳�";
- }else if(fbs.getOp_cmd()==FBS9100_ComBase.CMD_ResetSystem){
- msg="閲嶅惎"+fbs.getDev_id()+"鐨勮澶�";
- }
- User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
- uservice.add(ulog);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
+ ServiceModel model = new ServiceModel();
+ try {
+ model = service.updateMaintain(fbs);
+ { String msg="";
+ if(fbs.getOp_cmd()==FBS9100_ComBase.CMD_SetOffLineYHParam){
+ msg="璁剧疆"+fbs.getDev_id()+"鐨勮澶囩绾垮吇鎶ゅ姛鑳�";
+ }else if(fbs.getOp_cmd()==FBS9100_ComBase.CMD_StartOffLine){
+ msg="鍚姩"+fbs.getDev_id()+"鐨勮澶囩绾垮吇鎶ゅ姛鑳�";
+ }else if(fbs.getOp_cmd()==FBS9100_ComBase.CMD_StopOffLine){
+ msg="鍋滄"+fbs.getDev_id()+"鐨勮澶囩绾垮吇鎶ゅ姛鑳�";
+ }else if(fbs.getOp_cmd()==FBS9100_ComBase.CMD_GetOffLineYHParam){
+ msg="璇诲彇"+fbs.getDev_id()+"鐨勮澶囩绾垮吇鎶ゅ姛鑳�";
+ }else if(fbs.getOp_cmd()==FBS9100_ComBase.CMD_ResetSystem){
+ msg="閲嶅惎"+fbs.getDev_id()+"鐨勮澶�";
+ }
+ User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
+ uservice.add(ulog);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ model.setCode(0);
+ model.setMsg("淇敼澶辫触!");
+ return model;
}
return model;
@@ -88,19 +136,38 @@
//鐐瑰嚮寮瑰嚭妗嗙殑璁惧畾鎸夐挳,淇敼ld6娴嬭瘯鍙傛暟
@PutMapping("ld6Param")
- @ApiOperation(notes = "",value="鐐瑰嚮寮瑰嚭妗嗙殑璁惧畾鎸夐挳,淇敼ld6娴嬭瘯鍙傛暟")
+ @ApiOperation(notes = "{\n" +
+ " \"num\": -,\n" +
+ " \"testCmd\": -,\n" +
+ " \"groupVol_LOW\": -,\n" +
+ " \"monomerVol_LOW\": -,\n" +
+ " \"monomerLowCount\": -,\n" +
+ " \"monomerTmp_High\": -,\n" +
+ " \"disTime\": -,\n" +
+ " \"disCap\": -,\n" +
+ " \"autoTestStartVol\": -,\n" +
+ " \"dev_id\": -\n" +
+ "}",value="鐐瑰嚮寮瑰嚭妗嗙殑璁惧畾鎸夐挳,淇敼ld6娴嬭瘯鍙傛暟 TODO 寰呮祴")
public ServiceModel updateld6Param(@RequestBody Fbs9100_setparam fbs){
- ServiceModel model = service.updateld6Param(fbs);
- { String msg="";
- if(fbs.getNum()==FBS9100_ComBase.CMD_SetDischargeParm){
- msg="淇敼"+fbs.getDev_id()+"鐨勮澶囨斁鐢靛弬鏁�";
- }else if(fbs.getNum()==FBS9100_ComBase.CMD_Start){
- msg="鍚姩"+fbs.getDev_id()+"鐨勮澶囨斁鐢�";
- }else if(fbs.getNum()==FBS9100_ComBase.CMD_Stop){
- msg="鍋滄"+fbs.getDev_id()+"鐨勮澶囨斁鐢�";
+ ServiceModel model = null;
+ try {
+ model = service.updateld6Param(fbs);
+ { String msg="";
+ if(fbs.getNum()==FBS9100_ComBase.CMD_SetDischargeParm){
+ msg="淇敼"+fbs.getDev_id()+"鐨勮澶囨斁鐢靛弬鏁�";
+ }else if(fbs.getNum()==FBS9100_ComBase.CMD_Start){
+ msg="鍚姩"+fbs.getDev_id()+"鐨勮澶囨斁鐢�";
+ }else if(fbs.getNum()==FBS9100_ComBase.CMD_Stop){
+ msg="鍋滄"+fbs.getDev_id()+"鐨勮澶囨斁鐢�";
+ }
+ User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
+ uservice.add(ulog);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
}
- User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
- uservice.add(ulog);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
+ } catch (Exception e) {
+ e.printStackTrace();
+ model.setCode(0);
+ model.setMsg("淇敼澶辫触!");
+ return model;
}
return model;
@@ -108,35 +175,66 @@
//鐐瑰嚮寮瑰嚭妗嗙殑璁惧畾鎸夐挳,淇敼61850娴嬭瘯鍙傛暟
@PutMapping("61850Param")
- @ApiOperation(notes = "",value="鐐瑰嚮寮瑰嚭妗嗙殑璁惧畾鎸夐挳,淇敼61850娴嬭瘯鍙傛暟")
+ @ApiOperation(notes = "{\n" +
+ " \"chargeCurrSet\": 0,\n" +
+ " \"dCVolHighLimit\": 0,\n" +
+ " \"dev_id\": 0,\n" +
+ " \"disCap\": 0,\n" +
+ " \"disCurr\": 0,\n" +
+ " \"disTime\": 0,\n" +
+ " \"groupVol_Low\": 0,\n" +
+ " \"hourRate\": 0,\n" +
+ " \"monomerLowCount\": 0,\n" +
+ " \"monomerTmp_High\": 0,\n" +
+ " \"monomerVol_Low\": 0\n" +
+ "}",value="鐐瑰嚮寮瑰嚭妗嗙殑璁惧畾鎸夐挳,淇敼61850娴嬭瘯鍙傛暟 TODO 寰呮祴")
public ServiceModel update61850Param(@RequestBody Fbs9100_setparam fbs){
- ServiceModel model = service.update61850Param(fbs);
- { String msg="";
- if(fbs.getNum()==FBS9100_ComBase.CMD_SetDischargeParm){
- msg="淇敼"+fbs.getDev_id()+"鐨勮澶囨斁鐢靛弬鏁�";
- }else if(fbs.getNum()==FBS9100_ComBase.CMD_Start){
- msg="鍚姩"+fbs.getDev_id()+"鐨勮澶囨斁鐢�";
- }else if(fbs.getNum()==FBS9100_ComBase.CMD_Stop){
- msg="鍋滄"+fbs.getDev_id()+"鐨勮澶囨斁鐢�";
+ ServiceModel model = new ServiceModel();
+ try {
+ model = service.update61850Param(fbs);
+ { String msg="";
+ if(fbs.getNum()==FBS9100_ComBase.CMD_SetDischargeParm){
+ msg="淇敼"+fbs.getDev_id()+"鐨勮澶囨斁鐢靛弬鏁�";
+ }else if(fbs.getNum()==FBS9100_ComBase.CMD_Start){
+ msg="鍚姩"+fbs.getDev_id()+"鐨勮澶囨斁鐢�";
+ }else if(fbs.getNum()==FBS9100_ComBase.CMD_Stop){
+ msg="鍋滄"+fbs.getDev_id()+"鐨勮澶囨斁鐢�";
+ }
+ User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
+ uservice.add(ulog);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
}
- User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
- uservice.add(ulog);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
+ } catch (Exception e) {
+ e.printStackTrace();
+ model.setCode(0);
+ model.setMsg("淇敼澶辫触!");
+ return model;
}
return model;
}
//鍙抽敭鏌ョ湅鍙傛暟鍜屽脊鍑烘鐨勫埛鏂版寜閽�
- @GetMapping("byDevId")
- @ApiOperation(notes = "",value="鍙抽敭鏌ョ湅鍙傛暟鍜屽脊鍑烘鐨勫埛鏂版寜閽�")
- public ServiceModel serchbyDev_id(@RequestBody Fbs9100_setparam fsparam) {
+ @PostMapping("byDevId")
+ @ApiOperation(notes = "{\n" +
+ "\"num\":\"-\",\n" +
+ "\"dev_id\":618500002,\n" +
+ "\"testCmd\":\"-\"\n" +
+ "}",value="鍙抽敭鏌ョ湅鍙傛暟鍜屽脊鍑烘鐨勫埛鏂版寜閽� TODO 寰呮祴")
+ public ServiceModel serchbyDev_id(@RequestParam Integer num,@RequestParam Integer dev_id,@RequestParam Integer testCmd) {
+ Fbs9100_setparam fsparam = new Fbs9100_setparam();
+ fsparam.setNum(num);
+ fsparam.setDev_id(dev_id);
+ fsparam.setTestCmd(testCmd);
ServiceModel model = service.serchbyDev_id(fsparam);
return model;
}
//瀹炴椂鍒锋柊鏀剧數琛ㄦ牸鐨勭數姹犵粍鐘舵��(闆嗗悎)
- @GetMapping("byInfo")
- @ApiOperation(notes = "",value="瀹炴椂鍒锋柊鏀剧數琛ㄦ牸鐨勭數姹犵粍鐘舵��(闆嗗悎)")
+ @PostMapping("byInfo")
+ @ApiOperation(notes = "[{\n" +
+ " \"fbsDeviceId\":618500001,\n" +
+ " \"battGroupId\":1000007\n" +
+ "}]",value="瀹炴椂鍒锋柊鏀剧數琛ㄦ牸鐨勭數姹犵粍鐘舵��(闆嗗悎)")
public ServiceModel serchByInfo(@RequestBody List<BattInf> binf){
// List<BattInf> binf = getGson().fromJson(json, new TypeToken<List<BattInf>>(){}.getType());
ServiceModel model = service.serchByInfo(binf);
@@ -144,38 +242,70 @@
}
//鏍规嵁鐢垫睜缁刬d鏌ヨ鐢垫睜缁勫唴鍓嶄簲鐨勫唴闃绘暟鎹�(淇敼涓哄墠10)
- @GetMapping("byThirdBatt")
+ @PostMapping("byThirdBatt")
@ApiOperation(notes = "",value="鐢垫睜缁刬d鏌ヨ鐢垫睜缁勫唴鍓嶄簲鐨勫唴闃绘暟鎹�(淇敼涓哄墠10)")
- public ServiceModel serchByThirdBatt(@RequestBody BattInf binf){
+ public ServiceModel serchByThirdBatt(@RequestParam Integer groupIndexInFBSDevice,@RequestParam Integer fbsDeviceId){
+ BattInf binf = new BattInf();
+ binf.setGroupIndexInFBSDevice(groupIndexInFBSDevice);
+ binf.setFbsDeviceId(fbsDeviceId); //910000001
ServiceModel model = service.serchByThirdBatt(binf);
return model;
}
//-----------璺ㄥ煙瀹炵幇锛堝惎鍔紝鍋滄锛夎澶囨斁鐢�
@PutMapping("update_ky")
- @ApiOperation(tags = "璺ㄥ煙", notes = "",value="璺ㄥ煙瀹炵幇锛堝惎鍔紝鍋滄锛夎澶囨斁鐢�")
+ @ApiOperation(tags = "璺ㄥ煙", notes = "{\n" +
+ "\t\"testCmd\":\"-\",\n" +
+ " \"hourRate\":\"-\",\n" +
+ " \"disCurr\":\"-\",\n" +
+ " \"disCap\":\"-\",\n" +
+ " \"disTime\":\"-\",\n" +
+ " \"groupVol_Low\":\"-\",\n" +
+ " \"monomerVol_Low\":\"-\",\n" +
+ " \"monomerLowCount\":\"-\",\n" +
+ " \"battGroupNum\":\"-\",\n" +
+ " \"onlineLowAction\":\"-\",\n" +
+ " \"dCVolHighLimit\":\"-\",\n" +
+ " \"chargeCurrSet\":\"-\",\n" +
+ " \"monomerTmp_High\":\"-\",\n" +
+ " \"dev_id\":\"-\"\n" +
+ "}",value="璺ㄥ煙瀹炵幇锛堝惎鍔紝鍋滄锛夎澶囨斁鐢�")
public ServiceModel update_ky(@RequestBody Fbs9100_setparam fbs) {
- { String msg="";
- if(fbs.getNum()==FBS9100_ComBase.CMD_SetDischargeParm){
- msg="淇敼"+fbs.getDev_id()+"鐨勮澶囨斁鐢靛弬鏁�";
- }else if(fbs.getNum()==FBS9100_ComBase.CMD_Start){
- msg="鍚姩"+fbs.getDev_id()+"鐨勮澶囨斁鐢�";
- }else if(fbs.getNum()==FBS9100_ComBase.CMD_Stop){
- msg="鍋滄"+fbs.getDev_id()+"鐨勮澶囨斁鐢�";
- }else if(fbs.getNum()==FBS9100_ComBase.CMD_GetDischargeParm){
- msg="鑾峰彇"+fbs.getDev_id()+"鐨勮澶囨斁鐢靛弬鏁�";
+ ServiceModel model = null;
+ try {
+ { String msg="";
+ if(fbs.getNum()==FBS9100_ComBase.CMD_SetDischargeParm){
+ msg="淇敼"+fbs.getDev_id()+"鐨勮澶囨斁鐢靛弬鏁�";
+ }else if(fbs.getNum()==FBS9100_ComBase.CMD_Start){
+ msg="鍚姩"+fbs.getDev_id()+"鐨勮澶囨斁鐢�";
+ }else if(fbs.getNum()==FBS9100_ComBase.CMD_Stop){
+ msg="鍋滄"+fbs.getDev_id()+"鐨勮澶囨斁鐢�";
+ }else if(fbs.getNum()==FBS9100_ComBase.CMD_GetDischargeParm){
+ msg="鑾峰彇"+fbs.getDev_id()+"鐨勮澶囨斁鐢靛弬鏁�";
+ }
}
+ model = service.update(fbs);
+ } catch (Exception e) {
+ e.printStackTrace();
+ model.setCode(0);
+ model.setMsg("淇敼澶辫触!");
+ return model;
}
- ServiceModel model = service.update(fbs);
return model;
}
//-----------璺ㄥ煙鏍规嵁鏈烘埧缂栧彿鍜岀淮鎶ゅ尯鏌ヨ鏀剧數鏈烘埧鐨勪俊鎭拰鏀剧數鍙傛暟
- @GetMapping("byCondition_ky")
- @ApiOperation(tags = "璺ㄥ煙", notes = "",value="璺ㄥ煙鏍规嵁鏈烘埧缂栧彿鍜岀淮鎶ゅ尯鏌ヨ鏀剧數鏈烘埧鐨勪俊鎭拰鏀剧數鍙傛暟")
- public ServiceModel serchByCondition_ky(@RequestBody BattInf binf){
+ @PostMapping("byCondition_ky")
+ @ApiOperation(tags = "璺ㄥ煙", notes = "",value="璺ㄥ煙鏍规嵁鏈烘埧缂栧彿鍜岀淮鎶ゅ尯鏌ヨ鏀剧數鏈烘埧鐨勪俊鎭拰鏀剧數鍙傛暟 TODO")
+ public ServiceModel serchByCondition_ky(@RequestParam Integer num,@RequestParam String stationName1,
+ @RequestParam String stationName,@RequestParam Integer battGroupId){
+ BattInf binf = new BattInf();
+ binf.setNum(num); //41
+ binf.setStationName1(stationName1);
+ binf.setStationName(stationName);
+ binf.setBattGroupId(battGroupId); //1000003
ServiceModel model = service.serchByCondition(binf);
return model;
}
--
Gitblit v1.9.1