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 2021-09-03 05:49:34 +08:00
parent 2c8b3c403c
commit 65e3c0e5d8
2 changed files with 17 additions and 3 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

@ -229,7 +229,11 @@ public class ChargingController {
Map<String, Object> cachePile = REDIS.getCacheMap(pkey); Map<String, Object> cachePile = REDIS.getCacheMap(pkey);
Long pileRateModelId = (Long) cachePile.get("rateModelId"); Long pileRateModelId = (Long) cachePile.get("rateModelId");
cacheOrder.put("rateModelId", pileRateModelId); cacheOrder.put("rateModelId", pileRateModelId);
cacheOrder.put("pileNo", pileNo);
cacheOrder.put("balance", balance * 100); cacheOrder.put("balance", balance * 100);
cacheOrder.put("logicCardNo", startChargingData.getLogicCardNo());
cacheOrder.put("physicCardNo", startChargingData.getPhysicCardNo());
cacheOrder.put("gunId", startChargingData.getGunId());
cacheOrder.put("tel", startChargingData.getTel()); cacheOrder.put("tel", startChargingData.getTel());
cacheOrder.put("stopSoc", startChargingData.getSoc()); cacheOrder.put("stopSoc", startChargingData.getSoc());
cacheOrder.put("startSoc", 0); cacheOrder.put("startSoc", 0);

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

@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.xhpc.common.api.PileOrderService; import com.xhpc.common.api.PileOrderService;
import com.xhpc.common.api.SmsService; import com.xhpc.common.api.SmsService;
import com.xhpc.common.core.domain.R; import com.xhpc.common.core.domain.R;
import com.xhpc.common.data.down.StartChargingData;
import com.xhpc.common.data.redis.CacheRealtimeData; import com.xhpc.common.data.redis.CacheRealtimeData;
import com.xhpc.common.data.up.RealtimeData; import com.xhpc.common.data.up.RealtimeData;
import com.xhpc.pp.controller.ChargingController; import com.xhpc.pp.controller.ChargingController;
@ -98,12 +99,21 @@ public class RealtimeDataLogic implements ServiceLogic {
if (realtimeDataList == null) { if (realtimeDataList == null) {
realtimeDataList = new ArrayList<>(); realtimeDataList = new ArrayList<>();
} }
StartChargingData startChargingData = new StartChargingData();
Integer balance = (Integer) cacheOrder.get("balance"); Integer balance = (Integer) cacheOrder.get("balance");
CacheRealtimeData cacheRealtimeData = translate(realtimeData); CacheRealtimeData cacheRealtimeData = translate(realtimeData);
realtimeDataList.add(cacheRealtimeData); balance -= cacheRealtimeData.getAmountCharged();
String lord = orderkey.concat(".lord"); startChargingData.setBalance(balance);
startChargingData.setLogicCardNo(cacheOrder.get("logicCardNo").toString());
startChargingData.setPhysicCardNo(cacheOrder.get("physicCardNo").toString());
startChargingData.setPileNo(cacheOrder.get("pileNo").toString());
startChargingData.setGunId(cacheOrder.get("gunId").toString());
Thread.sleep(300);
chargingController.nativeRefreshBalance(startChargingData);
cacheRealtimeData.setCreateTime(DateUtil.now()); cacheRealtimeData.setCreateTime(DateUtil.now());
String lord = orderkey.concat(".lord");
REDIS.setCacheObject(lord, cacheRealtimeData); REDIS.setCacheObject(lord, cacheRealtimeData);
realtimeDataList.add(cacheRealtimeData);
Integer cacheStartSoc = (Integer) cacheOrder.get("startSoc"); Integer cacheStartSoc = (Integer) cacheOrder.get("startSoc");
if (cacheStartSoc == 0 && socInt != 0) cacheOrder.put("startSoc", socInt); if (cacheStartSoc == 0 && socInt != 0) cacheOrder.put("startSoc", socInt);
if (socInt != 0) cacheOrder.put("endSoc", socInt); if (socInt != 0) cacheOrder.put("endSoc", socInt);
@ -127,7 +137,7 @@ public class RealtimeDataLogic implements ServiceLogic {
} }
} }
} }
if ((balance - cacheRealtimeData.getAmountCharged()) < 50000) { if (balance < 50000) {
String alerted = (String) cacheOrder.get("lt5alerted"); String alerted = (String) cacheOrder.get("lt5alerted");
String tel = (String) cacheOrder.get("tel"); String tel = (String) cacheOrder.get("tel");
if (alerted == null && tel != null) { if (alerted == null && tel != null) {