From 2037793bdee45fbd0926b7f4811af70d38fc81dc Mon Sep 17 00:00:00 2001 From: limqhz <540344226@qq.com> Date: Wed, 13 Dec 2023 22:52:37 +0800 Subject: [PATCH] =?UTF-8?q?fixbug=20=E4=B8=8A=E4=BC=A0=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8Cfixbug=20=E5=9C=BA=E9=A6=86=E6=9C=AA?= =?UTF-8?q?=E5=BC=80=E6=94=BE=E4=B8=8D=E6=8F=90=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/sv/netty/controller/AdminNettyController.java | 2 +- service/src/main/java/com/sv/service/api/VenueService.java | 6 ++++++ service/src/main/java/com/sv/service/oms/DeviceService.java | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/api/src/main/java/com/sv/netty/controller/AdminNettyController.java b/api/src/main/java/com/sv/netty/controller/AdminNettyController.java index fabb622..bf10afd 100644 --- a/api/src/main/java/com/sv/netty/controller/AdminNettyController.java +++ b/api/src/main/java/com/sv/netty/controller/AdminNettyController.java @@ -117,7 +117,7 @@ public class AdminNettyController extends BaseApiController { if (!DeviceStatusEnum.ONLINE.value.equals(device.getStatus())){ throw new ServiceException("设备离线！请检查连接"); } - messageService.testLoad(device.getName(),device.getVenueId()); + messageService.uploadLog(device.getName(),device.getVenueId()); return ResponseDTO.ok(); } diff --git a/service/src/main/java/com/sv/service/api/VenueService.java b/service/src/main/java/com/sv/service/api/VenueService.java index 5b6b9e1..b97ae7b 100644 --- a/service/src/main/java/com/sv/service/api/VenueService.java +++ b/service/src/main/java/com/sv/service/api/VenueService.java @@ -231,6 +231,9 @@ public class VenueService extends BaseServiceImpl { String time = DateUtilCard.nowTime().toString(); Venue venue = venueMapper.findById(venueId); VenuePrice venuePrice = venuePriceService.findPrice(venueId, time); + if (venuePrice == null) { + throw new ServiceException(ExceptionCodeTemplate.VENUE_ERROR); + } BigDecimal price = venuePrice.getPrice(); if (PayStyleEnum.HOUR.getValue() == venue.getPayStyle()){ // 按时入场余额需要包含两个小时的场地费 @@ -359,6 +362,9 @@ public class VenueService extends BaseServiceImpl { // 按次出场不扣钱 // 取入场的价格 VenuePrice venuePriceEnter = venuePriceService.findPrice(venueId, enterTime); + if (venuePriceEnter == null) { + throw new ServiceException(ExceptionCodeTemplate.VENUE_ERROR); + } // 按时出场选择按照分钟四舍五入到角扣款 price = venuePriceEnter.getPrice(); int minutes = DateUtilCard.diffMinute(enterTime, outTime); diff --git a/service/src/main/java/com/sv/service/oms/DeviceService.java b/service/src/main/java/com/sv/service/oms/DeviceService.java index c4d8cbc..ff30e13 100644 --- a/service/src/main/java/com/sv/service/oms/DeviceService.java +++ b/service/src/main/java/com/sv/service/oms/DeviceService.java @@ -220,7 +220,7 @@ public class DeviceService extends BaseServiceImpl { headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED); HttpEntity> request = new HttpEntity<>(null,headers); ResponseDTO responseDTO = null; - responseDTO = restTemplate.postForObject("http://127.0.0.1:8093/uplaod/log/"+deviceId, request, ResponseDTO.class); + responseDTO = restTemplate.postForObject("http://127.0.0.1:8093/upload/log/"+deviceId, request, ResponseDTO.class); Integer code = (Integer) responseDTO.get(ResponseDTO.ERR_CODE); if(0 != code){ throw new OmsException("上传日志失败，设备离线或者门禁异常！");