diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java
index d30104ad5..7acc7d948 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java
@@ -207,6 +207,7 @@ public class PileStationInfoServiceImpl implements PileStationInfoService {
vo.setCountryCode(pileStationInfo.getCountryCode());
vo.setConstruction(pileStationInfo.getConstruction());
vo.setBusinessHours(pileStationInfo.getBusinessHours());
+ vo.setAloneApply(pileStationInfo.getAloneApply());
// vo.setOrganizationCode(pileStationInfo.getor);
vo.setPublicFlag(pileStationInfo.getPublicFlag());
vo.setOpenFlag(pileStationInfo.getOpenFlag());
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileStationVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileStationVO.java
index 70741dc49..3e7bc64f3 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileStationVO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileStationVO.java
@@ -44,6 +44,11 @@ public class PileStationVO {
*/
private String areaCode;
+ /**
+ * 是否独立报桩
+ */
+ private String aloneApply;
+
/**
* 地区
*/
diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ChargeAlgorithmService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ChargeAlgorithmService.java
index 7f25d94ed..5a41fc502 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ChargeAlgorithmService.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ChargeAlgorithmService.java
@@ -256,7 +256,7 @@ public class ChargeAlgorithmService {
detailInfo.setBmsDemandVoltage(new BigDecimal(realTimeData_0x23.getBmsVoltageDemand()).toBigInteger().toString());
detailInfo.setBmsDemandElectricity(new BigDecimal(realTimeData_0x23.getBmsCurrentDemand()).toBigInteger().toString());
detailInfo.setChargePower(realTimeData_0x23.getOutputPower());
- detailInfo.setSingleMaxVoltage(new BigDecimal(parameterConfigData.getPileMaxOutputVoltage()).setScale(1, RoundingMode.HALF_DOWN).toString());
+ detailInfo.setSingleMaxVoltage(new BigDecimal(realTimeData_0x23.getBmsMaxVoltageAndGroup()).setScale(1, RoundingMode.HALF_DOWN).toString());
detailInfo.setSingleMinVoltage(new BigDecimal(parameterConfigData.getPileMinOutputVoltage()).setScale(1, RoundingMode.HALF_DOWN).toString());
detailInfo.setMeasuringChargeVoltage(new BigDecimal(realTimeData_0x23.getBmsChargingVoltage()).toBigInteger().toString());
diff --git a/jsowell-ui/src/views/pile/station/components/SiteInfo.vue b/jsowell-ui/src/views/pile/station/components/SiteInfo.vue
index 333af3da4..a9baacd3d 100644
--- a/jsowell-ui/src/views/pile/station/components/SiteInfo.vue
+++ b/jsowell-ui/src/views/pile/station/components/SiteInfo.vue
@@ -186,6 +186,19 @@
+
+
+
+
+
+
+
+
@@ -242,6 +255,7 @@ export default {
address: "",
stationTel: "",
matchCars: "",
+ aloneApply: "",
parkingNumber: "",
parkFeeDescribe: "",
accountNumber: "",
@@ -283,6 +297,16 @@ export default {
label: "否",
},
],
+ aloneApplyOptions: [
+ {
+ value: "1",
+ label: "是",
+ },
+ {
+ value: "0",
+ label: "否",
+ },
+ ],
rules: {
stationName: [
{