java/Robotaxi.git

			@@ -34,7 +34,7 @@
			</resultMap>

			<resultMap id="RoleResult" type="com.xiaopeng.api.model.account.SysRole">
			<id property="id" column="role_id" />
			<id property="id" column="id" />
			<result property="roleName" column="role_name" />
			<result property="groupId" column="group_id" />
			<result property="remarks" column="remarks" />

			@@ -29,6 +29,10 @@
			private Long appKey;
			@Value("${ali.push.iosAppKey}")
			private Long iosAppKey;
			@Value("${ali.push.channelId}")
			private String channelId;
			@Value("${ali.push.iosChannelId}")
			private String iosChannelId;
			/**
			* 消息类型 MESSAGE 消息 NOTICE 通知
			*/
			@@ -84,6 +88,11 @@
			appKeys = iosAppKey;
			}

			String channelIds = channelId;
			if(deviceType == 2){
			channelIds = iosChannelId;
			}

			PushRequest pushRequest = PushRequest.builder()
			.appKey(appKeys)
			.pushType(PUSH_TYPE)
			@@ -92,6 +101,7 @@
			.targetValue(account)
			.title(title)
			.body(body)
			.androidNotificationChannel(channelIds)
			.build();
			CompletableFuture<PushResponse> response = client.push(pushRequest);
			PushResponse resp = response.get();

			@@ -150,6 +150,11 @@
			vehiclesCommandVo.setUid(xpOrder.getAppUserId());
			vehiclesCommandVo.setVin(xpVehicle.getVehicleVin());
			if("door".equals(dto.getDoorType())){
			// 开启车门判断是否为P档
			Integer gearLevel = redisService.getCacheObject(CacheConstants.GEAR_LEVEL + xpVehicle.getVehicleVin());
			if(gearLevel == null \|\| gearLevel != 4){
			throw new ServiceException("车辆非P档，无法开启车门", I18nKeyConstant.VEHICLE_NOT_P_GEAR);
			}
			vehiclesCommandVo.setCommandCode(VehiclesCommandEnum.DOOR_UNLOCK);
			}else {
			// 开启后备箱判断是否为P档

	xp-robotaxi-account-boot/src/main/resources/mapper/account/SysUserMapper.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	xp-robotaxi-push-message-boot/src/main/java/com/xiaopeng/pushMessage/utils/AliPushUtil.java	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/service/impl/XpVehicleServiceImpl.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史