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

起始soc逻辑修改

Browse Source
This commit is contained in:
ZZ 2021-10-12 16:20:22 +08:00
parent 338e3ab87f
commit 2423204e12
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java
View File

@ -42,7 +42,7 @@ public class OrderDataLogic implements ServiceLogic {
Map<String, Object> cacheOrder = REDIS.getCacheMap(orderkey); Map<String, Object> cacheOrder = REDIS.getCacheMap(orderkey);
CacheOrderData cacheOrderData = translate(orderData); CacheOrderData cacheOrderData = translate(orderData);
Integer startSoc = (Integer) cacheOrder.get("startSoc"); Integer startSoc = (Integer) cacheOrder.get("startSoc");
cacheOrderData.setStartSoc(startSoc); cacheOrderData.setStartSoc(startSoc == null ? 0 : startSoc);
cacheOrderData.setEndSoc((Integer) cacheOrder.get("endSoc")); cacheOrderData.setEndSoc((Integer) cacheOrder.get("endSoc"));
cacheOrderData.setStatus(1); cacheOrderData.setStatus(1);
cacheOrderData.setCreateTime(DateUtil.now()); cacheOrderData.setCreateTime(DateUtil.now());

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

@ -124,7 +124,7 @@ public class RealtimeDataLogic implements ServiceLogic {
REDIS.setCacheObject(lord, cacheRealtimeData); REDIS.setCacheObject(lord, cacheRealtimeData);
realtimeDataList.add(cacheRealtimeData); realtimeDataList.add(cacheRealtimeData);
Integer cacheStartSoc = (Integer) cacheOrder.get("startSoc"); Integer cacheStartSoc = (Integer) cacheOrder.get("startSoc");
if (cacheStartSoc == null) cacheOrder.put("startSoc", socInt); if (cacheStartSoc == null && socInt != 0) cacheOrder.put("startSoc", socInt);
cacheOrder.put("endSoc", socInt); cacheOrder.put("endSoc", socInt);
// cacheOrder.put("em", realtimeData.()); //todo 实时时段明细数据是否由桩直接上传? // cacheOrder.put("em", realtimeData.()); //todo 实时时段明细数据是否由桩直接上传?
cacheOrder.put("rbalance", balance); cacheOrder.put("rbalance", balance);