From 0b8f80cc5c3681ee9db88e142033cff1546ed425 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Thu, 22 Feb 2024 17:04:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=98=BE=E7=A4=BAvip=E4=BB=B7=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/test/java/SpringBootTestController.java | 13 ++++++++----- .../impl/PileBillingTemplateServiceImpl.java | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java index 167ebb8a8..29bfc0ad8 100644 --- a/jsowell-admin/src/test/java/SpringBootTestController.java +++ b/jsowell-admin/src/test/java/SpringBootTestController.java @@ -64,7 +64,7 @@ import com.jsowell.pile.transaction.service.TransactionService; import com.jsowell.pile.util.SnUtils; import com.jsowell.pile.vo.base.MemberWalletVO; import com.jsowell.pile.vo.base.PileInfoVO; -import com.jsowell.pile.vo.uniapp.BillingPriceVO; +import com.jsowell.pile.vo.uniapp.CurrentTimePriceDetails; import com.jsowell.pile.vo.uniapp.MemberVO; import com.jsowell.pile.vo.uniapp.PileConnectorDetailVO; import com.jsowell.pile.vo.web.*; @@ -253,11 +253,14 @@ public class SpringBootTestController { @Test public void queryBillingPriceTest() { String stationId = "19"; - List billingPriceVOS = pileBillingTemplateService.queryBillingPriceOld(stationId); - System.out.println("老版:" + JSON.toJSONString(billingPriceVOS)); + // List billingPriceVOS = pileBillingTemplateService.queryBillingPriceOld(stationId); + // System.out.println("老版:" + JSON.toJSONString(billingPriceVOS)); + // + // List billingPriceVOS1 = pileBillingTemplateService.queryBillingPrice(stationId); + // System.out.println("新版:" + JSON.toJSONString(billingPriceVOS1)); - List billingPriceVOS1 = pileBillingTemplateService.queryBillingPrice(stationId); - System.out.println("新版:" + JSON.toJSONString(billingPriceVOS1)); + CurrentTimePriceDetails currentTimePriceDetails = pileBillingTemplateService.getCurrentTimePriceDetails(stationId); + System.out.println("currentTimePriceDetails:" + JSON.toJSONString(currentTimePriceDetails)); } @Test 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 c93941106..eebfbda76 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 @@ -400,7 +400,7 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic // 查询站点的集团会员计费模板 BillingTemplateVO preferentialBillingTemplate = this.queryPreferentialBillingTemplate(stationId); if (Objects.nonNull(preferentialBillingTemplate) && Objects.nonNull(result) ) { - List billingDetailList = billingTemplateVO.getBillingDetailList(); + List billingDetailList = preferentialBillingTemplate.getBillingDetailList(); for (BillingDetailVO detailVO : billingDetailList) { List applyTimeList = detailVO.getApplyTime(); for (String applyTime : applyTimeList) { From d5d106c8ad794646e889b590d2897e7ffa9913f0 Mon Sep 17 00:00:00 2001 From: Lemon Date: Fri, 23 Feb 2024 08:30:58 +0800 Subject: [PATCH 2/3] update --- .../java/com/jsowell/service/CameraService.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/service/CameraService.java b/jsowell-admin/src/main/java/com/jsowell/service/CameraService.java index 90a0da686..8c7f6a402 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/CameraService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/CameraService.java @@ -64,6 +64,11 @@ public class CameraService { private MemberBasicInfoService memberBasicInfoService; + /** + * 接收相机识别结果 + * @param jsonObject + * @throws InterruptedException + */ public void receiveIdentifyResults(JSONObject jsonObject) throws InterruptedException { // 区分入场和出场 Integer parking_state = jsonObject.getJSONObject("parking").getInteger("parking_state"); @@ -83,7 +88,10 @@ public class CameraService { } - + /** + * 保存心跳到Redis + * @param dto + */ public void saveHeartBeat2Redis(CameraHeartBeatDTO dto) { // 将基本信息存入缓存 String redisKey = CacheConstants.CAMERA_HEARTBEAT + dto.getIp(); @@ -92,8 +100,10 @@ public class CameraService { /** * 车辆入场 - * - * @param jsonObject + * @param jsonObject json报文对象 + * @param parkingState + * @return + * @throws InterruptedException */ private String vehicleEntry(JSONObject jsonObject, String parkingState) throws InterruptedException { // 先将车牌图片信息存入缓存 @@ -238,7 +248,6 @@ public class CameraService { return resultMap; } - /** * 保存图像 * @param base64Image 图像的Base64编码 From e17c1d5f2ab20e57788619a4fa169d273c002fe3 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Fri, 23 Feb 2024 09:22:23 +0800 Subject: [PATCH 3/3] update --- .../pile/service/impl/MemberGroupServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java index 6b29487bd..e01619db0 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java @@ -76,11 +76,11 @@ public class MemberGroupServiceImpl implements MemberGroupService { if (CollectionUtils.isEmpty(resultList)) { return Lists.newArrayList(); } - for (MemberGroupVO memberGroupVO : resultList) { - BigDecimal discount = memberGroupVO.getDiscount(); - // 返回给前端乘以10 - memberGroupVO.setDiscount(discount.multiply(BigDecimal.TEN)); - } + // for (MemberGroupVO memberGroupVO : resultList) { + // BigDecimal discount = memberGroupVO.getDiscount(); + // // 返回给前端乘以10 + // memberGroupVO.setDiscount(discount.multiply(BigDecimal.TEN)); + // } return resultList; }