diff --git a/jsowell-common/src/main/java/com/jsowell/common/constant/CacheConstants.java b/jsowell-common/src/main/java/com/jsowell/common/constant/CacheConstants.java index ddd9ccc9a..1c524592a 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/constant/CacheConstants.java +++ b/jsowell-common/src/main/java/com/jsowell/common/constant/CacheConstants.java @@ -64,6 +64,10 @@ public class CacheConstants { */ public static final String SELECT_PILE_STATION_INFO_BY_ID = "select_pile_station_info_by_id:"; + /** + * uniApp通过站点id查询枪口列表信息 + */ + public static final String GET_UNIAPP_CONNECTOR_LIST_BY_STATION_ID = "GET_UNIAPP_CONNECTOR_LIST_BY_STATION_ID:"; /** * 充电桩sn生成 key */ diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileConnectorInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileConnectorInfoService.java index 20f1fe669..33aba530f 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileConnectorInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileConnectorInfoService.java @@ -129,5 +129,7 @@ public interface IPileConnectorInfoService { */ List getUniAppConnectorList(Long stationId); + List getConnectorListForLianLian(Long stationId); + List selectConnectorInfoList(String pileSn); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java index 781634128..bd0139300 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java @@ -383,9 +383,22 @@ public class PileConnectorInfoServiceImpl implements IPileConnectorInfoService { @Override public List getUniAppConnectorList(Long stationId) { // TODO 加缓存 + // String redisKey = CacheConstants.GET_UNIAPP_CONNECTOR_LIST_BY_STATION_ID + stationId; + // List list = redisCache.getCacheObject(redisKey); + // if (CollectionUtils.isEmpty(list)) { + // // 查数据库 + // list = pileConnectorInfoMapper.getUniAppConnectorList(stationId); + // if (CollectionUtils.isNotEmpty(list)) { + // redisCache.setCacheObject(redisKey, list, 5, TimeUnit.MINUTES); + // } + // } return pileConnectorInfoMapper.getUniAppConnectorList(stationId); } + public List getConnectorListForLianLian(Long stationId) { + return getUniAppConnectorList(stationId); + } + @Override public List selectConnectorInfoList(String pileSn) { // 查询充电桩型号信息 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/ConnectorInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/ConnectorInfoVO.java index 52ddbdf8e..60ed57599 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/ConnectorInfoVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/ConnectorInfoVO.java @@ -16,6 +16,11 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @Builder public class ConnectorInfoVO { + /** + * 站点id + */ + private String stationId; + /** * 枪口号 */ diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileConnectorInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileConnectorInfoMapper.xml index 8d7028071..2370db604 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileConnectorInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileConnectorInfoMapper.xml @@ -224,6 +224,7 @@