autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-25 17:49:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

Browse Source
This commit is contained in:
BOOL\25024
2024-02-23 09:49:13 +08:00
parent 8282e02137 e17c1d5f2a
commit e278682c4d
4 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
jsowell-admin/src/main/java/com/jsowell/service/CameraService.java
View File

@@ -64,6 +64,11 @@ public class CameraService {
private MemberBasicInfoService memberBasicInfoService; private MemberBasicInfoService memberBasicInfoService;
/**
* 接收相机识别结果
* @param jsonObject
* @throws InterruptedException
*/
public void receiveIdentifyResults(JSONObject jsonObject) throws InterruptedException { public void receiveIdentifyResults(JSONObject jsonObject) throws InterruptedException {
// 区分入场和出场 // 区分入场和出场
Integer parking_state = jsonObject.getJSONObject("parking").getInteger("parking_state"); Integer parking_state = jsonObject.getJSONObject("parking").getInteger("parking_state");
@@ -83,7 +88,10 @@ public class CameraService {
} }
/**
* 保存心跳到Redis
* @param dto
*/
public void saveHeartBeat2Redis(CameraHeartBeatDTO dto) { public void saveHeartBeat2Redis(CameraHeartBeatDTO dto) {
// 将基本信息存入缓存 // 将基本信息存入缓存
String redisKey = CacheConstants.CAMERA_HEARTBEAT + dto.getIp(); String redisKey = CacheConstants.CAMERA_HEARTBEAT + dto.getIp();
@@ -92,8 +100,10 @@ public class CameraService {
/** /**
* 车辆入场 * 车辆入场
* * @param jsonObject json报文对象
* @param jsonObject * @param parkingState
* @return
* @throws InterruptedException
*/ */
private String vehicleEntry(JSONObject jsonObject, String parkingState) throws InterruptedException { private String vehicleEntry(JSONObject jsonObject, String parkingState) throws InterruptedException {
// 先将车牌图片信息存入缓存 // 先将车牌图片信息存入缓存
@@ -238,7 +248,6 @@ public class CameraService {
return resultMap; return resultMap;
} }
/** /**
* 保存图像 * 保存图像
* @param base64Image 图像的Base64编码 * @param base64Image 图像的Base64编码

13
jsowell-admin/src/test/java/SpringBootTestController.java
View File

@@ -64,7 +64,7 @@ import com.jsowell.pile.transaction.service.TransactionService;
import com.jsowell.pile.util.SnUtils; import com.jsowell.pile.util.SnUtils;
import com.jsowell.pile.vo.base.MemberWalletVO; import com.jsowell.pile.vo.base.MemberWalletVO;
import com.jsowell.pile.vo.base.PileInfoVO; 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.MemberVO;
import com.jsowell.pile.vo.uniapp.PileConnectorDetailVO; import com.jsowell.pile.vo.uniapp.PileConnectorDetailVO;
import com.jsowell.pile.vo.web.*; import com.jsowell.pile.vo.web.*;
@@ -253,11 +253,14 @@ public class SpringBootTestController {
@Test @Test
public void queryBillingPriceTest() { public void queryBillingPriceTest() {
String stationId = "19"; String stationId = "19";
List<BillingPriceVO> billingPriceVOS = pileBillingTemplateService.queryBillingPriceOld(stationId); // List<BillingPriceVO> billingPriceVOS = pileBillingTemplateService.queryBillingPriceOld(stationId);
System.out.println("老版:" + JSON.toJSONString(billingPriceVOS)); // System.out.println("老版:" + JSON.toJSONString(billingPriceVOS));
//
// List<BillingPriceVO> billingPriceVOS1 = pileBillingTemplateService.queryBillingPrice(stationId);
// System.out.println("新版:" + JSON.toJSONString(billingPriceVOS1));
List<BillingPriceVO> billingPriceVOS1 = pileBillingTemplateService.queryBillingPrice(stationId); CurrentTimePriceDetails currentTimePriceDetails = pileBillingTemplateService.getCurrentTimePriceDetails(stationId);
System.out.println("新版:" + JSON.toJSONString(billingPriceVOS1)); System.out.println("currentTimePriceDetails:" + JSON.toJSONString(currentTimePriceDetails));
} }
@Test @Test

10
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java
View File

@@ -76,11 +76,11 @@ public class MemberGroupServiceImpl implements MemberGroupService {
if (CollectionUtils.isEmpty(resultList)) { if (CollectionUtils.isEmpty(resultList)) {
return Lists.newArrayList(); return Lists.newArrayList();
} }
for (MemberGroupVO memberGroupVO : resultList) { // for (MemberGroupVO memberGroupVO : resultList) {
BigDecimal discount = memberGroupVO.getDiscount(); // BigDecimal discount = memberGroupVO.getDiscount();
// 返回给前端乘以10 // // 返回给前端乘以10
memberGroupVO.setDiscount(discount.multiply(BigDecimal.TEN)); // memberGroupVO.setDiscount(discount.multiply(BigDecimal.TEN));
} // }
return resultList; return resultList;
} }

2
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java
View File

@@ -400,7 +400,7 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic
// 查询站点的集团会员计费模板 // 查询站点的集团会员计费模板
BillingTemplateVO preferentialBillingTemplate = this.queryPreferentialBillingTemplate(stationId); BillingTemplateVO preferentialBillingTemplate = this.queryPreferentialBillingTemplate(stationId);
if (Objects.nonNull(preferentialBillingTemplate) && Objects.nonNull(result) ) { if (Objects.nonNull(preferentialBillingTemplate) && Objects.nonNull(result) ) {
List<BillingDetailVO> billingDetailList = billingTemplateVO.getBillingDetailList(); List<BillingDetailVO> billingDetailList = preferentialBillingTemplate.getBillingDetailList();
for (BillingDetailVO detailVO : billingDetailList) { for (BillingDetailVO detailVO : billingDetailList) {
List<String> applyTimeList = detailVO.getApplyTime(); List<String> applyTimeList = detailVO.getApplyTime();
for (String applyTime : applyTimeList) { for (String applyTime : applyTimeList) {