提交更改

src/main/java/com/steerinfo/dil/controller/QmsQueueResultController.java

@@ -55,14 +55,14 @@ public class QmsQueueResultController extends BaseRESTfulController {
     })
 
     @PostMapping(value = "/addQueueResult")
-    public String addQueueResult(String vno){
+    public RESTfulResult addQueueResult(String vno){
         Map<String, Object> map = new HashMap<>();
         map.put("vno",vno);
         int i = qmsQueueResultService.addQueueResult(map);
         if(i > 0){
-            return "success";
+            return success();
         }else {
-            return "field";
+            return failed("","新增失败");
         }
     }
 

src/main/java/com/steerinfo/dil/mapper/QmsQueueResultMapper.java

@@ -7,6 +7,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 @Mapper
@@ -16,7 +17,7 @@ public interface QmsQueueResultMapper extends IBaseMapper<QmsQueueResult, BigDec
     BigDecimal selectMaxId();
 
     //车辆进入电子围栏后触发排队申请 发送数据：运输订单号 返回 运力Id、实绩总表Id、订单ID
-    Map<String, Object> queryCIdAndTIdByOrderNumber(String orderNumber);
+    Map<String, Object> queryCIdAndTIdByOrderNumber(@Param("orderNumber") String orderNumber);
 
     //通过运输订单Id查询推送给司机进厂的数据
     Map<String, Object> sendEnFactoryMesToWebSocket(Integer orderId);

src/main/java/com/steerinfo/dil/mapper/QueuingRulesMapper.java

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.mapper;
 
+import org.apache.ibatis.annotations.Param;
 import org.mapstruct.Mapper;
 
 import java.math.BigDecimal;
@@ -35,8 +36,8 @@ public interface QueuingRulesMapper {
     BigDecimal queueCountByPlatformId(BigDecimal platformId);
 
     //通过订单ID查询门岗ID(可能会有多个门岗)
-    List<BigDecimal> queryGatepostIdByOrderId(BigDecimal orderId);
+    List<BigDecimal> queryGatepostIdByOrderId(@Param("orderId")BigDecimal orderId);
 
     //通过车牌号查询已接收的订单
-    String getOrderNumberByCapacityNumber(String capacityNumber);
+    String getOrderNumberByCapacityNumber(@Param("capacityNumber") String capacityNumber);
 }

src/main/java/com/steerinfo/dil/service/impl/QmsQueueResultServiceImpl.java

@@ -60,6 +60,9 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
         //获取传入的车牌号查找最近的运输订单号
         String capacityNumber = (String) map.get("vno");
         String orderNumber = queuingRulesMapper.getOrderNumberByCapacityNumber(capacityNumber.substring(0, capacityNumber.length()-2));
+        if(orderNumber==null){
+            return 0;
+        }
         //查询实绩总表ID 运力Id
         map.putAll(qmsQueueResultMapper.queryCIdAndTIdByOrderNumber(orderNumber));
         //查询门岗ID