diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileBillingTemplateMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileBillingTemplateMapper.java index 100c8ff54..6bdcacf0d 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileBillingTemplateMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileBillingTemplateMapper.java @@ -136,10 +136,15 @@ public interface PileBillingTemplateMapper { BillingTemplateVO selectBillingTemplateByStationId(@Param("stationId") String stationId); /** - * 通过模板id查询计费模板详情列表 + * 通过模板id数组批量查询计费模板详情列表 */ List queryBillingDetailByTemplateIds(@Param("templateIds") Long[] templateIds); + /** + * 通过模板id查询计费模板详情列表 + */ + List queryBillingDetailByTemplateId(@Param("templateId") Long templateId); + /** * 插入充电桩和计费模板关系 */ diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java index cfe1a1b94..d67c31e9d 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java @@ -275,7 +275,8 @@ public class PileBillingTemplateServiceImpl implements IPileBillingTemplateServi result.setType(pileBillingTemplate.getType()); // 查计费模板详情 - List detailList = pileBillingTemplateMapper.queryBillingDetailByTemplateIds(new Long[]{id}); + // List detailList = pileBillingTemplateMapper.queryBillingDetailByTemplateIds(new Long[]{id}); + List detailList = queryBillingDetailById(id); if (CollectionUtils.isNotEmpty(detailList)) { List timeArray = Lists.newArrayList(); // 取出4个时间段类型 @@ -358,12 +359,18 @@ public class PileBillingTemplateServiceImpl implements IPileBillingTemplateServi return result; } + /** + * 通过计费模板id查询计费模板详情 + * 缓存30分账,修改清缓存 + * @param id + * @return + */ @Override public List queryBillingDetailById(Long id) { String redisKey = CacheConstants.QUERY_BILLING_DETAIL_BY_ID + id; List pileBillingDetails = redisCache.getCacheList(redisKey); if (CollectionUtils.isEmpty(pileBillingDetails)) { - pileBillingDetails = pileBillingTemplateMapper.queryBillingDetailByTemplateIds(new Long[]{id}); + pileBillingDetails = pileBillingTemplateMapper.queryBillingDetailByTemplateId(id); if (CollectionUtils.isNotEmpty(pileBillingDetails)) { redisCache.setCacheList(redisKey, pileBillingDetails); redisCache.expire(redisKey, 30, TimeUnit.MINUTES); diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml index 604751239..413e806a5 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml @@ -392,6 +392,24 @@ + + insert into pile_billing_relation (pile_sn, billing_template_code, station_id)