zhuyifan

Merge branch 'bugfix/2025-04-22' into 'master'

bugfix



See merge request !2
......@@ -120,6 +120,7 @@ import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.temporal.TemporalAdjusters;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.function.Function;
import java.util.stream.Collectors;
......@@ -170,6 +171,9 @@ public class MealOrderGrpcService extends MealOrderServiceRpcGrpc.MealOrderServi
final StreamObserver<GetMealOrdersByIdsRpcResponse> responseObserver) {
final var builder = GetMealOrdersByIdsRpcResponse.newBuilder();
try {
if (request.getIdsList().isEmpty()) {
builder.addAllResponses(Collections.emptyList());
} else {
final var mealOrders = mealOrderService.listByIds(request.getIdsList());
if (!mealOrders.isEmpty()) {
for (final var mealOrder : mealOrders) {
......@@ -178,6 +182,7 @@ public class MealOrderGrpcService extends MealOrderServiceRpcGrpc.MealOrderServi
builder.addResponses(build);
}
}
}
} catch (final Exception e) {
log.error("getMealOrdersByIds error;", e);
responseObserver.onError(Status.INTERNAL.withDescription(e.getMessage()).asException());
......@@ -393,10 +398,14 @@ public class MealOrderGrpcService extends MealOrderServiceRpcGrpc.MealOrderServi
final StreamObserver<GetMpAccountsByIdsRpcResponse> responseObserver) {
final var builder = GetMpAccountsByIdsRpcResponse.newBuilder();
try {
if (request.getIdsList().isEmpty()) {
builder.addAllResponses(Collections.emptyList());
} else {
final var mealOrders = mpAccountService.listByIds(request.getIdsList());
if (!mealOrders.isEmpty()) {
builder.addAllResponses(ProtoBeanUtil.beanListToProtoList(mealOrders, SingleMpAccountRpcResponse.class));
}
}
} catch (final Exception e) {
log.error("getMpAccountsByIds error;", e);
responseObserver.onError(Status.INTERNAL.withDescription(e.getMessage()).asException());
......@@ -545,10 +554,14 @@ public class MealOrderGrpcService extends MealOrderServiceRpcGrpc.MealOrderServi
final StreamObserver<GetDinersByIdsRpcResponse> responseObserver) {
final var builder = GetDinersByIdsRpcResponse.newBuilder();
try {
if (request.getIdsList().isEmpty()) {
builder.addAllResponses(Collections.emptyList());
} else {
final var mealOrders = dinerService.listByIds(request.getIdsList());
if (!mealOrders.isEmpty()) {
builder.addAllResponses(ProtoBeanUtil.beanListToProtoList(mealOrders, SingleDinerRpcResponse.class));
}
}
} catch (final Exception e) {
log.error("getDinersByIds error;", e);
responseObserver.onError(Status.INTERNAL.withDescription(e.getMessage()).asException());
......@@ -707,10 +720,14 @@ public class MealOrderGrpcService extends MealOrderServiceRpcGrpc.MealOrderServi
final StreamObserver<GetMpAccountDinerRefsByIdsRpcResponse> responseObserver) {
final var builder = GetMpAccountDinerRefsByIdsRpcResponse.newBuilder();
try {
if (request.getIdsList().isEmpty()) {
builder.addAllResponses(Collections.emptyList());
} else {
final var mpAccountDinerRefs = mpAccountDinerRefService.listByIds(request.getIdsList());
if (!mpAccountDinerRefs.isEmpty()) {
builder.addAllResponses(ProtoBeanUtil.beanListToProtoList(mpAccountDinerRefs, SingleMpAccountDinerRefRpcResponse.class));
}
}
} catch (final Exception e) {
log.error("getMpAccountDinerRefsByIds error;", e);
responseObserver.onError(Status.INTERNAL.withDescription(e.getMessage()).asException());
......@@ -805,10 +822,14 @@ public class MealOrderGrpcService extends MealOrderServiceRpcGrpc.MealOrderServi
final StreamObserver<GetGradeClassesByIdsRpcResponse> responseObserver) {
final var builder = GetGradeClassesByIdsRpcResponse.newBuilder();
try {
if (request.getIdsList().isEmpty()) {
builder.addAllResponses(Collections.emptyList());
} else {
final var gradeClasses = gradeClassService.listByIds(request.getIdsList());
if (!gradeClasses.isEmpty()) {
builder.addAllResponses(ProtoBeanUtil.beanListToProtoList(gradeClasses, SingleGradeClassRpcResponse.class));
}
}
} catch (final Exception e) {
log.error("getGradeClassesByIds error;", e);
responseObserver.onError(Status.INTERNAL.withDescription(e.getMessage()).asException());
......@@ -1060,10 +1081,14 @@ public class MealOrderGrpcService extends MealOrderServiceRpcGrpc.MealOrderServi
final StreamObserver<GetMealMenuRecordsByIdsRpcResponse> responseObserver) {
final var builder = GetMealMenuRecordsByIdsRpcResponse.newBuilder();
try {
if (request.getIdsList().isEmpty()) {
builder.addAllResponses(Collections.emptyList());
} else {
final var mealMenuRecords = mealMenuRecordService.listByIds(request.getIdsList());
if (!mealMenuRecords.isEmpty()) {
builder.addAllResponses(ProtoBeanUtil.beanListToProtoList(mealMenuRecords, SingleMealMenuRecordRpcResponse.class));
}
}
} catch (final Exception e) {
log.error("getMealMenuRecordsByIds error;", e);
responseObserver.onError(Status.INTERNAL.withDescription(e.getMessage()).asException());
......