Skip to content

fix：修复购票v2接口可能出现的死锁问题和简化 takeoutStation 方法的相关代码 #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
binaryyang wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix：修复购票v2接口可能出现的死锁问题和简化 takeoutStation 方法的相关代码 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .../main/java/org/opengoofy/index12306/biz/ticketservice/service/impl/TicketServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ public TicketPurchaseRespDTO purchaseTicketsV2(PurchaseTicketReqDTO requestParam
List<RLock> distributedLockList = new ArrayList<>();
Map<Integer, List<PurchaseTicketPassengerDetailDTO>> seatTypeMap = requestParam.getPassengers().stream()
.collect(Collectors.groupingBy(PurchaseTicketPassengerDetailDTO::getSeatType));
seatTypeMap.forEach((searType, count) -> {
seatTypeMap.keySet().stream().sorted().forEach((searType) -> {
String lockKey = environment.resolvePlaceholders(String.format(LOCK_PURCHASE_TICKETS_V2, requestParam.getTrainId(), searType));
ReentrantLock localLock = localLockMap.getIfPresent(lockKey);
if (localLock == null) {
Expand Down
14 changes: 7 additions & 7 deletions ...rc/main/java/org/opengoofy/index12306/biz/ticketservice/toolkit/StationCalculateUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,15 @@ public static List<RouteDTO> takeoutStation(List<String> stations, String startS
if (startIndex == -1 || endIndex == -1 || startIndex >= endIndex) {
return takeoutStationList;
}
if (startIndex != 0) {
for (int i = 0; i < startIndex; i++) {
for (int j = 1; j < stations.size() - startIndex; j++) {
takeoutStationList.add(new RouteDTO(stations.get(i), stations.get(startIndex + j)));
}
// 发车在 startStation 之前的 route
for (int i = 0; i < startIndex; i++) {
for (int j = startIndex + 1; j < stations.size(); j++) {
takeoutStationList.add(new RouteDTO(stations.get(i), stations.get(j)));
}
}
for (int i = startIndex; i <= endIndex; i++) {
for (int j = i + 1; j < stations.size() && i < endIndex; j++) {
// 发车在 startStation 及之后的 route
for (int i = startIndex; i < endIndex; i++) {
for (int j = i + 1; j < stations.size(); j++) {
takeoutStationList.add(new RouteDTO(stations.get(i), stations.get(j)));
}
}
Expand Down