autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-13 03:39:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-06-25 11:20:17 +08:00
parent 08da801286
commit 195224382f
4 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-admin/src/main/java/com/jsowell/service/PileService.java
View File

@@ -207,8 +207,6 @@ public class PileService {
throw new BusinessException(ReturnCodeEnum.CODE_STATION_IS_NOT_OPEN); throw new BusinessException(ReturnCodeEnum.CODE_STATION_IS_NOT_OPEN);
} }
// CompletableFuture<PileStationVO> pileStationVOFuture = CompletableFuture.supplyAsync(() -> pileStationInfoService.getStationInfo(pileInfoVO.getStationId()));
// 查询充电桩下枪口信息 // 查询充电桩下枪口信息
CompletableFuture<List<ConnectorInfoVO>> connectorInfoListFuture = CompletableFuture.supplyAsync(() -> pileConnectorInfoService.selectConnectorInfoList(pileSn)); CompletableFuture<List<ConnectorInfoVO>> connectorInfoListFuture = CompletableFuture.supplyAsync(() -> pileConnectorInfoService.selectConnectorInfoList(pileSn));

2
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java
View File

@@ -119,7 +119,7 @@ public class PileBasicInfoServiceImpl implements IPileBasicInfoService {
// 查数据库 // 查数据库
pileBasicInfo = pileBasicInfoMapper.selectPileBasicInfoBySn(pileSn); pileBasicInfo = pileBasicInfoMapper.selectPileBasicInfoBySn(pileSn);
if (pileBasicInfo != null) { if (pileBasicInfo != null) {
redisCache.setCacheObject(redisKey, pileBasicInfo, 5, TimeUnit.MINUTES); redisCache.setCacheObject(redisKey, pileBasicInfo, 15, TimeUnit.MINUTES);
} }
} }
return pileBasicInfo; return pileBasicInfo;

4
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java
View File

@@ -411,7 +411,9 @@ public class PileConnectorInfoServiceImpl implements IPileConnectorInfoService {
@Override @Override
public List<ConnectorInfoVO> selectConnectorInfoList(String pileSn) { public List<ConnectorInfoVO> selectConnectorInfoList(String pileSn) {
// 查询充电桩型号信息 // 查询充电桩型号信息
PileModelInfoVO pileModelInfoVO = pileModelInfoService.getPileModelInfoByPileSn(pileSn); // PileModelInfoVO pileModelInfoVO = pileModelInfoService.getPileModelInfoByPileSn(pileSn);
PileBasicInfo pileBasicInfo = pileBasicInfoService.selectPileBasicInfoBySN(pileSn);
PileModelInfoVO pileModelInfoVO = pileModelInfoService.getPileModelInfoByModelId(pileBasicInfo.getModelId());
List<PileConnectorInfo> connectorList = selectPileConnectorInfoList(pileSn); List<PileConnectorInfo> connectorList = selectPileConnectorInfoList(pileSn);
List<ConnectorInfoVO> connectorInfoList = Lists.newArrayList(); List<ConnectorInfoVO> connectorInfoList = Lists.newArrayList();

3
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/impl/AMapServiceImpl.java vendored
View File

@@ -311,7 +311,6 @@ public class AMapServiceImpl implements AMapService {
info.setEquipmentID(pileBasicInfo.getSn()); info.setEquipmentID(pileBasicInfo.getSn());
info.setManufacturerName("举视"); info.setManufacturerName("举视");
// 查询型号 // 查询型号
// PileModelInfoVO modelInfo = pileModelInfoService.getPileModelInfoByPileSn(pileBasicInfo.getSn());
PileModelInfoVO modelInfo = pileModelInfoService.getPileModelInfoByModelId(pileBasicInfo.getModelId()); PileModelInfoVO modelInfo = pileModelInfoService.getPileModelInfoByModelId(pileBasicInfo.getModelId());
info.setEquipmentType(Integer.parseInt(modelInfo.getSpeedType())); info.setEquipmentType(Integer.parseInt(modelInfo.getSpeedType()));
@@ -351,7 +350,7 @@ public class AMapServiceImpl implements AMapService {
aMapConnectorInfo.setVoltageLowerLimits(0); aMapConnectorInfo.setVoltageLowerLimits(0);
aMapConnectorInfo.setVoltageUpperLimits(Integer.parseInt(connectorInfoVO.getRatedVoltage())); aMapConnectorInfo.setVoltageUpperLimits(Integer.parseInt(connectorInfoVO.getRatedVoltage()));
aMapConnectorInfo.setCurrent(Integer.parseInt(connectorInfoVO.getRatedCurrent())); aMapConnectorInfo.setCurrent(Integer.parseInt(connectorInfoVO.getRatedCurrent()));
aMapConnectorInfo.setPower(new BigDecimal(connectorInfoVO.getRatedPower()).setScale(1, BigDecimal.ROUND_HALF_UP)); aMapConnectorInfo.setPower(new BigDecimal(connectorInfoVO.getRatedPower()).setScale(1, RoundingMode.HALF_UP));
aMapConnectorInfo.setNationalStandard(2); aMapConnectorInfo.setNationalStandard(2);
aMapConnectorInfo.setBrandDesc("举视"); aMapConnectorInfo.setBrandDesc("举视");