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

bugfix See merge request !2

Merge branch 'bugfix/2025-04-22' into 'master'
bugfix See merge request !2
zhuyifan
Commit e39667f07e3d694219507ad6f9715a62b97b3fee e39667f0 2 parents 3875fde7 963f9d06
Showing 1 changed file with 46 additions and 21 deletions
src/main/java/com/tianting/infoloop/service/grpc/MealOrderGrpcService.java
--- a/src/main/java/com/tianting/infoloop/service/grpc/MealOrderGrpcService.java
View file @e39667f
+++ b/src/main/java/com/tianting/infoloop/service/grpc/MealOrderGrpcService.java
View file @e39667f
@@ -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,12 +171,16 @@ public class MealOrderGrpcService extends MealOrderServiceRpcGrpc.MealOrderServi
                                    final StreamObserver<GetMealOrdersByIdsRpcResponse> responseObserver) {
         final var builder = GetMealOrdersByIdsRpcResponse.newBuilder();
         try {
-            final var mealOrders = mealOrderService.listByIds(request.getIdsList());
+            if (request.getIdsList().isEmpty()) {
-            if (!mealOrders.isEmpty()) {
+                builder.addAllResponses(Collections.emptyList());
-                for (final var mealOrder : mealOrders) {
+            } else {
-                    final var mealOrderRpcResponse = ProtoBeanUtil.beanToProto(mealOrder, SingleMealOrderRpcResponse.class, "meals");
+                final var mealOrders = mealOrderService.listByIds(request.getIdsList());
-                    final var build = mealOrderRpcResponse.toBuilder().addAllMeals(ProtoBeanUtil.jsonToProtoList(mealOrder.getMeals(), MenuSchedule.class)).build();
+                if (!mealOrders.isEmpty()) {
-                    builder.addResponses(build);
+                    for (final var mealOrder : mealOrders) {
+                        final var mealOrderRpcResponse = ProtoBeanUtil.beanToProto(mealOrder, SingleMealOrderRpcResponse.class, "meals");
+                        final var build = mealOrderRpcResponse.toBuilder().addAllMeals(ProtoBeanUtil.jsonToProtoList(mealOrder.getMeals(), MenuSchedule.class)).build();
+                        builder.addResponses(build);
+                    }
                 }
             }
         } catch (final Exception e) {
@@ -393,9 +398,13 @@ public class MealOrderGrpcService extends MealOrderServiceRpcGrpc.MealOrderServi
                                    final StreamObserver<GetMpAccountsByIdsRpcResponse> responseObserver) {
         final var builder = GetMpAccountsByIdsRpcResponse.newBuilder();
         try {
-            final var mealOrders = mpAccountService.listByIds(request.getIdsList());
+            if (request.getIdsList().isEmpty()) {
-            if (!mealOrders.isEmpty()) {
+                builder.addAllResponses(Collections.emptyList());
-                builder.addAllResponses(ProtoBeanUtil.beanListToProtoList(mealOrders, SingleMpAccountRpcResponse.class));
+            } 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);
@@ -545,9 +554,13 @@ public class MealOrderGrpcService extends MealOrderServiceRpcGrpc.MealOrderServi
                                final StreamObserver<GetDinersByIdsRpcResponse> responseObserver) {
         final var builder = GetDinersByIdsRpcResponse.newBuilder();
         try {
-            final var mealOrders = dinerService.listByIds(request.getIdsList());
+            if (request.getIdsList().isEmpty()) {
-            if (!mealOrders.isEmpty()) {
+                builder.addAllResponses(Collections.emptyList());
-                builder.addAllResponses(ProtoBeanUtil.beanListToProtoList(mealOrders, SingleDinerRpcResponse.class));
+            } 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);
@@ -707,9 +720,13 @@ public class MealOrderGrpcService extends MealOrderServiceRpcGrpc.MealOrderServi
                                            final StreamObserver<GetMpAccountDinerRefsByIdsRpcResponse> responseObserver) {
         final var builder = GetMpAccountDinerRefsByIdsRpcResponse.newBuilder();
         try {
-            final var mpAccountDinerRefs = mpAccountDinerRefService.listByIds(request.getIdsList());
+            if (request.getIdsList().isEmpty()) {
-            if (!mpAccountDinerRefs.isEmpty()) {
+                builder.addAllResponses(Collections.emptyList());
-                builder.addAllResponses(ProtoBeanUtil.beanListToProtoList(mpAccountDinerRefs, SingleMpAccountDinerRefRpcResponse.class));
+            } 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);
@@ -805,9 +822,13 @@ public class MealOrderGrpcService extends MealOrderServiceRpcGrpc.MealOrderServi
                                      final StreamObserver<GetGradeClassesByIdsRpcResponse> responseObserver) {
         final var builder = GetGradeClassesByIdsRpcResponse.newBuilder();
         try {
-            final var gradeClasses = gradeClassService.listByIds(request.getIdsList());
+            if (request.getIdsList().isEmpty()) {
-            if (!gradeClasses.isEmpty()) {
+                builder.addAllResponses(Collections.emptyList());
-                builder.addAllResponses(ProtoBeanUtil.beanListToProtoList(gradeClasses, SingleGradeClassRpcResponse.class));
+            } 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);
@@ -1060,9 +1081,13 @@ public class MealOrderGrpcService extends MealOrderServiceRpcGrpc.MealOrderServi
                                         final StreamObserver<GetMealMenuRecordsByIdsRpcResponse> responseObserver) {
         final var builder = GetMealMenuRecordsByIdsRpcResponse.newBuilder();
         try {
-            final var mealMenuRecords = mealMenuRecordService.listByIds(request.getIdsList());
+            if (request.getIdsList().isEmpty()) {
-            if (!mealMenuRecords.isEmpty()) {
+                builder.addAllResponses(Collections.emptyList());
-                builder.addAllResponses(ProtoBeanUtil.beanListToProtoList(mealMenuRecords, SingleMealMenuRecordRpcResponse.class));
+            } 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);