From 7eaf4afd4271b9e1a69f0787dc1927e56f408e58 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Tue, 8 Aug 2023 16:32:40 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=9F=A5=E8=AF=A2=E7=AB=99=E7=82=B9?= =?UTF-8?q?=E8=AE=A1=E8=B4=B9=E6=A8=A1=E6=9D=BF=E4=BD=BF=E7=94=A8=E7=BC=93?= =?UTF-8?q?=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsowell/pile/mapper/PileBillingTemplateMapper.java | 6 +++--- .../pile/service/impl/PileBillingTemplateServiceImpl.java | 7 ++++--- .../resources/mapper/pile/PileBillingTemplateMapper.xml | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) 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 439aa70f0..831fa60f9 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 @@ -102,8 +102,8 @@ public interface PileBillingTemplateMapper { * @param stationId 站点id * @return */ - List queryStationBillingTemplateList(@Param("stationId") String stationId, - @Param("stationDeptIds") List stationDeptIds); + List queryStationBillingTemplateListWithAuth(@Param("stationId") String stationId, + @Param("stationDeptIds") List stationDeptIds); /** * 根据站点id查询站点计费模板列表 @@ -111,7 +111,7 @@ public interface PileBillingTemplateMapper { * @param stationId 站点id * @return */ - List queryStationBillingTemplateListForUniApp(@Param("stationId") String stationId); + List queryStationBillingTemplateList(@Param("stationId") String stationId); /** * 通过桩sn号查询计费模板 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 af9584224..8d521d97d 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 @@ -332,7 +332,8 @@ public class PileBillingTemplateServiceImpl implements IPileBillingTemplateServi LocalTime localTime = LocalTime.now(); String now = LocalTime.of(localTime.getHour(), localTime.getMinute(), localTime.getSecond()).toString(); // 通过站点id查询计费模板 - BillingTemplateVO billingTemplateVO = pileBillingTemplateMapper.selectBillingTemplateByStationId(stationId); + // BillingTemplateVO billingTemplateVO = pileBillingTemplateMapper.selectBillingTemplateByStationId(stationId); + BillingTemplateVO billingTemplateVO = queryUsedBillingTemplate(stationId); if (Objects.nonNull(billingTemplateVO)) { result = new CurrentTimePriceDetails(); result.setTemplateCode(billingTemplateVO.getTemplateCode()); @@ -419,7 +420,7 @@ public class PileBillingTemplateServiceImpl implements IPileBillingTemplateServi // 为空表示没有权限，返回空数组 return Lists.newArrayList(); } - return pileBillingTemplateMapper.queryStationBillingTemplateList(stationId, authorizedMap.getStationDeptIds()); + return pileBillingTemplateMapper.queryStationBillingTemplateListWithAuth(stationId, authorizedMap.getStationDeptIds()); } /** @@ -454,7 +455,7 @@ public class PileBillingTemplateServiceImpl implements IPileBillingTemplateServi String redisKey = CacheConstants.QUERY_STATION_BILLING_TEMPLATE_LIST + stationId; List voList = redisCache.getCacheList(redisKey); if (CollectionUtils.isEmpty(voList)) { - voList = pileBillingTemplateMapper.queryStationBillingTemplateListForUniApp(stationId); + voList = pileBillingTemplateMapper.queryStationBillingTemplateList(stationId); if (CollectionUtils.isNotEmpty(voList)) { redisCache.setCacheList(redisKey, voList); redisCache.expire(redisKey, 15, 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 743210606..6659342b6 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml @@ -306,7 +306,7 @@ and t.public_flag = '1' - select t2.id as templateId, t2.template_code as templateCode, @@ -488,7 +488,7 @@ limit 1 - select t2.id as templateId, t2.template_code as templateCode,