Merge remote-tracking branch 'origin/master'

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/comm/VehicleInfoManagerImpl.java

@@ -117,10 +117,11 @@ public class VehicleInfoManagerImpl extends AbstractIawManager implements Vehicl
                 cardInfos = cardInfoRepo.listByAgencyIdAndVehicleId(agencyId,vehicleInfo.getVehicleId());
                 obuInfos = obuInfoRepo.listByAgencyIdAndVehicleId(agencyId,vehicleInfo.getVehicleId());
             }
-        }
-        else {
+        }else if (SourceType.WECHAT.equals(sourceType)){
             cardInfos = cardInfoRepo.listByCustomerIdAndVehicleId(vehicleInfo.getCustomerId(), vehicleInfo.getVehicleId());
             obuInfos = obuInfoRepo.listByCustomerIdAndVehicleId(vehicleInfo.getCustomerId(), vehicleInfo.getVehicleId());
+        }else {
+            throw new ManagerException("数据来源异常");
         }
         //处理卡签信息
         return handleDevice(cardInfos, obuInfos);

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/handler/AssServiceHandler.java

@@ -11,6 +11,7 @@ import cn.com.taiji.core.model.comm.protocol.ias.ass.vehicleInfoChange.VehicleCh
 import cn.com.taiji.ias.manager.ass.AssOrderAuditManager;
 import cn.com.taiji.ias.manager.ass.AssOrderCancelManager;
 import cn.com.taiji.ias.manager.ass.AssOrderPayInfoManager;
+import cn.com.taiji.ias.manager.ass.AssOrderSendManager;
 import cn.com.taiji.ias.manager.ass.customerInfoChange.CustomerInfoChangeApplyManager;
 import cn.com.taiji.ias.manager.ass.device.*;
 import cn.com.taiji.ias.manager.ass.releasePlate.PlateOccupyQueryManager;
@@ -73,6 +74,8 @@ public class AssServiceHandler extends AbstractIasServiceHandler<AssServiceCmd>
     private DeviceCancelPayManager deviceCancelPayManager;
     @Autowired
     private DeviceCancelPayQueryManager deviceCancelPayQueryManager;
+    @Autowired
+    private AssOrderSendManager assOrderSendManager;
 
     public AssServiceHandler() {
         super(IasServiceType.ASS);
@@ -122,6 +125,8 @@ public class AssServiceHandler extends AbstractIasServiceHandler<AssServiceCmd>
                 return deviceCancelPayQueryManager.serviceHandle((DeviceCancelPayQueryRequest) request);
             case CANCELCONFIRM:
                 return deviceCancelConfirmManager.serviceHandle((DeviceCancelConfirmRequest) request);
+            case SENDINFO:
+                return assOrderSendManager.serviceHandle((AssOrderSendRequest) request, jsonReq.getIfCode(), jsonReq.getReqId(), reqInfo);
             default:
                 throw FileProtocolSystemError.NOT_SUPPORT.toHandleException(jsonReq.getIfCode());
         }