From 3244b550596e0330031b3f4547356927df83b0ad Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 19 五月 2025 11:48:35 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/util/TCECCJianGuanontroller.java | 235 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 151 insertions(+), 84 deletions(-)
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/util/TCECCJianGuanontroller.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/util/TCECCJianGuanontroller.java
index f03e1c8..1894f2a 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/util/TCECCJianGuanontroller.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/util/TCECCJianGuanontroller.java
@@ -3,6 +3,9 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.nacos.common.utils.JacksonUtils;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.MapperFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.ruoyi.chargingPile.api.feignClient.*;
import com.ruoyi.chargingPile.api.model.*;
import com.ruoyi.common.core.domain.R;
@@ -257,7 +260,7 @@
if(null == pageSize){
pageSize = 10;
}
- PageInfo<Site> siteListPaging = siteClient.getSiteListPaging(pageNo, pageSize, new ArrayList<>());
+ PageInfo<Site> siteListPaging = siteClient.getSiteListPagingJianGuan(pageNo, pageSize, new ArrayList<>());
List<TParkingLot> parkingLots = parkingLotClient.getAllParkingLot().getData();
QueryStationsInfoResult queryStationsInfoResult = new QueryStationsInfoResult();
queryStationsInfoResult.setPageNo(pageNo);
@@ -290,7 +293,8 @@
for (Site datum : sites) {
StationInfo stationInfo = new StationInfo();
stationInfo.setStationUniqueNumber(datum.getCode());
- stationInfo.setAreaCodeCountryside(datum.getCountryCode());
+ stationInfo.setAreaCodeCountryside(datum.getDistrictsCode());
+ stationInfo.setAreaCode((Integer.parseInt(datum.getCityCode())+1)+"");
stationInfo.setStationClassification(datum.getStationClassification());
stationInfo.setGeneralApplicationType(datum.getGeneralApplicationType());
if (org.springframework.util.StringUtils.hasLength(datum.getSwapMatchCars())){
@@ -300,7 +304,9 @@
stationInfo.setBusineHours(datum.getStartServiceTime());
stationInfo.setRoundTheClock(datum.getRoundTheClock());
stationInfo.setParkType(datum.getParkType());
- stationInfo.setElectricityFee("{"+datum.getElectricityFee()+"}");
+ if (org.springframework.util.StringUtils.hasLength(datum.getElectricityFee())){
+ stationInfo.setElectricityFee("{"+datum.getElectricityFee()+"}");
+ }
stationInfo.setServiceFee("{"+datum.getServiceFee()+"}");
stationInfo.setParkFee("{\"rules\":"+datum.getParkFee()+","+"\"freeDuration\":"+datum.getParkFeeFree()+"}");
stationInfo.setElectricityType(datum.getElectricityType());
@@ -335,7 +341,6 @@
stationInfo.setEquipmentOwnerID("906171535");
stationInfo.setStationName(datum.getName());
stationInfo.setCountryCode(StringUtils.isNotEmpty(datum.getCountryCode()) ? datum.getCountryCode() : "CN");
- stationInfo.setAreaCode(datum.getDistrictsCode());
stationInfo.setAddress(datum.getAddress());
stationInfo.setStationTel(datum.getPhone());
stationInfo.setServiceTel(serviceTel);
@@ -1744,13 +1749,25 @@
String timeStamp = System.currentTimeMillis() + "";
SequenceGenerator generator = new SequenceGenerator();
String nextSequence = generator.getNextSequence();
- String data = AesEncryption.encrypt(OurDataSecret, OurDataSecretIV,JSONObject.toJSONString(superviseQueryOperatorInfoResultPage));
+ // 使用 Jackson 转换为 JSON
+ ObjectMapper objectMapper = new ObjectMapper();
+ objectMapper.enable(MapperFeature.USE_ANNOTATIONS); // 启用注解支持
+ String json = null;
+ try {
+ json = objectMapper.writeValueAsString(superviseQueryOperatorInfoResultPage);
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
+ String data = AesEncryption.encrypt(OurDataSecret, OurDataSecretIV,json);
String hmacMD5 = HMacMD5Util.getHMacMD5(OperatorID,timeStamp, data,nextSequence,OurSigSecret);
BaseResult baseResult = new BaseResult();
baseResult.setData(data);
baseResult.setSig(hmacMD5);
baseResult.setRet(0);
baseResult.setMsg("OK");
+ Long mapKey = Long.valueOf(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));
+ baseResult.setTimeStamp(mapKey);
+ baseResult.setSeq("0001");
baseResult.setOperatorID(OperatorID);
return baseResult;
}
@@ -1781,7 +1798,7 @@
if(stationIDs==null){
stationIDs = new ArrayList<String>();
}
- PageInfo<Site> siteListPaging = siteClient.getSiteListPaging(pageNo, pageSize, stationIDs);
+ PageInfo<Site> siteListPaging = siteClient.getSiteListPagingJianGuan(pageNo, pageSize, stationIDs);
List<TParkingLot> parkingLots = parkingLotClient.getAllParkingLot().getData();
QueryStationsInfoResult queryStationsInfoResult = new QueryStationsInfoResult();
queryStationsInfoResult.setPageNo(pageNo);
@@ -1799,13 +1816,17 @@
}
stationInfo.setRoundTheClock(stationInfo.getRoundTheClock()==null?1:stationInfo.getRoundTheClock());
stationInfo.setParkType(stationInfo.getParkType()==null?1:stationInfo.getParkType());
- stationInfo.setElectricityFee("{\"00:00:00-00:30:00\":\"0.4901\",\"00:00:30-01:00:00\":\"0.1234\"}");
- stationInfo.setServiceFee("{"+"\"00:00:00-00:30:00\":\"0.4901\",\"00:00:30-01:00:00\":\"0.1234\""+"}");
+ if (!org.springframework.util.StringUtils.hasLength(stationInfo.getElectricityFee())){
+ stationInfo.setElectricityFee("{\"00:00:00-00:30:00\":\"0.4901\",\"00:00:30-01:00:00\":\"0.1234\"}");
+ }
+ if (!org.springframework.util.StringUtils.hasLength(stationInfo.getServiceFee())){
+ stationInfo.setServiceFee("{"+"\"00:00:00-00:30:00\":\"0.4901\",\"00:00:30-01:00:00\":\"0.1234\""+"}");
+ }
stationInfo.setElectricityType(stationInfo.getElectricityType()==null?1:stationInfo.getElectricityType());
stationInfo.setBusinessExpandType(stationInfo.getBusinessExpandType()==null?1:stationInfo.getBusinessExpandType());
stationInfo.setCapacity(stationInfo.getCapacity()==null?new BigDecimal("1.0000"):stationInfo.getCapacity());
stationInfo.setRatedPower(stationInfo.getCapacity()==null?new BigDecimal("40.0000"):stationInfo.getCapacity());
- stationInfo.setPeriodFee(1);
+ stationInfo.setPeriodFee(stationInfo.getPeriodFee()==null?1:stationInfo.getPeriodFee());
stationInfo.setOfficialRunTime(org.springframework.util.StringUtils.hasLength(stationInfo.getOfficialRunTime())?stationInfo.getOfficialRunTime():"2025-01-01");
stationInfo.setVideoMonitor(stationInfo.getVideoMonitor()==null?1:stationInfo.getVideoMonitor());
int i = 0;
@@ -1832,28 +1853,49 @@
}
stationInfo.setEquipmentOwnerName("明星新能源");
- stationInfo.setResidentNo("A1234");
+ if (org.springframework.util.StringUtils.hasLength(stationInfo.getResidentNo())){
+ stationInfo.setResidentNo(stationInfo.getResidentNo());
+ }else{
+ stationInfo.setResidentNo("A1234");
+
+ }
stationInfo.setSupplyType(stationInfo.getSupplyType()==null?1:stationInfo.getSupplyType());
stationInfo.setWattHourMeterNo(org.springframework.util.StringUtils.hasLength(stationInfo.getWattHourMeterNo())?stationInfo.getWattHourMeterNo():UUID.randomUUID().toString().replaceAll("-", ""));
stationInfo.setForwardPower(stationInfo.getForwardPower()==null?"1.3654":stationInfo.getForwardPower());
String uuid = UUID.randomUUID().toString();
String randomString = uuid.replaceAll("-", ""); // 去除'-'
- stationInfo.setRecordUniqueNo(randomString);
-
+ if (org.springframework.util.StringUtils.hasLength(stationInfo.getRecordUniqueNo())){
+ stationInfo.setRecordUniqueNo(stationInfo.getRecordUniqueNo());
+ }else{
+ stationInfo.setRecordUniqueNo(randomString);
+ }
}
String timeStamp = System.currentTimeMillis() + "";
SequenceGenerator generator = new SequenceGenerator();
String nextSequence = generator.getNextSequence();
- String data = AesEncryption.encrypt(OurDataSecret, OurDataSecretIV,JSONObject.toJSONString(queryStationsInfoResult));
+ // 使用 Jackson 转换为 JSON
+ ObjectMapper objectMapper = new ObjectMapper();
+ objectMapper.enable(MapperFeature.USE_ANNOTATIONS); // 启用注解支持
+ String json = null;
+ try {
+ json = objectMapper.writeValueAsString(queryStationsInfoResult);
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
+ String data = AesEncryption.encrypt(OurDataSecret, OurDataSecretIV,json);
String hmacMD5 = HMacMD5Util.getHMacMD5(OurOperatorID,timeStamp, data,nextSequence,OurSigSecret);
BaseResult baseResult = new BaseResult();
baseResult.setData(data);
baseResult.setSig(hmacMD5);
baseResult.setRet(0);
baseResult.setMsg("OK");
+ Long mapKey = Long.valueOf(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));
+ baseResult.setTimeStamp(mapKey);
+ baseResult.setSeq("0001");
baseResult.setOperatorID("906171535");
return baseResult;
}
+
/**
@@ -1936,13 +1978,25 @@
String timeStamp = System.currentTimeMillis() + "";
SequenceGenerator generator = new SequenceGenerator();
String nextSequence = generator.getNextSequence();
- String data = AesEncryption.encrypt(OurDataSecret, OurDataSecretIV,JSONObject.toJSONString(queryStationStatusResult));
+ // 使用 Jackson 转换为 JSON
+ ObjectMapper objectMapper = new ObjectMapper();
+ objectMapper.enable(MapperFeature.USE_ANNOTATIONS); // 启用注解支持
+ String json = null;
+ try {
+ json = objectMapper.writeValueAsString(queryStationStatusResult);
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
+ String data = AesEncryption.encrypt(OurDataSecret, OurDataSecretIV,json);
String hmacMD5 = HMacMD5Util.getHMacMD5(OurOperatorID,timeStamp, data,nextSequence,OurSigSecret);
BaseResult baseResult = new BaseResult();
baseResult.setData(data);
baseResult.setSig(hmacMD5);
baseResult.setRet(0);
baseResult.setMsg("OK");
+ Long mapKey = Long.valueOf(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));
+ baseResult.setTimeStamp(mapKey);
+ baseResult.setSeq("0001");
baseResult.setOperatorID("906171535");
return baseResult;
}
@@ -2064,10 +2118,8 @@
supEquipChargeStatus.setStartTime(chargingOrder.getStartTime() != null ? chargingOrder.getStartTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) : "");
supEquipChargeStatus.setEndTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
supEquipChargeStatus.setTotalPower(chargingOrder.getElectrovalence());
- List<Operator> operators = operatorClient.getAllOperator().getData();
- for (Operator operator : operators) {
- tcecSuperviseUtil.notificationSupEquipChargeStatus(operator, supEquipChargeStatus);
- }
+
+ tcecSuperviseUtil.notificationSupEquipChargeStatus(new Operator(), supEquipChargeStatus);
return R.ok();
}
/**
@@ -2110,11 +2162,7 @@
supChargeOrderInfo.setStopDesc("费用不足中止");
break;
}
-
- List<Operator> operators = operatorClient.getAllOperator().getData();
- for (Operator operator : operators) {
- tcecSuperviseUtil.notificationChargeOrderInfo(operator, supChargeOrderInfo);
- }
+ tcecSuperviseUtil.notificationChargeOrderInfo(new Operator(), supChargeOrderInfo);
return R.ok();
}
@@ -2128,73 +2176,92 @@
public R superviseNotificationStationInfo(@RequestParam("id") Integer id){
String serviceTel = systemConfigurationClient.getServerPhone().getData();
Site site = siteClient.getSiteAll().getData().stream().filter(e -> e.getId().equals(id)).findFirst().orElse(new Site());
+ List<Site> sites = new ArrayList<>();
+ sites.add(site);
- List<TChargingPile> tChargingPiles = chargingPileClient.getChargingPileBySiteIds(Collections.singletonList(site.getId())).getData();
- List<Integer> collect1 = tChargingPiles.stream().map(TChargingPile::getId).collect(Collectors.toList());
- List<TChargingGun> chargingGunList = chargingGunClient.getChargingGunByChargingPileIds(collect1).getData();
- SupStationInfo supStationInfo = new SupStationInfo();
- supStationInfo.setStationID(site.getId().toString());
- supStationInfo.setStationUniqueNumber(site.getDistrictsCode() + "906171535" + site.getId());
- supStationInfo.setOperatorID("906171535");
- supStationInfo.setEquipmentOwnerID("906171535");
- supStationInfo.setStationName(site.getName());
- supStationInfo.setCountryCode(site.getCountryCode());
- supStationInfo.setAreaCode(site.getCityCode());
- supStationInfo.setAddress(site.getAddress());
- supStationInfo.setAreaCodeCountryside(site.getAreaCodeCountryside());
- supStationInfo.setStationTel(site.getPhone());
+ List<TParkingLot> parkingLots = parkingLotClient.getAllParkingLot().getData();
+ QueryStationsInfoResult queryStationsInfoResult = new QueryStationsInfoResult();
+ queryStationsInfoResult.setStationInfos(buildSite(parkingLots, sites));
+ for (StationInfo stationInfo : queryStationsInfoResult.getStationInfos()) {
+ stationInfo.setStationClassification(stationInfo.getStationClassification()==null?1:stationInfo.getStationClassification());
+ stationInfo.setGeneralApplicationType(stationInfo.getGeneralApplicationType()==null?1:stationInfo.getGeneralApplicationType());
+ stationInfo.setSiteGuide(org.springframework.util.StringUtils.hasLength(stationInfo.getSiteGuide()) ?stationInfo.getSiteGuide():"站点引导");
+ if (stationInfo.getConstruction()!=null){
+ stationInfo.setConstruction(stationInfo.getConstruction() == 0 ? ConstructionEnum.OTHER.getType() : stationInfo.getConstruction());
+ }else{
+ stationInfo.setConstruction(255);
+ }
+ stationInfo.setRoundTheClock(stationInfo.getRoundTheClock()==null?1:stationInfo.getRoundTheClock());
+ stationInfo.setRoundTheClock(0);
+ stationInfo.setParkType(stationInfo.getParkType()==null?1:stationInfo.getParkType());
+ if (org.springframework.util.StringUtils.hasLength(site.getElectricityFee())){
+ stationInfo.setElectricityFee("{"+site.getElectricityFee()+"}");
+ }else{
+ stationInfo.setElectricityFee("{\"00:00:00-00:30:00\":\"0.4901\",\"00:00:30-01:00:00\":\"0.1234\"}");
+ }
+ if (org.springframework.util.StringUtils.hasLength(site.getServiceFee())){
+ stationInfo.setServiceFee("{"+site.getServiceFee()+"}");
+ }else{
+ stationInfo.setServiceFee("{"+"\"00:00:00-00:30:00\":\"0.4901\",\"00:00:30-01:00:00\":\"0.1234\""+"}");
+ }
+ stationInfo.setElectricityType(stationInfo.getElectricityType()==null?1:stationInfo.getElectricityType());
+ stationInfo.setBusinessExpandType(stationInfo.getBusinessExpandType()==null?1:stationInfo.getBusinessExpandType());
+ stationInfo.setCapacity(stationInfo.getCapacity()==null?new BigDecimal("1.0000"):stationInfo.getCapacity());
+ stationInfo.setRatedPower(stationInfo.getCapacity()==null?new BigDecimal("40.0000"):stationInfo.getCapacity());
+ stationInfo.setPeriodFee(1);
+ stationInfo.setOfficialRunTime(org.springframework.util.StringUtils.hasLength(stationInfo.getOfficialRunTime())?stationInfo.getOfficialRunTime():"2025-01-01");
+ stationInfo.setVideoMonitor(stationInfo.getVideoMonitor()==null?1:stationInfo.getVideoMonitor());
+ int i = 0;
+ for (EquipmentInfo equipmentInfo : stationInfo.getEquipmentInfos()) {
+ i++;
+ equipmentInfo.setManufacturerID("906171534");
+ equipmentInfo.setEquipmentUniqueNumber(org.springframework.util.StringUtils.hasLength(equipmentInfo.getEquipmentUniqueNumber())?equipmentInfo.getEquipmentUniqueNumber():"OIX123"+i);
+ equipmentInfo.setManufacturerName(org.springframework.util.StringUtils.hasLength(equipmentInfo.getManufacturerName())?equipmentInfo.getManufacturerName():"生产商");
+ equipmentInfo.setEquipmentModel(org.springframework.util.StringUtils.hasLength(equipmentInfo.getEquipmentModel())?equipmentInfo.getEquipmentModel():"DEVICE"+i);
+ equipmentInfo.setProductionDate(org.springframework.util.StringUtils.hasLength(equipmentInfo.getProductionDate())?equipmentInfo.getProductionDate():"2024-01-01");
+ equipmentInfo.setEquipmentType(equipmentInfo.getEquipmentType()==null?1:equipmentInfo.getEquipmentType());
+ for (ConnectorInfo connectorInfo : equipmentInfo.getConnectorInfos()) {
+ connectorInfo.setEquipmentClassification(connectorInfo.getEquipmentClassification()==null?1:connectorInfo.getEquipmentClassification());
+ connectorInfo.setVoltageUpperLimits(connectorInfo.getConstantVoltageUpperLimits()==null?new BigDecimal("1.0000"):connectorInfo.getConstantVoltageUpperLimits());
+ connectorInfo.setVoltageLowerLimits(connectorInfo.getConstantVoltageLowerLimits()==null?new BigDecimal("1.0000"):connectorInfo.getConstantVoltageLowerLimits());
+ connectorInfo.setCurrent(connectorInfo.getCurrent()==null?1:connectorInfo.getCurrent());
+ connectorInfo.setPower(connectorInfo.getPower()==null?new BigDecimal("1.0000"):connectorInfo.getPower());
+ connectorInfo.setNationalStandard(connectorInfo.getNationalStandard()==null?1:connectorInfo.getNationalStandard());
+ connectorInfo.setAuxPower(connectorInfo.getAuxPower()==null?1:connectorInfo.getAuxPower());
+ connectorInfo.setOpreateStatus(connectorInfo.getOpreateStatus()==null?50:connectorInfo.getOpreateStatus());
+ }
+ equipmentInfo.setPower(equipmentInfo.getPower()==null?new BigDecimal("1.0000"):equipmentInfo.getPower());
+ equipmentInfo.setEquipmentClassification(equipmentInfo.getEquipmentClassification()==null?1:equipmentInfo.getEquipmentClassification());
- supStationInfo.setServiceTel(serviceTel);
- supStationInfo.setStationClassification(site.getStationClassification());
- supStationInfo.setGeneralApplicationType(site.getGeneralApplicationType());
- supStationInfo.setStationType(site.getSiteType());
- supStationInfo.setStationStatus(site.getStatus());
- supStationInfo.setParkNums(site.getParkingSpace());
- supStationInfo.setStationLat(new BigDecimal(site.getLat()).setScale(6, RoundingMode.DOWN));
- supStationInfo.setStationLng(new BigDecimal(site.getLon()).setScale(6, RoundingMode.DOWN));
- supStationInfo.setSiteGuide(site.getGuide());
- supStationInfo.setConstruction(site.getConstructionSite() == 0 ? ConstructionEnum.OTHER.getType() : site.getConstructionSite());
- supStationInfo.setPictures(StringUtils.isNotEmpty(site.getImgUrl()) ? Arrays.asList(site.getImgUrl().split(",")) : new ArrayList<>());
+ }
+ if (org.springframework.util.StringUtils.hasLength(site.getEquipmentOwnerName())){
+ stationInfo.setEquipmentOwnerName(site.getEquipmentOwnerName());
+ }else{
+ stationInfo.setEquipmentOwnerName("明星新能源");
- supStationInfo.setMatchCars(site.getVehicleDescription());
- if (org.springframework.util.StringUtils.hasLength(site.getSwapMatchCars())){
- supStationInfo.setSwapMatchCars(Arrays.asList(site.getSwapMatchCars().split(",")));
+ }
+ if (org.springframework.util.StringUtils.hasLength(site.getResidentNo())){
+ stationInfo.setResidentNo(site.getResidentNo());
+ }else{
+ stationInfo.setResidentNo("A1234");
+
+ }
+ stationInfo.setSupplyType(stationInfo.getSupplyType()==null?1:stationInfo.getSupplyType());
+ stationInfo.setWattHourMeterNo(org.springframework.util.StringUtils.hasLength(stationInfo.getWattHourMeterNo())?stationInfo.getWattHourMeterNo():UUID.randomUUID().toString().replaceAll("-", ""));
+ stationInfo.setForwardPower(stationInfo.getForwardPower()==null?"1.3654":stationInfo.getForwardPower());
+ String uuid = UUID.randomUUID().toString();
+ String randomString = uuid.replaceAll("-", ""); // 去除'-'
+ if (org.springframework.util.StringUtils.hasLength(site.getRecordUniqueNo())){
+ stationInfo.setRecordUniqueNo(site.getRecordUniqueNo());
+ }else{
+ stationInfo.setRecordUniqueNo("A123998987hjn4");
+
+ }
+
}
- supStationInfo.setBusineHours(site.getStartServiceTime());
- supStationInfo.setRoundTheClock(site.getRoundTheClock());
- supStationInfo.setParkType(site.getParkType());
- supStationInfo.setParkFee("{\"rules\":"+site.getParkFee()+","+"\"freeDuration\":"+site.getParkFeeFree()+"}");
- supStationInfo.setElectricityType(site.getElectricityType());
- supStationInfo.setBusinessExpandType(site.getBusinessExpandType());
- supStationInfo.setCapacity(site.getCapacity());
- supStationInfo.setRatedPower(site.getRatedPower());
- supStationInfo.setPeriodFee(site.getPeriodFee());
- supStationInfo.setOfficialRunTime(site.getOfficialRunTime());
- supStationInfo.setStationOrientation(site.getStationOrientation());
- supStationInfo.setStationArea(site.getStationArea());
- supStationInfo.setHavePerson(site.getHavePerson());
- supStationInfo.setVideoMonitor(site.getVideoMonitor());
- if (StringUtils.isNotEmpty(site.getSupportingFacilities())){
- String[] split = site.getSupportingFacilities().split(",");
- List<Integer> collect = Arrays.stream(split).map(Integer::parseInt).collect(Collectors.toList());
- supStationInfo.setSupportingFacilities(collect);
- }
- supStationInfo.setPrinterFlag(site.getPrinterFlag());
- supStationInfo.setBarrierFlag(site.getBarrierFlag());
- supStationInfo.setParkingLockFlag(site.getParkingLockFlag());
- supStationInfo.setEquipmentInfos(buildEquipmentInfo(site.getId(), tChargingPiles, chargingGunList));
-// supStationInfo.setSwapEquipmentInfos();
- supStationInfo.setElectricityFee("{"+site.getElectricityFee()+"}");
- supStationInfo.setEquipmentOwnerName(site.getEquipmentOwnerName());
- supStationInfo.setResidentNo(site.getResidentNo());
- supStationInfo.setSupplyType(site.getSupplyType());
- supStationInfo.setWattHourMeterNo(site.getWattHourMeterNo());
- supStationInfo.setForwardPower(site.getForwardPower());
- supStationInfo.setServiceFee("{"+site.getServiceFee()+"}");
- supStationInfo.setRecordUniqueNo(site.getRecordUniqueNo());
BaseResult baseResult = new BaseResult();
SupStationInfoResult supStationInfoResult = new SupStationInfoResult();
- supStationInfoResult.setSupStationInfo(supStationInfo);
+ supStationInfoResult.setSupStationInfo(queryStationsInfoResult.getStationInfos().get(0));
tcecSuperviseUtil.superviseNotificationStationInfo(supStationInfoResult);
return R.ok(baseResult);
}
--
Gitblit v1.7.1