venue/smart_venue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixbug 上传日志问题，fixbug 场馆未开放不提示问题

Browse Source
This commit is contained in:
limqhz
2023-12-13 22:52:37 +08:00
parent e733c442a3
commit 2037793bde
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/main/java/com/sv/netty/controller/AdminNettyController.java
View File

@@ -117,7 +117,7 @@ public class AdminNettyController extends BaseApiController {
if (!DeviceStatusEnum.ONLINE.value.equals(device.getStatus())){ if (!DeviceStatusEnum.ONLINE.value.equals(device.getStatus())){
throw new ServiceException("设备离线！请检查连接"); throw new ServiceException("设备离线！请检查连接");
} }
messageService.testLoad(device.getName(),device.getVenueId()); messageService.uploadLog(device.getName(),device.getVenueId());
return ResponseDTO.ok(); return ResponseDTO.ok();
} }

6
service/src/main/java/com/sv/service/api/VenueService.java
View File

@@ -231,6 +231,9 @@ public class VenueService extends BaseServiceImpl {
String time = DateUtilCard.nowTime().toString(); String time = DateUtilCard.nowTime().toString();
Venue venue = venueMapper.findById(venueId); Venue venue = venueMapper.findById(venueId);
VenuePrice venuePrice = venuePriceService.findPrice(venueId, time); VenuePrice venuePrice = venuePriceService.findPrice(venueId, time);
if (venuePrice == null) {
throw new ServiceException(ExceptionCodeTemplate.VENUE_ERROR);
}
BigDecimal price = venuePrice.getPrice(); BigDecimal price = venuePrice.getPrice();
if (PayStyleEnum.HOUR.getValue() == venue.getPayStyle()){ if (PayStyleEnum.HOUR.getValue() == venue.getPayStyle()){
// 按时入场余额需要包含两个小时的场地费 // 按时入场余额需要包含两个小时的场地费
@@ -359,6 +362,9 @@ public class VenueService extends BaseServiceImpl {
// 按次出场不扣钱 // 按次出场不扣钱
// 取入场的价格 // 取入场的价格
VenuePrice venuePriceEnter = venuePriceService.findPrice(venueId, enterTime); VenuePrice venuePriceEnter = venuePriceService.findPrice(venueId, enterTime);
if (venuePriceEnter == null) {
throw new ServiceException(ExceptionCodeTemplate.VENUE_ERROR);
}
// 按时出场选择按照分钟四舍五入到角扣款 // 按时出场选择按照分钟四舍五入到角扣款
price = venuePriceEnter.getPrice(); price = venuePriceEnter.getPrice();
int minutes = DateUtilCard.diffMinute(enterTime, outTime); int minutes = DateUtilCard.diffMinute(enterTime, outTime);

2
service/src/main/java/com/sv/service/oms/DeviceService.java
View File

@@ -220,7 +220,7 @@ public class DeviceService extends BaseServiceImpl {
headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED); headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
HttpEntity<MultiValueMap<String, String>> request = new HttpEntity<>(null,headers); HttpEntity<MultiValueMap<String, String>> request = new HttpEntity<>(null,headers);
ResponseDTO responseDTO = null; 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); Integer code = (Integer) responseDTO.get(ResponseDTO.ERR_CODE);
if(0 != code){ if(0 != code){
throw new OmsException("上传日志失败，设备离线或者门禁异常！"); throw new OmsException("上传日志失败，设备离线或者门禁异常！");