From ee941904edaf1310ee3b722597407602e732ca08 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期一, 16 六月 2025 14:57:42 +0800
Subject: [PATCH] 远程停止核容测试+修改节点node_station
---
src/main/java/com/whyc/service/BattInfService.java | 3 +++
src/main/java/com/whyc/service/DeviceSetparamService.java | 8 +++++++-
src/main/java/com/whyc/controller/DeviceSetparamController.java | 5 +++++
3 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/controller/DeviceSetparamController.java b/src/main/java/com/whyc/controller/DeviceSetparamController.java
index 1227ad4..f524c7c 100644
--- a/src/main/java/com/whyc/controller/DeviceSetparamController.java
+++ b/src/main/java/com/whyc/controller/DeviceSetparamController.java
@@ -40,6 +40,11 @@
public Response startDis(@RequestParam int devId, @RequestParam int battGroupNum) {
return service.startDis(devId, battGroupNum);
}
+ @ApiOperation("杩滅▼鍋滄鏍稿娴嬭瘯")
+ @GetMapping("stopDis")
+ public Response stopDis(@RequestParam int devId, @RequestParam int battGroupNum) {
+ return service.stopDis(devId, battGroupNum);
+ }
@ApiOperation("鍐呴樆娴嬭瘯")
@GetMapping("startRes")
diff --git a/src/main/java/com/whyc/service/BattInfService.java b/src/main/java/com/whyc/service/BattInfService.java
index 56db89c..6bc0429 100644
--- a/src/main/java/com/whyc/service/BattInfService.java
+++ b/src/main/java/com/whyc/service/BattInfService.java
@@ -204,6 +204,9 @@
if(sinf.getLatitude()!=null){
wrapper1.set("latitude",sinf.getLatitude());
}
+ if(sinf.getNodeStation()!=null){
+ wrapper1.set("node_station",sinf.getNodeStation());
+ }
wrapper1.eq("station_id",sinf.getStationId());
//鍐嶄慨鏀圭數婧愪俊鎭�
diff --git a/src/main/java/com/whyc/service/DeviceSetparamService.java b/src/main/java/com/whyc/service/DeviceSetparamService.java
index de28919..18558ae 100644
--- a/src/main/java/com/whyc/service/DeviceSetparamService.java
+++ b/src/main/java/com/whyc/service/DeviceSetparamService.java
@@ -107,6 +107,11 @@
boolean bl = sendCmdToDev(DevCmd.CMD_Start,DevCmd.CMD_StartDischarge, devId, battGroupNum);
return new Response().set(1,bl,bl==true?"杩滅▼鏍稿鎴愬姛!":"杩滅▼鏍稿澶辫触!");
}
+ //杩滅▼鍋滄鏍稿娴嬭瘯
+ public Response stopDis(int devId, int battGroupNum) {
+ boolean bl = sendCmdToDev(DevCmd.CMD_Stop,DevCmd.CMD_StopDischarge, devId, battGroupNum);
+ return new Response().set(1,bl,bl==true?"杩滅▼鍋滄鏍稿鎴愬姛!":"杩滅▼鍋滄鏍稿澶辫触!");
+ }
//鍐呴樆娴嬭瘯
public Response startRes(int devId, int battGroupNum) {
boolean bl = sendCmdToDev(DevCmd.CMD_Start,DevCmd.CMD_StartResDischarge, devId, battGroupNum);
@@ -114,7 +119,8 @@
}
//鍋滄鍐呴樆娴嬭瘯
public Response stopRes(int devId, int battGroupNum) {
- boolean bl = sendCmdToDev(DevCmd.CMD_Stop,DevCmd.CMD_StopDischarge, devId, battGroupNum);
+ boolean bl = sendCmdToDev(DevCmd.CMD_Stop,DevCmd.CMD_StopResDischarge, devId, battGroupNum);
return new Response().set(1,bl,bl==true?"鍋滄鍐呴樆娴嬭瘯鎴愬姛!":"鍋滄鍐呴樆娴嬭瘯澶辫触!");
}
+
}
\ No newline at end of file
--
Gitblit v1.9.1