代码优化

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/resource/controller/airport/AirportController.java

 package org.dromara.resource.controller.airport;
 
 
+import com.alibaba.fastjson.JSON;
 import io.seata.spring.annotation.GlobalTransactional;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.dromara.common.core.domain.R;
+import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.common.ys.common.PageInfo;
 import org.dromara.common.ys.constant.Cplx;
 import org.dromara.common.ys.constant.TripType;
@@ -21,10 +24,12 @@ import org.dromara.resource.base.BaseController;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.time.Duration;
 import java.util.List;
 import java.util.stream.Collectors;
 
 /**
+ * 国内机票
  * @author hzh
  * @date 2024-10-28
  **/
@@ -55,12 +60,12 @@ public class AirportController extends BaseController {
     }
 
     private List<AirportModel> getAirPortList() {
-//        List<AirportModel> airPortList = JSON.parseArray(JSON.toJSONString(RedisUtils.getCacheList(AIRPORT)), AirportModel.class);
-//        if (CollectionUtils.isEmpty(airPortList)) {
-//            airPortList = CommonResourceService.getAirportList(getUserId());
-//            RedisUtils.setCacheObject(AIRPORT, airPortList, Duration.ofMinutes(60 * 60 * 24L));
-//        }
-        return CommonResourceService.getAirportList(getUserId());
+        List<AirportModel> airPortList = JSON.parseArray(JSON.toJSONString(RedisUtils.getCacheObject(AIRPORT)), AirportModel.class);
+        if (CollectionUtils.isEmpty(airPortList)) {
+            airPortList = CommonResourceService.getAirportList(getUserId());
+            RedisUtils.setCacheObject(AIRPORT, airPortList, Duration.ofMinutes(60 * 60 * 24L));
+        }
+        return airPortList;
     }
 
     /**

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

 package org.dromara.resource.controller.train;
 
+import com.alibaba.fastjson.JSON;
 import io.seata.spring.annotation.GlobalTransactional;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.dromara.common.core.domain.R;
+import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.common.ys.constant.TripType;
 import org.dromara.common.ys.model.req.train.QueryModel;
 import org.dromara.common.ys.model.res.comomResource.CityModel;
@@ -17,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Callable;
@@ -26,6 +30,8 @@ import java.util.concurrent.Future;
 import java.util.stream.Collectors;
 
 /**
+ * 火车票相关
+ *
  * @author hzh
  * @date 2024-10-29
  **/
@@ -38,6 +44,9 @@ public class TrainController extends BaseController {
     private static final String TRAIN = "train:ys" ;
     private static final String CITY = "city:ys" ;
 
+    /**
+     * 火车站列表
+     */
     @GlobalTransactional(timeoutMills = 600000)
     @GetMapping("/stationList")
     public R<List<AllStationModel>> stationList(@RequestParam("keyword") String keyword) {
@@ -62,12 +71,12 @@ public class TrainController extends BaseController {
     }
 
     private List<AllStationModel> getStationList() {
-//        List<AllStationModel> stationList = JSON.parseArray(JSON.toJSONString(RedisUtils.getCacheList(TRAIN)), AllStationModel.class);
-//        if (CollectionUtils.isEmpty(stationList)) {
-//            stationList = TrainService.getAllStation(getUserId());
-//            RedisUtils.setCacheObject(TRAIN, stationList, Duration.ofMinutes(60 * 60 * 24L));
-//        }
-        return TrainService.getAllStation(getUserId());
+        List<AllStationModel> stationList = JSON.parseArray(JSON.toJSONString(RedisUtils.getCacheObject(TRAIN)), AllStationModel.class);
+        if (CollectionUtils.isEmpty(stationList)) {
+            stationList = TrainService.getAllStation(getUserId());
+            RedisUtils.setCacheObject(TRAIN, stationList, Duration.ofMinutes(60 * 60 * 24L));
+        }
+        return stationList;
     }
 
     /**
@@ -75,6 +84,9 @@ public class TrainController extends BaseController {
      */
     private static final int NUM_THREADS = 100;
 
+    /**
+     * 火车票查询列表
+     */
     @GlobalTransactional(timeoutMills = 600000)
     @GetMapping("/list")
     public R<List<org.dromara.common.ys.model.res.train.QueryModel>> list(
@@ -136,6 +148,9 @@ public class TrainController extends BaseController {
     }
 
 
+    /**
+     * 城市列表
+     */
     @GlobalTransactional(timeoutMills = 600000)
     @GetMapping("/cityList")
     public R<List<CityModel>> list(@RequestParam("keyword") String keyword) {
@@ -144,12 +159,12 @@ public class TrainController extends BaseController {
     }
 
     private List<CityModel> getCityList() {
-//        List<CityModel> cityList = JSON.parseArray(JSON.toJSONString(RedisUtils.getCacheList(CITY)), CityModel.class);
-//        if (CollectionUtils.isEmpty(cityList)) {
-//            cityList = CommonResourceService.getCityList(getUserId());
-//            RedisUtils.setCacheObject(CITY, cityList, Duration.ofMinutes(60 * 60 * 24L));
-//        }
-        return CommonResourceService.getCityList(getUserId());
+        List<CityModel> cityList = JSON.parseArray(JSON.toJSONString(RedisUtils.getCacheObject(CITY)), CityModel.class);
+        if (CollectionUtils.isEmpty(cityList)) {
+            cityList = CommonResourceService.getCityList(getUserId());
+            RedisUtils.setCacheObject(CITY, cityList, Duration.ofMinutes(60 * 60 * 24L));
+        }
+        return cityList;
     }
 
 }

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/resource/controller/vehicle/VehiclesController.java

@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
+ * 用车相关
  * @author hzh
  * @date 2024-10-29
  **/
@@ -21,6 +22,9 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/vehicle/ys")
 public class VehiclesController extends BaseController {
 
+    /**
+     * 即时用车查询
+     */
     @GlobalTransactional(timeoutMills = 600000)
     @RequestMapping("/immediate")
     public R<org.dromara.common.ys.model.res.vehicles.EstimateJsycPriceModel> immediate(EstimateJsycPriceModel model) {
@@ -28,6 +32,9 @@ public class VehiclesController extends BaseController {
         return R.ok(VehiclesService.estimateJsycPrice(getUserId(), model));
     }
 
+    /**
+     * 预约用车查询
+     */
     @GlobalTransactional(timeoutMills = 600000)
     @RequestMapping("/prebook")
     public R<org.dromara.common.ys.model.res.vehicles.EstimateYyycPriceModel> prebook(EstimateYyycPriceModel model) {