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-27 17:49:45 +08:00
parent 7d3700ceb3
commit a21d135156
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/redis/StaticBeanUtil.java
View File

@ -51,4 +51,13 @@ public class StaticBeanUtil {
return upperCode; return upperCode;
} }
public synchronized static String seq18Dec(String key) {
String upperCode = "";
RedisAtomicLong counter = new RedisAtomicLong(key, REDIS.redisTemplate.getConnectionFactory());
long result = counter.incrementAndGet();
upperCode = String.format("%018d", result);
return upperCode;
}
} }

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

@ -64,6 +64,8 @@ public class RealtimeDataLogic implements ServiceLogic {
String statusplain = stable[statusInt]; String statusplain = stable[statusInt];
cacheGun.put("pileGunStatus", pvgstable[Integer.parseInt(realtimeData.getPileGunStatus())]); cacheGun.put("pileGunStatus", pvgstable[Integer.parseInt(realtimeData.getPileGunStatus())]);
cacheGun.put("vehicleGunStatus", pvgstable[Integer.parseInt(realtimeData.getVehicleGunStatus())]); cacheGun.put("vehicleGunStatus", pvgstable[Integer.parseInt(realtimeData.getVehicleGunStatus())]);
cacheGun.put("voltage", realtimeData.getWorkingVoltage());
cacheGun.put("current", realtimeData.getWorkingCurrent());
String hardwareFault = realtimeData.getHardwareFault(); String hardwareFault = realtimeData.getHardwareFault();
String hfs = toBits(hardwareFault); String hfs = toBits(hardwareFault);
char[] hfcs = hfs.toCharArray(); char[] hfcs = hfs.toCharArray();
@ -119,6 +121,8 @@ public class RealtimeDataLogic implements ServiceLogic {
Integer cacheStartSoc = (Integer) cacheOrder.get("startSoc"); Integer cacheStartSoc = (Integer) cacheOrder.get("startSoc");
if (cacheStartSoc == null) cacheOrder.put("startSoc", socInt); if (cacheStartSoc == null) cacheOrder.put("startSoc", socInt);
cacheOrder.put("endSoc", socInt); cacheOrder.put("endSoc", socInt);
cacheOrder.put("tp", realtimeData.getChargingDegree());
// cacheOrder.put("em", realtimeData.()); //todo 实时时段明细数据是否由桩直接上传?
cacheOrder.put("rbalance", balance); cacheOrder.put("rbalance", balance);
cacheOrder.put("remainingTime", tr); cacheOrder.put("remainingTime", tr);
cacheOrder.put("status", statusplain); cacheOrder.put("status", statusplain);