|
|
@@ -220,7 +220,6 @@ public class MsgCharngingRunner {
|
|
|
if(port==1){
|
|
|
voltage = statusJSON.getInteger("voltage");
|
|
|
}else{
|
|
|
-
|
|
|
voltage = statusJSON.getInteger("voltage_1");
|
|
|
if(voltage==null){
|
|
|
voltage = statusJSON.getInteger("voltage");
|
|
|
@@ -231,9 +230,6 @@ public class MsgCharngingRunner {
|
|
|
power = statusJSON.getInteger("power");
|
|
|
}else{
|
|
|
power = statusJSON.getInteger("power_1");
|
|
|
- if(power==null){
|
|
|
- power = statusJSON.getInteger("power");
|
|
|
- }
|
|
|
}
|
|
|
|
|
|
if(power==null){
|
|
|
@@ -268,7 +264,7 @@ public class MsgCharngingRunner {
|
|
|
if (elec.equals(new BigDecimal("0.0000"))) {
|
|
|
elec = elec.add(new BigDecimal("0.0001").setScale(4, BigDecimal.ROUND_DOWN));
|
|
|
}
|
|
|
- log.info("{}-{}充电中=>实时elec>>>实时金额>>>{}=>p:{},v:{}" + elec,orderStatus.getPileCode(),orderStatus.getGunsCode(),money,power,voltage);
|
|
|
+ log.info("{}-{}-{}充电中=>实时elec:{}>>>实时金额>>>{}=>p:{},v:{}" ,orderStatus.getPileCode(),port,elec,orderStatus.getGunsCode(),money,power,voltage);
|
|
|
|
|
|
//????????????????????????????
|
|
|
if (money.compareTo(orderStatus.getStartMoney()) > 0) {
|