autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-07-15 11:40:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://192.168.2.46:8099/jsowell/jsowell-charger-web into dev

Browse Source 
# Conflicts:
#	jsowell-admin/src/main/java/com/jsowell/service/PileService.java
This commit is contained in:
Lemon
2024-09-09 20:59:27 +08:00
parent f2a18a6ea1 26c9ca05e8
commit 4ce1837637
6 changed files with 118 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -156,9 +156,8 @@ public class PileService {
/**
* 前端扫码跳转接口
*/
public AppletPileDetailVO getPileDetailByPileSn(String param) throws Exception{
public AppletPileDetailVO getPileDetailByPileSn(String param) throws Exception {
AppletPileDetailVO vo = null;
try {
log.info("查询充电枪口详情-getPileDetailByPileSn, param:{}", param);
if (StringUtils.isBlank(param)) {
throw new BusinessException(ReturnCodeEnum.CODE_PARAM_NOT_NULL_ERROR);
@@ -182,7 +181,7 @@ public class PileService {
// 查询站点信息
PileStationVO stationInfo = pileStationInfoService.getStationInfo(pileInfoVO.getStationId());
log.info("查询充电枪口详情-getStationInfo:{}, stationInfo:{}", pileInfoVO.getStationId(), JSON.toJSONString(stationInfo));
log.info("查询充电枪口详情-getStationInfo:{}, onLineStatus:{}", pileInfoVO.getStationId(), JSON.toJSONString(stationInfo));
if (stationInfo == null || StringUtils.equals(stationInfo.getOpenFlag(), Constants.ZERO)) {
throw new BusinessException(ReturnCodeEnum.CODE_STATION_IS_NOT_OPEN);
}
@@ -215,7 +214,6 @@ public class PileService {
// MerchantInfoVO merchantInfoVO = pileMerchantInfoService.getMerchantInfoVO(pileInfoVO.getMerchantId());
log.info("查询充电枪口详情-billingPriceVOS:{}", JSON.toJSONString(billingPriceVOS));
vo = AppletPileDetailVO.builder()
.pileInfo(pileInfoVO)
.connectorInfoList(connectorInfoList)
@@ -223,10 +221,6 @@ public class PileService {
.stationInfo(stationInfo)
.billingPriceList(billingPriceVOS)
.build();
} catch (Exception e) {
log.error("查询充电枪详情error", e);
}
return vo;
}

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

@@ -50,6 +50,7 @@ import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDateTime;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
/**
@@ -127,17 +128,17 @@ public class PileBasicInfoServiceImpl implements PileBasicInfoService {
@Override
public PileBasicInfo selectPileBasicInfoBySN(String pileSn) {
// 加缓存
// String redisKey = CacheConstants.SELECT_PILE_BASIC_INFO_BY_SN + pileSn;
// PileBasicInfo pileBasicInfo = redisCache.getCacheObject(redisKey);
// if (pileBasicInfo == null) {
// // 查数据库
// pileBasicInfo = pileBasicInfoMapper.selectPileBasicInfoBySn(pileSn);
// if (pileBasicInfo != null) {
// redisCache.setCacheObject(redisKey, pileBasicInfo, 15, TimeUnit.MINUTES);
// }
// }
String redisKey = CacheConstants.SELECT_PILE_BASIC_INFO_BY_SN + pileSn;
PileBasicInfo pileBasicInfo = redisCache.getCacheObject(redisKey);
if (pileBasicInfo == null) {
// 查数据库
pileBasicInfo = pileBasicInfoMapper.selectPileBasicInfoBySn(pileSn);
if (pileBasicInfo != null) {
redisCache.setCacheObject(redisKey, pileBasicInfo, 15, TimeUnit.MINUTES);
}
}
PileBasicInfo pileBasicInfo = pileBasicInfoMapper.selectPileBasicInfoBySn(pileSn);
// PileBasicInfo pileBasicInfo = pileBasicInfoMapper.selectPileBasicInfoBySn(pileSn);
return pileBasicInfo;
}

20
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java
View File

@@ -606,17 +606,17 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic
@Override
public List<BillingTemplateVO> queryStationBillingTemplateListForUniApp(String stationId) {
// 加缓存
// String redisKey = CacheConstants.QUERY_STATION_BILLING_TEMPLATE_LIST + stationId;
// List<BillingTemplateVO> voList = redisCache.getCacheList(redisKey);
// if (CollectionUtils.isEmpty(voList)) {
// voList = pileBillingTemplateMapper.queryStationBillingTemplateList(stationId);
// if (CollectionUtils.isNotEmpty(voList)) {
// redisCache.setCacheList(redisKey, voList);
// redisCache.expire(redisKey, 15, TimeUnit.MINUTES);
// }
// }
String redisKey = CacheConstants.QUERY_STATION_BILLING_TEMPLATE_LIST + stationId;
List<BillingTemplateVO> voList = redisCache.getCacheList(redisKey);
if (CollectionUtils.isEmpty(voList)) {
voList = pileBillingTemplateMapper.queryStationBillingTemplateList(stationId);
if (CollectionUtils.isNotEmpty(voList)) {
redisCache.setCacheList(redisKey, voList);
redisCache.expire(redisKey, 15, TimeUnit.MINUTES);
}
}
List<BillingTemplateVO> voList = pileBillingTemplateMapper.queryStationBillingTemplateList(stationId);
// List<BillingTemplateVO> voList = pileBillingTemplateMapper.queryStationBillingTemplateList(stationId);
return voList;
}

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

@@ -48,6 +48,7 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
/**
@@ -119,22 +120,22 @@ public class PileConnectorInfoServiceImpl implements PileConnectorInfoService {
@Override
public List<PileConnectorInfo> selectPileConnectorInfoList(String pileSn) {
// 取缓存
// String redisKey = CacheConstants.SELECT_PILE_CONNECTOR_INFO_LIST + pileSn;
// List<PileConnectorInfo> result = redisCache.getCacheObject(redisKey);
// if (CollectionUtils.isEmpty(result)) {
// // 缓存为空，查数据库
// PileConnectorInfo pileConnectorInfo = new PileConnectorInfo();
// pileConnectorInfo.setPileSn(pileSn);
// result = selectPileConnectorInfoList(pileConnectorInfo);
// if (CollectionUtils.isNotEmpty(result)) {
// // 查询数据库不为空，存redis 2分钟
// redisCache.setCacheObject(redisKey, result, 5, TimeUnit.MINUTES);
// }
// }
String redisKey = CacheConstants.SELECT_PILE_CONNECTOR_INFO_LIST + pileSn;
List<PileConnectorInfo> result = redisCache.getCacheObject(redisKey);
if (CollectionUtils.isEmpty(result)) {
// 缓存为空，查数据库
PileConnectorInfo pileConnectorInfo = new PileConnectorInfo();
pileConnectorInfo.setPileSn(pileSn);
List<PileConnectorInfo> result = selectPileConnectorInfoList(pileConnectorInfo);
result = selectPileConnectorInfoList(pileConnectorInfo);
if (CollectionUtils.isNotEmpty(result)) {
// 查询数据库不为空，存redis 2分钟
redisCache.setCacheObject(redisKey, result, 5, TimeUnit.MINUTES);
}
}
// PileConnectorInfo pileConnectorInfo = new PileConnectorInfo();
// pileConnectorInfo.setPileSn(pileSn);
// List<PileConnectorInfo> result = selectPileConnectorInfoList(pileConnectorInfo);
return result;
}

19
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileModelInfoServiceImpl.java
View File

@@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Objects;
/**
* 充电桩型号信息Service业务层处理
@@ -121,16 +122,16 @@ public class PileModelInfoServiceImpl implements PileModelInfoService {
@Override
public PileModelInfoVO getPileModelInfoByModelId(Long modelId) {
// String redisKey = CacheConstants.GET_PILE_MODEL_INFO_BY_MODEL_ID + modelId;
// PileModelInfoVO modelInfoVO = redisCache.getCacheObject(redisKey);
// if (Objects.isNull(modelInfoVO)) {
// modelInfoVO = pileModelInfoMapper.getPileModelInfoByModelId(modelId);
// if (Objects.nonNull(modelInfoVO)) {
// redisCache.setCacheObject(redisKey, modelInfoVO, CacheConstants.cache_expire_time_1d);
// }
// }
String redisKey = CacheConstants.GET_PILE_MODEL_INFO_BY_MODEL_ID + modelId;
PileModelInfoVO modelInfoVO = redisCache.getCacheObject(redisKey);
if (Objects.isNull(modelInfoVO)) {
modelInfoVO = pileModelInfoMapper.getPileModelInfoByModelId(modelId);
if (Objects.nonNull(modelInfoVO)) {
redisCache.setCacheObject(redisKey, modelInfoVO, CacheConstants.cache_expire_time_1d);
}
}
PileModelInfoVO modelInfoVO = pileModelInfoMapper.getPileModelInfoByModelId(modelId);
// PileModelInfoVO modelInfoVO = pileModelInfoMapper.getPileModelInfoByModelId(modelId);
return modelInfoVO;
}

17
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java
View File

@@ -53,6 +53,7 @@ import java.text.DecimalFormat;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -108,14 +109,14 @@ public class PileStationInfoServiceImpl implements PileStationInfoService {
@Override
public PileStationInfo selectPileStationInfoById(Long id) {
// 加缓存
// String redisKey = CacheConstants.SELECT_PILE_STATION_INFO_BY_ID + id;
// PileStationInfo pileStationInfo = redisCache.getCacheObject(redisKey);
// if (pileStationInfo == null) {
// // 查数据库
// pileStationInfo = pileStationInfoMapper.selectPileStationInfoById(id);
// redisCache.setCacheObject(redisKey, pileStationInfo, 15, TimeUnit.MINUTES);
// }
PileStationInfo pileStationInfo = pileStationInfoMapper.selectPileStationInfoById(id);
String redisKey = CacheConstants.SELECT_PILE_STATION_INFO_BY_ID + id;
PileStationInfo pileStationInfo = redisCache.getCacheObject(redisKey);
if (pileStationInfo == null) {
// 查数据库
pileStationInfo = pileStationInfoMapper.selectPileStationInfoById(id);
redisCache.setCacheObject(redisKey, pileStationInfo, 15, TimeUnit.MINUTES);
}
// PileStationInfo pileStationInfo = pileStationInfoMapper.selectPileStationInfoById(id);
return pileStationInfo;
}