代码优化

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/train/TrainController.java

@@ -57,28 +57,35 @@ public class TrainController extends BaseController {
 
     /**
      * 火车站列表
+     *
+     * @param keyword 城市名、英文名、站点名、拼音检索模糊查询
      */
     @GlobalTransactional(timeoutMills = 600000)
     @GetMapping("/stationList")
     public R<List<AllStationModel>> stationList(@RequestParam("keyword") String keyword) {
         List<AllStationModel> stationList = getStationList();
-        return R.ok(
-            stationList.stream().filter(item -> {
-                if (StringUtils.isNotEmpty(item.getCityName()) && item.getCityName().contains(keyword)) {
-                    return true;
-                }
-                if (StringUtils.isNotEmpty(item.getEname()) && item.getEname().contains(keyword)) {
-                    return true;
-                }
-                if (StringUtils.isNotEmpty(item.getZdmc()) && item.getZdmc().contains(keyword)) {
-                    return true;
-                }
-                if (StringUtils.isNotEmpty(item.getPyjsm()) && item.getPyjsm().contains(keyword)) {
-                    return true;
-                }
-                return false;
-            }).collect(Collectors.toList())
-        );
+        if (StringUtils.isEmpty(keyword)) {
+            return R.ok(stationList);
+        }
+        AllStationModel model = StreamUtils.findFirst(stationList, item -> {
+            if (StringUtils.isNotEmpty(item.getCityName()) && item.getCityName().contains(keyword)) {
+                return true;
+            }
+            if (StringUtils.isNotEmpty(item.getEname()) && item.getEname().contains(keyword)) {
+                return true;
+            }
+            if (StringUtils.isNotEmpty(item.getZdmc()) && item.getZdmc().contains(keyword)) {
+                return true;
+            }
+            if (StringUtils.isNotEmpty(item.getPyjsm()) && item.getPyjsm().contains(keyword)) {
+                return true;
+            }
+            return false;
+        });
+        if (model == null) {
+            return R.ok(new ArrayList<>());
+        }
+        return R.ok(StreamUtils.filter(stationList, item -> StringUtils.equals(item.getCityName(), model.getCityName())));
     }
 
     private List<AllStationModel> getStationList() {
@@ -161,12 +168,15 @@ public class TrainController extends BaseController {
 
     /**
      * 城市列表
+     *
+     * @param keyword 城市名称精确查询
+     * @return 城市数据
      */
     @GlobalTransactional(timeoutMills = 600000)
     @GetMapping("/cityList")
     public R<List<CityModel>> list(@RequestParam("keyword") String keyword) {
         List<CityModel> cityList = getCityList();
-        return R.ok(cityList.stream().filter(item -> StringUtils.equals(item.getCityName(), keyword)).collect(Collectors.toList()));
+        return R.ok(StreamUtils.filter(cityList, item -> StringUtils.equals(item.getCityName(), keyword)));
     }
 
     private List<CityModel> getCityList() {