Browse Source

fix car bug

release_toaliyun_real
lin 2 years ago
parent
commit
38f5ac1f6e
2 changed files with 23 additions and 83 deletions
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/service/park/ParkFactory.java
  2. +22
    -82
      mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaParkCallbackService.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/park/ParkFactory.java View File

@@ -119,6 +119,7 @@ public class ParkFactory {
callBackServiceMap.put(EnumCarVendor.CAR_FUTE.getCode(), futeParkCallbackService);
callBackServiceMap.put(EnumCarVendor.CAR_LIFANG.getCode(), lifangParkCallbackService);
callBackServiceMap.put(EnumCarVendor.CAR_KETUO.getCode(), keTuoParkCallbackService);
callBackServiceMap.put(EnumCarVendor.CAR_DAHUA.getCode(), dahuaCallbackService);
return callBackServiceMap;
}
@@ -130,7 +131,6 @@ public class ParkFactory {
batchCallBackServiceMap.put(EnumCarVendor.CAR_JIESHUN.getCode(), jieshunCallBackService);
batchCallBackServiceMap.put(EnumCarVendor.CAR_JIESHUN_V2.getCode(), jieshunV2CallBackService);
batchCallBackServiceMap.put(EnumCarVendor.CAR_HAIKANGWEISHI.getCode(), haikangWeishiCallBackService);
batchCallBackServiceMap.put(EnumCarVendor.CAR_DAHUA.getCode(), dahuaCallbackService);
return batchCallBackServiceMap;
}


+ 22
- 82
mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaParkCallbackService.java View File

@@ -31,7 +31,7 @@ import lombok.extern.slf4j.Slf4j;

@Slf4j
@Service
public class DaHuaParkCallbackService extends BaseParkService implements ParkBatchCallBackAdapterService {
public class DaHuaParkCallbackService extends BaseParkService implements ParkCallBackAdapterService {
@Autowired
@@ -54,34 +54,17 @@ public class DaHuaParkCallbackService extends BaseParkService implements ParkBat
}

/**
* {dataItems=[{"inTime":"2020-12-09 11:21:15","carNumber":"浙-AF81797","inCarPhoto":"p201127315/NISSP_IMG_PARK_IN/20201209/a9f1130651b9493f8eab64f14afbdd47","isReal":0,"itemId":"a9f1130651b9493f8eab64f14afbdd47","inOperator":"超级管理员","equipName":"东门入口","parkName":"杭州东站西子国际","vehicleInfo":"{\"plateNo\":\"浙-AF81797\",\"plateColor\":\"GREEN\",\"plateBackColor\":0,\"plateWordColor\":0,\"vehicleColor\":null,\"vehicleLogo\":null,\"vehicleModel\":null,\"mainModel\":0,\"subModel\":0,\"vehicleModelTrust\":0,\"mainModelTrust\":0,\"subModelTrust\":0,\"plateNoTrust\":1,\"vehicleLogoTrust\":0,\"vehicleColorTrust\":0}","equipCode":"208202496","parkCode":"p201127315"}], pno=dzxzgj, sn=6C958D99D2769AA16F3A3F06E962263F, tn=-2, ts=20201209112118886, ve=1.0}
* {parkingLotCode=10005, carInTime=2023-07-24 16:03:25, parkingRecordId=20230724GIBgulTLyuqX07XBMbMRK, carNum=皖MNT597, carInChnId=1000874$14$0$0, parkingLotName=玲珑湾西院}
*/
@Override
public List<ParkNotifyParam> parseInNoticyParam(Object param) {
public ParkNotifyParam parseInNoticyParam(Object param) {
Map<String,Object> paramm = (Map<String, Object>) param;
String liststr = (String) paramm.get("dataItems");
JSONArray list = JSONArray.parseArray(liststr);
if (null != list && list.size() > 0 ) {
List<ParkNotifyParam> retList = new ArrayList<ParkNotifyParam>();
for (int i = 0 ; i < list.size() ; i ++) {
Map<String,Object> map = (Map<String, Object>) list.get(i);
ParkNotifyParam ret = parseInNoticyParamSingle(map);
if (null != ret ) {
retList.add(ret);
}
}
return retList;
}
return null;
}
private ParkNotifyParam parseInNoticyParamSingle(Map<String,Object> paramMap) {
String carNumber = paramMap.get("carNumber").toString();
String parkCode = paramMap.get("parkCode").toString();
String parkName = paramMap.get("parkName").toString();
String carNumber = paramm.get("carNum").toString();
String parkCode = paramm.get("parkingLotCode").toString();
String parkName = paramm.get("parkingLotName").toString();
String synId = paramMap.get("itemId").toString();
String entranceTime = paramMap.get("inTime").toString();
String synId = paramm.get("parkingRecordId").toString();
String entranceTime = paramm.get("carInTime").toString();
ParkNotifyParam p = new ParkNotifyParam();
String realCarNumber = handleCarNumber(carNumber);
@@ -98,33 +81,18 @@ public class DaHuaParkCallbackService extends BaseParkService implements ParkBat
return p;
}

/**
* {parkingLotCode=10005, parkingRecordId=20230724h9XljrQ6hfvPL4tWOO5Yc, carNum=皖MM5823, carOutChnId=1000877$14$0$0, parkingLotName=玲珑湾西院, carOutTime=2023-07-24 16:08:10}
*/
@Override
public List<ParkNotifyParam> parseOutNoticyParam(Object param) {
public ParkNotifyParam parseOutNoticyParam(Object param) {
Map<String,Object> paramm = (Map<String, Object>) param;
String liststr = (String) paramm.get("dataItems");
JSONArray list = JSONArray.parseArray(liststr);
if (null != list && list.size() > 0 ) {
List<ParkNotifyParam> retList = new ArrayList<ParkNotifyParam>();
for (int i = 0 ; i < list.size() ; i ++) {
Map<String,Object> map = (Map<String, Object>) list.get(i);
ParkNotifyParam ret = parseOutNoticyParamSingle(map);
if (null != ret ) {
retList.add(ret);
}
}
return retList;
}
return null;
}
private ParkNotifyParam parseOutNoticyParamSingle(Map<String, Object> paramMap) {
String carNumber = paramMap.get("carNumber").toString();
String parkCode = paramMap.get("parkCode").toString();
String parkName = paramMap.get("parkName").toString();
String carNumber = paramm.get("carNum").toString();
String parkCode = paramm.get("parkingLotCode").toString();
String parkName = paramm.get("parkingLotName").toString();
String synId = paramMap.get("itemId").toString();
String entranceTime = paramMap.get("outTime").toString();
String synId = paramm.get("parkingRecordId").toString();
String entranceTime = paramm.get("carOutTime").toString();
String realCarNumber = handleCarNumber(carNumber);
ParkNotifyParam p = new ParkNotifyParam();
@@ -144,47 +112,19 @@ public class DaHuaParkCallbackService extends BaseParkService implements ParkBat
log.error("cyf outTime format error",e);
return null;
}
p.setFee(String.valueOf(paramMap.get("ssMoney")));
p.setFee(String.valueOf(paramm.get("ssMoney")));
return p;
}
@Override
public List<ParkNotifyParam> parseUnbindNoticyParam(Object param) {
public ParkNotifyParam parseUnbindNoticyParam(Object param) {
return null;
}

@Override
public List<ParkNotifyParam> parsePaidNoticyParam(Object param) {
Map<String,Object> paramm = (Map<String, Object>) param;
String liststr = (String) paramm.get("dataItems");
JSONArray list = JSONArray.parseArray(liststr);
if (null != list && list.size() > 0 ) {
List<ParkNotifyParam> retList = new ArrayList<ParkNotifyParam>();
for (int i = 0 ; i < list.size() ; i ++) {
Map<String,Object> map = (Map<String, Object>) list.get(i);
ParkNotifyParam ret = parsePaidNoticyParamSingle(map);
if (null != ret ) {
retList.add(ret);
}
}
return retList;
}
public ParkNotifyParam parsePaidNoticyParam(Object param) {
return null;
}
DaHuaUtil jieshun = new DaHuaUtil();
private ParkNotifyParam parsePaidNoticyParamSingle(Map<String,Object> vo) {
ParkNotifyParam p = new ParkNotifyParam();
p.setCarNumber(handleCarNumber((String) vo.get("carNumber")));
p.setParkId(String.valueOf(vo.get("parkCode")));
p.setParkOrderId((String) vo.get("itemId"));
p.setSynId((String) vo.get("itemId"));
p.setFee(vo.get("ssMoney").toString());
try {
p.setPayTime(jieshun.utcToLocal((String)vo.get("feesTime")));
} catch (ParseException e) {
e.printStackTrace();
}
return p;
}
}

Loading…
Cancel
Save