yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

非重载命名

Browse Source
This commit is contained in:
ZZ 2022-03-14 16:25:53 +08:00
parent 946caa1f63
commit 12a33e6219
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java
View File

@ -285,8 +285,8 @@ public class ChargingController {
} }
@GetMapping("native/charging/stop/{pileNo}/{connectorId}/{version}") @GetMapping("native/charging/stop/{pileNo}/{connectorId}/{version}")
public R stopInvalidOrder(@PathVariable("pileNo") String pileNo, @PathVariable("connectorId") String connectorId, public R stopCharging(@PathVariable("pileNo") String pileNo, @PathVariable("connectorId") String connectorId,
@PathVariable("version") String version) { @PathVariable("version") String version) {
ClientHandler handler = ChargingPileServer.getHandler(pileNo); ClientHandler handler = ChargingPileServer.getHandler(pileNo);
if (handler == null) { if (handler == null) {

4
xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java
View File

@ -154,7 +154,7 @@ public class RealtimeDataLogic implements ServiceLogic {
Integer vul = (Integer) cachePile.get("voltageUpperLimits"); Integer vul = (Integer) cachePile.get("voltageUpperLimits");
Integer cul = (Integer) cachePile.get("currentLimit"); Integer cul = (Integer) cachePile.get("currentLimit");
if (wc > cul || wv > vul) { if (wc > cul || wv > vul) {
R r = chargingController.stopInvalidOrder(pileNo, gunId, default_version); R r = chargingController.stopCharging(pileNo, gunId, default_version);
if (r.getCode() == 200) { if (r.getCode() == 200) {
Integer vcpcnt = (Integer) cacheOrder.get("vcpcnt"); Integer vcpcnt = (Integer) cacheOrder.get("vcpcnt");
cacheOrder.put("vcpcnt", vcpcnt == null ? 1 : vcpcnt++); cacheOrder.put("vcpcnt", vcpcnt == null ? 1 : vcpcnt++);
@ -163,7 +163,7 @@ public class RealtimeDataLogic implements ServiceLogic {
} else { } else {
Integer stopSoc = (Integer) cacheOrder.get("stopSoc"); Integer stopSoc = (Integer) cacheOrder.get("stopSoc");
if (stopSoc != null && socInt >= stopSoc) { if (stopSoc != null && socInt >= stopSoc) {
R r = chargingController.stopInvalidOrder(pileNo, gunId, default_version); R r = chargingController.stopCharging(pileNo, gunId, default_version);
String alerted = (String) cacheOrder.get("socalerted"); String alerted = (String) cacheOrder.get("socalerted");
String tel = (String) cacheOrder.get("tel"); String tel = (String) cacheOrder.get("tel");
if (alerted == null && tel != null) { if (alerted == null && tel != null) {