ias 车辆信息上传优化

gly-base-core/src/main/java/cn/com/taiji/core/entity/dict/basic/VehicleUseCharacter.java

@@ -30,6 +30,8 @@ public enum VehicleUseCharacter {
 	},
 	YJJYC("应急救援车", 8) {
 	},
+	SPECIAL_CONTAINER_VEHICLE("专用集装箱运输车辆", 9){},
+	MIXED_CONTAINER_VEHICLE("混用集装箱运输车辆", 10){},
 	;
 
 	@Getter

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/AssOrderSendManager.java

@@ -102,6 +102,7 @@ public class AssOrderSendManager extends AbstractAssManager<AssOrderSendRequest>
         switch (orderinfo.getOrderType()){
             case VEHICLE_UPDATE:
                 vehicleChangeSendManagew.send(orderinfo, req);
+                break;
             case OBU_SUPPLY:
                 obuSupplySendManage.send(orderinfo, req);
                 break;
@@ -143,6 +144,7 @@ public class AssOrderSendManager extends AbstractAssManager<AssOrderSendRequest>
         switch (order.getOrderType()){
             case VEHICLE_UPDATE:
                 res.setType(OperateType.CHANGE_VEHICLE_SEND);
+                break;
             case OBU_SUPPLY:
                 res.setType(OperateType.CHANGE_VEHICLE_SEND);
                 break;

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/signChange/SignChangeApplyManager.java

@@ -138,6 +138,13 @@ public class SignChangeApplyManager extends AbstractAssManager<SignChangeApplyRe
             assOrderinfo.setAgencyId(staff.getAgencyId());
             assOrderinfo.setChannelId(staff.getServiceHallId());
             assOrderinfo.setStaffOpenId(req.getOpenId());
+            String openId = "";
+            if (UserType.PERSONAL_USER == customerInfo.getUserType()) {
+                openId = accountInfoRepo.findByIdNum(customerInfo.getCustomerIdNum());
+            }else {
+                openId = accountInfoRepo.findByIdNum(customerInfo.getAgentIdNum());
+            }
+            assOrderinfo.setOpenId(openId);
         }else if (SourceType.WECHAT == req.getOrderSource()){
             assOrderinfo.setChannelId(MyFinals.QTZL_CHANNELWX_ID);
         }else {

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/order/VehicleUploadManager.java

@@ -286,7 +286,7 @@ public class VehicleUploadManager extends AbstractOrderManager<VehicleUploadRequ
         vehicle.setTotalMass(request.getTotalMass());
         vehicle.setMaintenaceMass(request.getMaintenaceMass());
         vehicle.setPermittedWeight(request.getPermittedWeight());
-        vehicle.setVehicleDimensions(request.getVehicleDimensions().replace("m",""));
+        vehicle.setVehicleDimensions(request.getVehicleDimensions().replace("m","").replace("[Xx×*]", "X"));
         vehicle.setPermittedTowWeight(request.getPermittedTowWeight());
         vehicle.setAxleCount(request.getAxleCount());
         vehicle.setIssueDate(request.getIssueDate());
@@ -298,7 +298,13 @@ public class VehicleUploadManager extends AbstractOrderManager<VehicleUploadRequ
         vehicle.setVehBodyUrl(request.getVehBodyUrl());
         vehicle.setProxyUrl(request.getProxyUrl());
         // 车辆使用性质填充
-        vehicle.setUseCharacter(VehicleUseCharacter.valueOfCode(request.getCharacter()));
+        Integer character = request.getCharacter();
+        if(request.getUseUserType()==24 ) {
+            character = 9;
+        }else if(request.getUseUserType()==28) {
+            character = 10;
+        }
+        vehicle.setUseCharacter(VehicleUseCharacter.valueOfCode(character));
         vehicle.setRegisterDate(request.getRegisterDate());
         vehicle.setTractorSign(request.getUseUserType() == 0 ? 0 :1);//不是普通车就是牵引车
         vehicle.setRoadTransportPermitPicUrl(request.getRoadTransportPermitPicUrl());