2025年12月11日 1.0.11 优化LaneRequestController

GetDataInterface/src/main/java/com/nmggs/query/controller/LaneRequestController.java

@@ -1,11 +1,9 @@
 package com.nmggs.query.controller;
 
-import com.nmggs.query.common.emnu.Constant;
 import com.nmggs.query.common.emnu.MessageEnum;
 import com.nmggs.query.common.exception.PPException;
 import com.nmggs.query.common.utils.PropertiesUtil;
 import com.nmggs.query.common.utils.UuidUtil;
-import com.nmggs.query.service.LaneRequestService;
 import com.nmggs.query.service.LaneRequestTestService;
 import com.nmggs.query.service.NewLaneRequestService;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -13,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.Arrays;
 import java.util.Map;
 
 /**
@@ -22,8 +21,6 @@ import java.util.Map;
  */
 @RestController
 public class LaneRequestController {
-    @Resource
-    private LaneRequestService laneRequestService;
     @Resource
     private LaneRequestTestService laneRequestTestService;
     @Resource
@@ -40,46 +37,37 @@ public class LaneRequestController {
      */
     @PostMapping("/laneRequest/forward")
     public String forward(@RequestBody Map<String, Object> params) {
+        // 1. 必填参数校验
+        Object typeObj = params.get("requestType");
+        if (typeObj == null) {
+            throw new PPException(MessageEnum.请求类型错误.getCode(), "requestType 不能为空");
+        }
+        String requestType = typeObj.toString();
+        if (!Arrays.asList("1", "2", "3", "4").contains(requestType)) {
+            throw new PPException(MessageEnum.请求类型错误.getCode(), MessageEnum.请求类型错误.getMessage());
+        }
+
+        // 2. 环境标志
+        boolean isTest = "1".equals(PropertiesUtil.getValue("isTestEnvironment"));
+
+        // 3. 统一路由
         String uuid = UuidUtil.getUuid();
-        String result;
-        String isTestEnvironment = PropertiesUtil.getValue("isTestEnvironment");
-        String requestType = params.get("requestType").toString();
-        if(Constant.STR_ONE.equals(isTestEnvironment)){
-            switch (requestType) {
-                case "1":
-                    result= laneRequestTestService.getLanePassTest(params, uuid);
-                    break;
-                case "2":
-                    result= laneRequestTestService.getFeePayTest(params, uuid);
-                    break;
-                case "3":
-                    result= laneRequestTestService.getRunawayFeePayTest(params, uuid);
-                    break;
-                case "4":
-                    result= laneRequestTestService.getRefundTest(params, uuid);
-                    break;
-                default:
-                    throw new PPException(MessageEnum.请求类型错误.getCode(), MessageEnum.请求类型错误.getMessage());
-            }
-        }else {
-            switch (requestType) {
-                case "1":
-                    result= newLaneRequestService.getLanePass(params, uuid);
-                    break;
-                case "2":
-                    result= newLaneRequestService.getFeePay(params, uuid);
-                    break;
-                case "3":
-                    result= newLaneRequestService.getRunawayFeePay(params, uuid);
-                    break;
-                case "4":
-                    result= newLaneRequestService.getRefund(params, uuid);
-                    break;
-                default:
-                    throw new PPException(MessageEnum.请求类型错误.getCode(), MessageEnum.请求类型错误.getMessage());
-            }
+        switch (requestType) {
+            case "1": return isTest
+                    ? laneRequestTestService.getLanePassTest(params, uuid)
+                    : newLaneRequestService.getLanePass(params, uuid);
+            case "2": return isTest
+                    ? laneRequestTestService.getFeePayTest(params, uuid)
+                    : newLaneRequestService.getFeePay(params, uuid);
+            case "3": return isTest
+                    ? laneRequestTestService.getRunawayFeePayTest(params, uuid)
+                    : newLaneRequestService.getRunawayFeePay(params, uuid);
+            case "4": return isTest
+                    ? laneRequestTestService.getRefundTest(params, uuid)
+                    : newLaneRequestService.getRefund(params, uuid);
+            default:
+                throw new PPException(MessageEnum.请求类型错误.getCode(), MessageEnum.请求类型错误.getMessage());
         }
-       return result;
     }
 
 

GetDataInterface/src/main/resources/version/1.0.11.txt

@@ -22,3 +22,4 @@
 9     2025年11月27日     1.0.8      优化车道查询调用DCPC
 10    2025年11月28日     1.0.9      DCPC调用收费站信息增加字段roadno(路段编码)、roadname(路段名称)、stano(站编码)
 11    2025年12月05日     1.0.10     DCPC调用收费车道信息增加字段stano(站编码)
+12    2025年12月11日     1.0.11     优化LaneRequestController