mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-05-11 21:40:19 +08:00
update
This commit is contained in:
@@ -58,6 +58,7 @@ import org.springframework.stereotype.Service;
|
|||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
|
import java.math.RoundingMode;
|
||||||
import java.text.ParseException;
|
import java.text.ParseException;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
@@ -611,7 +612,7 @@ public class OrderService {
|
|||||||
String outputCurrent = monitorData.getOutputCurrent();
|
String outputCurrent = monitorData.getOutputCurrent();
|
||||||
data.setOutputCurrent(outputCurrent);
|
data.setOutputCurrent(outputCurrent);
|
||||||
BigDecimal power = new BigDecimal(outputCurrent).multiply(new BigDecimal(outputVoltage))
|
BigDecimal power = new BigDecimal(outputCurrent).multiply(new BigDecimal(outputVoltage))
|
||||||
.divide(new BigDecimal("1000"), 2, BigDecimal.ROUND_HALF_UP);
|
.divide(new BigDecimal("1000"), 2, RoundingMode.HALF_UP);
|
||||||
data.setPower(power.toString());
|
data.setPower(power.toString());
|
||||||
data.setSOC(monitorData.getSOC());
|
data.setSOC(monitorData.getSOC());
|
||||||
data.setBatteryMaxTemperature(monitorData.getBatteryMaxTemperature());
|
data.setBatteryMaxTemperature(monitorData.getBatteryMaxTemperature());
|
||||||
@@ -623,9 +624,9 @@ public class OrderService {
|
|||||||
vo.setOutputCurrent(data.getOutputCurrent());
|
vo.setOutputCurrent(data.getOutputCurrent());
|
||||||
vo.setOutputVoltage(data.getOutputVoltage());
|
vo.setOutputVoltage(data.getOutputVoltage());
|
||||||
vo.setSOC(data.getSOC());
|
vo.setSOC(data.getSOC());
|
||||||
BigDecimal chargingAmount = new BigDecimal(monitorData.getChargingAmount()).setScale(4, BigDecimal.ROUND_HALF_UP); // 充电金额
|
BigDecimal chargingAmount = new BigDecimal(monitorData.getChargingAmount()).setScale(4, RoundingMode.HALF_UP); // 充电金额
|
||||||
vo.setChargingAmount(chargingAmount.toString());
|
vo.setChargingAmount(chargingAmount.toString());
|
||||||
BigDecimal chargingDegree = new BigDecimal(monitorData.getChargingDegree()).setScale(4, BigDecimal.ROUND_HALF_UP); // 充电度数
|
BigDecimal chargingDegree = new BigDecimal(monitorData.getChargingDegree()).setScale(4, RoundingMode.HALF_UP); // 充电度数
|
||||||
vo.setChargingDegree(chargingDegree.toString());
|
vo.setChargingDegree(chargingDegree.toString());
|
||||||
vo.setSumChargingTime(monitorData.getSumChargingTime());
|
vo.setSumChargingTime(monitorData.getSumChargingTime());
|
||||||
vo.setTimeRemaining(monitorData.getTimeRemaining());
|
vo.setTimeRemaining(monitorData.getTimeRemaining());
|
||||||
|
|||||||
Reference in New Issue
Block a user