diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/ChargingPileBinaryHandler.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/ChargingPileBinaryHandler.java index 30e3ea60..c62eaa16 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/ChargingPileBinaryHandler.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/ChargingPileBinaryHandler.java @@ -179,7 +179,7 @@ public class ChargingPileBinaryHandler implements ClientBinaryHandler { ChargingStationDto cacheStation = REDIS.getCacheObject("station:".concat(cachePile.get("stationId").toString())); cachePile.put("rateModelId", cacheStation.getRateModelId()); REDIS.setCacheMap(pilekey, cachePile); - log.debug("rate model responds success√"); + log.debug("[{}] rate model[{}] responds success√", pilekey, cacheStation.getRateModelId()); } private List parseDataList(byte[] data) { diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/ChargingPileServer.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/ChargingPileServer.java index aa2fe3a2..bb45c23d 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/ChargingPileServer.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/ChargingPileServer.java @@ -112,17 +112,19 @@ public class ChargingPileServer { public static void removeHandler(String pileNo) { ClientHandler handler = handlerMap.remove(pileNo); -// handler.closeConnection(); -// log.debug("handler [{}] for ({}) close connection", handler.getName(), pileNo); String pkey = "pile:".concat(pileNo); Map cachePile = REDIS.getCacheMap(pkey); cachePile.put("status", DISCONNECTED); REDIS.setCacheMap(pkey, cachePile); putemDisconn(pileNo, cachePile); - log.debug("remove handler [{}] for ({}), now try to close conn..", handler.getName(), pileNo); - handler.closeConnection(); - pileMap.remove(handler.getName()); - versionMapper.remove(handler.getName()); + if (handler != null) { +// handler.closeConnection(); +// log.debug("handler [{}] for ({}) close connection", handler.getName(), pileNo); + log.debug("remove handler [{}] for ({}), now try to close conn..", handler.getName(), pileNo); + handler.closeConnection(); + pileMap.remove(handler.getName()); + versionMapper.remove(handler.getName()); + } } public static void sendClientMsg(String pileNo, byte[] msg) {