xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/config/MyLocaleResolver.java
@@ -1,7 +1,7 @@ package com.xiaopeng.account.config; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import org.springframework.util.StringUtils; import org.springframework.web.servlet.LocaleResolver;
@@ -1,6 +1,6 @@ package com.xiaopeng.account.config.log; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/SysUserController.java
@@ -1,6 +1,6 @@ package com.xiaopeng.account.controller; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.xiaopeng.account.constant.I18nKeyConstant; xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpAppUserCouponController.java
@@ -1,9 +1,7 @@ package com.xiaopeng.account.controller; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.xiaopeng.account.model.dto.ReceiveCouponDto; import com.xiaopeng.account.model.dto.SendCouponDto; import com.xiaopeng.account.model.query.XpUserCouponListQuery; @@ -13,9 +11,7 @@ import com.xiaopeng.account.service.IXpAppUserCouponService; import com.xiaopeng.api.dto.account.GetUserCouponDto; import com.xiaopeng.api.dto.account.UseUserCouponDto; import com.xiaopeng.api.dto.account.UserResourcesDto; import com.xiaopeng.api.feignClient.account.UserResourcesClient; import com.xiaopeng.api.feignClient.account.XpAppUserClient; import com.xiaopeng.api.feignClient.operation.XpCouponClient; import com.xiaopeng.api.feignClient.operation.XpOpenCityClient; import com.xiaopeng.api.model.account.XpAppUserCoupon; @@ -25,8 +21,6 @@ import com.xiaopeng.unifiedverification.interceptor.XpClientCheck; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; import org.springframework.stereotype.Controller; import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpOperationsUserController.java
@@ -264,12 +264,14 @@ JSONObject jsonObject = JSONObject.parseObject(xpOperationsUserVO.getAvatar()); String downloadUrl = null; try { // 1 String downloadUrl1 = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); downloadUrl = downloadUrl1; } catch (Exception e) { e.printStackTrace(); } xpOperationsUserVO.setAvatar(downloadUrl); jsonObject.put("url", downloadUrl); xpOperationsUserVO.setAvatar(jsonObject.toJSONString()); } return R.ok(xpOperationsUserVO); xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/XpAppUserCouponServiceImpl.java
@@ -1,7 +1,7 @@ package com.xiaopeng.account.service.impl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/XpOperationsUserServiceImpl.java
@@ -245,11 +245,13 @@ JSONObject jsonObject = JSONObject.parseObject(avatar); String downloadUrl = null; try { // 1 downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } xpOperationsUserVO.setAvatar(downloadUrl); jsonObject.put("url", downloadUrl); xpOperationsUserVO.setAvatar(jsonObject.toJSONString()); } pageInfo.setRecords(list); xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/XpQualificationAuditServiceImpl.java
@@ -90,37 +90,47 @@ String certificateOfNoCriminalRecord = xpQualificationAuditVO.getCertificateOfNoCriminalRecord(); if(certificateOfNoCriminalRecord!=null){ JSONObject jsonObject = JSONObject.parseObject(certificateOfNoCriminalRecord); // 1 String downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); xpQualificationAuditVO.setCertificateOfNoCriminalRecord(downloadUrl); jsonObject.put("url", downloadUrl); xpQualificationAuditVO.setCertificateOfNoCriminalRecord(jsonObject.toJSONString()); } String driverLicense = xpQualificationAuditVO.getDriverLicense(); if(driverLicense!=null){ JSONObject jsonObject = JSONObject.parseObject(driverLicense); //1 String downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); xpQualificationAuditVO.setDriverLicense(downloadUrl); jsonObject.put("url", downloadUrl); xpQualificationAuditVO.setDriverLicense(jsonObject.toJSONString()); } String trainingGraduationCertificate = xpQualificationAuditVO.getTrainingGraduationCertificate(); if(trainingGraduationCertificate!=null){ JSONObject jsonObject = JSONObject.parseObject(trainingGraduationCertificate); //1 String downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); xpQualificationAuditVO.setTrainingGraduationCertificate(downloadUrl); jsonObject.put("url", downloadUrl); xpQualificationAuditVO.setTrainingGraduationCertificate(jsonObject.toJSONString()); } String idCardFront = xpQualificationAuditVO.getIdCardFront(); if(idCardFront!=null){ JSONObject jsonObject = JSONObject.parseObject(idCardFront); //1 String downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); xpQualificationAuditVO.setIdCardFront(downloadUrl); jsonObject.put("url", downloadUrl); xpQualificationAuditVO.setIdCardFront(jsonObject.toJSONString()); } String idCardBack = xpQualificationAuditVO.getIdCardBack(); if(idCardBack!=null){ JSONObject jsonObject = JSONObject.parseObject(idCardBack); //1 String downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); xpQualificationAuditVO.setIdCardBack(downloadUrl); jsonObject.put("url", downloadUrl); xpQualificationAuditVO.setIdCardBack(jsonObject.toJSONString()); } } xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/util/EncryptionDecryptionUtil.java
@@ -1,6 +1,6 @@ package com.xiaopeng.account.util; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSONObject; import com.xiaopeng.common.core.utils.AESUtil; import com.xiaopeng.common.core.utils.RSAUtil; import com.xiaopeng.common.redis.service.RedisService; xp-robotaxi-api/src/main/java/com/xiaopeng/api/dto/operation/SmsDto.java
@@ -1,6 +1,6 @@ package com.xiaopeng.api.dto.operation; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSONObject; import lombok.Data; @Data xp-robotaxi-api/src/main/java/com/xiaopeng/api/dto/vehicleConvoy/BaseVehicleUserDto.java
@@ -1,6 +1,5 @@ package com.xiaopeng.api.dto.vehicleConvoy; import com.alibaba.fastjson.JSONArray; import lombok.Data; @Data xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/vehicleConvoy/VehiclesCommandCallbackVo.java
@@ -1,7 +1,7 @@ package com.xiaopeng.api.vo.vehicleConvoy; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSONObject; import lombok.Data; /** xp-robotaxi-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -37,6 +37,7 @@ com.xiaopeng.api.factory.maintenance.XpClockInClientFallbackFactory com.xiaopeng.api.factory.account.SysGroupMenuClientFallbackFactory com.xiaopeng.api.factory.order.XpCruiseOrderClientFallbackFactory com.xiaopeng.api.factory.automaticPilot.VmpOpenServiceClientFallbackFactory com.xiaopeng.api.factory.operation.SmsClientFallbackFactory com.xiaopeng.api.factory.maintenance.XpTaskHandleDetailRoutineClientFallbackFactory com.xiaopeng.api.factory.maintenance.XpTaskClientFallbackFactory xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/config/MyLocaleResolver.java
@@ -1,7 +1,7 @@ package com.xiaopeng.automaticPilot.config; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import org.springframework.util.StringUtils; import org.springframework.web.servlet.LocaleResolver;
@@ -1,6 +1,6 @@ package com.xiaopeng.automaticPilot.config.log; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; xp-robotaxi-gateway-boot/src/main/java/com/xiaopeng/gateway/filter/SignFilter.java
@@ -1,8 +1,8 @@ package com.xiaopeng.gateway.filter; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.xiaopeng.common.core.constant.HttpStatus; import com.xiaopeng.common.core.constant.TokenConstants; import com.xiaopeng.common.core.utils.ServletUtils; xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/config/MyLocaleResolver.java
@@ -1,7 +1,7 @@ package com.xiaopeng.itinerary.config; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import org.springframework.util.StringUtils; import org.springframework.web.servlet.LocaleResolver;
@@ -1,6 +1,6 @@ package com.xiaopeng.itinerary.config.log; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/service/impl/XpPricingServiceImpl.java
@@ -1,9 +1,9 @@ package com.xiaopeng.itinerary.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.xiaopeng.api.dto.account.GetUserCouponDto; xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/utils/TimeRangeChecker.java
@@ -1,7 +1,7 @@ package com.xiaopeng.itinerary.utils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONArray; import java.time.LocalTime; import java.time.format.DateTimeFormatter; xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/utils/XpPricingUtil.java
@@ -1,8 +1,8 @@ package com.xiaopeng.itinerary.utils; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.xiaopeng.api.dto.order.GetOrderNumDto; import com.xiaopeng.api.feignClient.order.XpOrderClient; import com.xiaopeng.api.vo.order.XpPricingCardVo; xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/utils/map/GDMapGeocodingUtil.java
@@ -1,7 +1,7 @@ package com.xiaopeng.itinerary.utils.map; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.xiaopeng.common.core.utils.HttpUtils; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/config/MyLocaleResolver.java
@@ -1,7 +1,7 @@ package com.xiaopeng.maintenance.config; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import org.springframework.util.StringUtils; import org.springframework.web.servlet.LocaleResolver;
@@ -1,6 +1,6 @@ package com.xiaopeng.maintenance.config.log; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskController.java
@@ -1,7 +1,7 @@ package com.xiaopeng.maintenance.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.xiaopeng.api.feignClient.vehicleConvoy.XpFleetOperationsClient; import com.xiaopeng.api.feignClient.vehicleConvoy.XpVehicleClient; @@ -265,23 +265,24 @@ String taskImage = xpTask.getTaskImage(); if (StringUtils.isNotBlank(taskImage)) { JSONArray jsonArray = JSONArray.parseArray(taskImage); ArrayList<String> list = new ArrayList<>(jsonArray.size()); for (Object o : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(o.toString()); JSONObject jsonObject = (JSONObject)o; String downloadUrl = null; try { // 1 downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } list.add(downloadUrl); jsonObject.put("url", downloadUrl); } xpTask.setTaskImage(String.join(",", list)); xpTask.setTaskImage(JSONArray.toJSONString(jsonArray)); } return R.ok(xpTask); } @ApiOperation(value = "执行保险年检检测定时任务", tags = {"定时任务"}) @GetMapping("/base/task/insurance/execute") public R<?> executeInsuranceTask() { xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskManagementController.java
@@ -207,8 +207,10 @@ String vehiclePictures = vehicle.getVehiclePictures(); if (org.apache.commons.lang3.StringUtils.isNotBlank(vehiclePictures)) { JSONObject jsonObject = JSONObject.parseObject(vehiclePictures); //1 String downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); vehicle.setVehiclePictures(downloadUrl); jsonObject.put("url", downloadUrl); vehicle.setVehiclePictures(jsonObject.toJSONString()); } } return R.ok(vehicles); xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleCleanController.java
@@ -1,7 +1,7 @@ package com.xiaopeng.maintenance.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.xiaopeng.api.feignClient.account.XpOperationUserClient; @@ -88,8 +88,10 @@ String vehiclePictures = xpVehicleCleanVO.getVehiclePictures(); if (vehiclePictures != null && !vehiclePictures.isEmpty()) { JSONObject jsonObject = JSONObject.parseObject(vehiclePictures); // 1 String downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); xpVehicleCleanVO.setVehiclePictures(downloadUrl); jsonObject.put("url", downloadUrl); xpVehicleCleanVO.setVehiclePictures(jsonObject.toJSONString()); } @@ -97,18 +99,18 @@ String taskImage = xpVehicleCleanVO.getTaskImage(); if (StringUtils.isNotBlank(taskImage)) { JSONArray jsonArray = JSONArray.parseArray(taskImage); ArrayList<String> list = new ArrayList<>(jsonArray.size()); for (Object o : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(o.toString()); JSONObject jsonObject = (JSONObject)o; String downloadUrl = null; try { //1 downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } list.add(downloadUrl); jsonObject.put("url", downloadUrl); } xpVehicleCleanVO.setTaskImage(String.join(",", list)); xpVehicleCleanVO.setTaskImage(JSONArray.toJSONString(jsonArray)); } @@ -158,18 +160,18 @@ String taskImage = record.getTaskImage(); if (StringUtils.isNotBlank(taskImage)) { JSONArray jsonArray = JSONArray.parseArray(taskImage); ArrayList<String> list = new ArrayList<>(jsonArray.size()); for (Object o : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(o.toString()); JSONObject jsonObject = (JSONObject)o; String downloadUrl = null; try { //1 downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } list.add(downloadUrl); jsonObject.put("url", downloadUrl); } record.setTaskImage(String.join(",", list)); record.setTaskImage(JSONArray.toJSONString(jsonArray)); } data.stream().filter(xpOperationsUser -> xpOperationsUser.getId().equals(record.getOperationsUserId())).findFirst().ifPresent(xpOperationsUser -> record.setCreateBy(xpOperationsUser.getNickName())); } xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleDetectionController.java
@@ -1,10 +1,9 @@ package com.xiaopeng.maintenance.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.xiaopeng.api.feignClient.account.XpOperationUserClient; import com.xiaopeng.api.feignClient.vehicleConvoy.XpVehicleClient; import com.xiaopeng.common.core.domain.R; import com.xiaopeng.common.core.web.page.PageInfo; import com.xiaopeng.common.security.service.TokenService; @@ -26,7 +25,6 @@ import javax.validation.Valid; import java.io.UnsupportedEncodingException; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; @@ -74,6 +72,7 @@ } /** * 车辆详情-车辆运维-车辆检测提交 */ @@ -103,98 +102,100 @@ String vehiclePictures = xpVehicleDetectionVO.getVehiclePictures(); if (vehiclePictures != null && !vehiclePictures.isEmpty()) { JSONObject jsonObject = JSONObject.parseObject(vehiclePictures); // 1 String downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); xpVehicleDetectionVO.setVehiclePictures(downloadUrl); jsonObject.put("url", downloadUrl); xpVehicleDetectionVO.setVehiclePictures(jsonObject.toJSONString()); } String sensorCleaningPicture = xpVehicleDetectionVO.getSensorCleaningPicture(); if (StringUtils.isNotBlank(sensorCleaningPicture)) { JSONArray jsonArray = JSONArray.parseArray(sensorCleaningPicture); ArrayList<String> list = new ArrayList<>(jsonArray.size()); for (Object o : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(o.toString()); JSONObject jsonObject = (JSONObject)o; String downloadUrl = null; try { //1 downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } list.add(downloadUrl); jsonObject.put("url", downloadUrl); } xpVehicleDetectionVO.setSensorCleaningPicture(String.join(",", list)); xpVehicleDetectionVO.setSensorCleaningPicture(JSONArray.toJSONString(jsonArray)); } String interactiveScreenPicture = xpVehicleDetectionVO.getInteractiveScreenPicture(); if (StringUtils.isNotBlank(interactiveScreenPicture)) { JSONArray jsonArray = JSONArray.parseArray(interactiveScreenPicture); ArrayList<String> list = new ArrayList<>(jsonArray.size()); for (Object o : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(o.toString()); JSONObject jsonObject = (JSONObject)o; String downloadUrl = null; try { //1 downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } list.add(downloadUrl); jsonObject.put("url", downloadUrl); } xpVehicleDetectionVO.setInteractiveScreenPicture(String.join(",", list)); xpVehicleDetectionVO.setInteractiveScreenPicture(JSONArray.toJSONString(jsonArray)); } String helpButtonPicture = xpVehicleDetectionVO.getHelpButtonPicture(); if (StringUtils.isNotBlank(helpButtonPicture)) { JSONArray jsonArray = JSONArray.parseArray(helpButtonPicture); ArrayList<String> list = new ArrayList<>(jsonArray.size()); for (Object o : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(o.toString()); JSONObject jsonObject = (JSONObject)o; String downloadUrl = null; try { //1 downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } list.add(downloadUrl); jsonObject.put("url", downloadUrl); } xpVehicleDetectionVO.setHelpButtonPicture(String.join(",", list)); xpVehicleDetectionVO.setHelpButtonPicture(JSONArray.toJSONString(jsonArray)); } String paymentFunctionPicture = xpVehicleDetectionVO.getPaymentFunctionPicture(); if (StringUtils.isNotBlank(paymentFunctionPicture)) { JSONArray jsonArray = JSONArray.parseArray(paymentFunctionPicture); ArrayList<String> list = new ArrayList<>(jsonArray.size()); for (Object o : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(o.toString()); JSONObject jsonObject = (JSONObject)o; String downloadUrl = null; try { //1 downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } list.add(downloadUrl); jsonObject.put("url", downloadUrl); } xpVehicleDetectionVO.setPaymentFunctionPicture(String.join(",", list)); xpVehicleDetectionVO.setPaymentFunctionPicture(JSONArray.toJSONString(jsonArray)); } String systemCheckPicture = xpVehicleDetectionVO.getSystemCheckPicture(); if (StringUtils.isNotBlank(systemCheckPicture)) { JSONArray jsonArray = JSONArray.parseArray(systemCheckPicture); ArrayList<String> list = new ArrayList<>(jsonArray.size()); for (Object o : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(o.toString()); JSONObject jsonObject = (JSONObject)o; String downloadUrl = null; try { //1 downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } list.add(downloadUrl); jsonObject.put("url", downloadUrl); } xpVehicleDetectionVO.setSystemCheckPicture(String.join(",", list)); xpVehicleDetectionVO.setSystemCheckPicture(JSONArray.toJSONString(jsonArray)); } @@ -214,98 +215,100 @@ String vehiclePictures = xpVehicleDetectionVO.getVehiclePictures(); if (vehiclePictures != null && !vehiclePictures.isEmpty()) { JSONObject jsonObject = JSONObject.parseObject(vehiclePictures); // 1 String downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); xpVehicleDetectionVO.setVehiclePictures(downloadUrl); jsonObject.put("url", downloadUrl); xpVehicleDetectionVO.setVehiclePictures(jsonObject.toJSONString()); } String sensorCleaningPicture = xpVehicleDetectionVO.getSensorCleaningPicture(); if (StringUtils.isNotBlank(sensorCleaningPicture)) { JSONArray jsonArray = JSONArray.parseArray(sensorCleaningPicture); ArrayList<String> list = new ArrayList<>(jsonArray.size()); for (Object o : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(o.toString()); JSONObject jsonObject = (JSONObject)o; String downloadUrl = null; try { // 1 downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } list.add(downloadUrl); jsonObject.put("url", downloadUrl); } xpVehicleDetectionVO.setSensorCleaningPicture(String.join(",", list)); xpVehicleDetectionVO.setSensorCleaningPicture(JSONArray.toJSONString(jsonArray)); } String interactiveScreenPicture = xpVehicleDetectionVO.getInteractiveScreenPicture(); if (StringUtils.isNotBlank(interactiveScreenPicture)) { JSONArray jsonArray = JSONArray.parseArray(interactiveScreenPicture); ArrayList<String> list = new ArrayList<>(jsonArray.size()); for (Object o : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(o.toString()); JSONObject jsonObject = (JSONObject)o; String downloadUrl = null; try { //1 downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } list.add(downloadUrl); jsonObject.put("url", downloadUrl); } xpVehicleDetectionVO.setInteractiveScreenPicture(String.join(",", list)); xpVehicleDetectionVO.setInteractiveScreenPicture(JSONArray.toJSONString(jsonArray)); } String helpButtonPicture = xpVehicleDetectionVO.getHelpButtonPicture(); if (StringUtils.isNotBlank(helpButtonPicture)) { JSONArray jsonArray = JSONArray.parseArray(helpButtonPicture); ArrayList<String> list = new ArrayList<>(jsonArray.size()); for (Object o : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(o.toString()); JSONObject jsonObject = (JSONObject)o; String downloadUrl = null; try { //1 downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } list.add(downloadUrl); jsonObject.put("url", downloadUrl); } xpVehicleDetectionVO.setHelpButtonPicture(String.join(",", list)); xpVehicleDetectionVO.setHelpButtonPicture(JSONArray.toJSONString(jsonArray)); } String paymentFunctionPicture = xpVehicleDetectionVO.getPaymentFunctionPicture(); if (StringUtils.isNotBlank(paymentFunctionPicture)) { JSONArray jsonArray = JSONArray.parseArray(paymentFunctionPicture); ArrayList<String> list = new ArrayList<>(jsonArray.size()); for (Object o : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(o.toString()); JSONObject jsonObject = (JSONObject)o; String downloadUrl = null; try { //1 downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } list.add(downloadUrl); jsonObject.put("url", downloadUrl); } xpVehicleDetectionVO.setPaymentFunctionPicture(String.join(",", list)); xpVehicleDetectionVO.setPaymentFunctionPicture(JSONArray.toJSONString(jsonArray)); } String systemCheckPicture = xpVehicleDetectionVO.getSystemCheckPicture(); if (StringUtils.isNotBlank(systemCheckPicture)) { JSONArray jsonArray = JSONArray.parseArray(systemCheckPicture); ArrayList<String> list = new ArrayList<>(jsonArray.size()); for (Object o : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(o.toString()); JSONObject jsonObject = (JSONObject)o; String downloadUrl = null; try { //1 downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } list.add(downloadUrl); jsonObject.put("url", downloadUrl); } xpVehicleDetectionVO.setSystemCheckPicture(String.join(",", list)); xpVehicleDetectionVO.setSystemCheckPicture(JSONArray.toJSONString(jsonArray)); } } xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleOperationsController.java
@@ -1,17 +1,12 @@ package com.xiaopeng.maintenance.controller; import cn.hutool.core.util.IdUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.xiaopeng.api.dto.automaticPilot.PushOrderDto; import com.xiaopeng.api.dto.operation.NewCruiseOrderDto; import com.xiaopeng.api.feignClient.automaticPilot.OrderMissionClient; import com.xiaopeng.api.feignClient.operation.XpCruisePlanClient; import com.xiaopeng.api.feignClient.order.XpCruiseOrderClient; import com.xiaopeng.api.feignClient.vehicleConvoy.XpVehicleClient; import com.xiaopeng.api.model.order.XpCruiseOrder; import com.xiaopeng.api.model.vehicleConvoy.XpVehicle; import com.xiaopeng.api.vo.OrderType; import com.xiaopeng.api.vo.automaticPilot.VehiclePosition; import com.xiaopeng.common.core.domain.R; import com.xiaopeng.common.core.web.page.PageInfo; @@ -20,7 +15,6 @@ import com.xiaopeng.maintenance.dto.VehicleDispatchDepartureDTO; import com.xiaopeng.maintenance.model.query.OperationRecordsQuery; import com.xiaopeng.maintenance.model.vo.OperationRecordsVO; import com.xiaopeng.maintenance.model.vo.XpVehicleRepairVO; import com.xiaopeng.maintenance.service.IXpVehiclePreparationService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -38,7 +32,6 @@ import javax.annotation.Resource; import java.io.UnsupportedEncodingException; import java.util.ArrayList; /** * <p> @@ -157,8 +150,10 @@ String vehiclePictures = record.getVehiclePictures(); if (StringUtils.isNotBlank(vehiclePictures)) { JSONObject jsonObject = JSONObject.parseObject(vehiclePictures); // 1 String downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); record.setVehiclePictures(downloadUrl); jsonObject.put("url", downloadUrl); record.setVehiclePictures(jsonObject.toJSONString()); } } xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehiclePreparationController.java
@@ -1,17 +1,15 @@ package com.xiaopeng.maintenance.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.xiaopeng.api.feignClient.account.XpOperationUserClient; import com.xiaopeng.api.feignClient.vehicleConvoy.XpVehicleClient; import com.xiaopeng.evi.oss.service.AliOssService; import com.xiaopeng.maintenance.model.query.XpVehiclePreparationPageQuery; import com.xiaopeng.api.vo.maintenance.XpVehiclePreparationDetailVO; import com.xiaopeng.common.core.domain.R; import com.xiaopeng.common.core.web.page.PageInfo; import com.xiaopeng.common.security.service.TokenService; import com.xiaopeng.evi.oss.service.AliOssService; import com.xiaopeng.maintenance.dto.XpVehiclePreparationDTO; import com.xiaopeng.maintenance.model.query.XpVehiclePreparationPageQuery; import com.xiaopeng.maintenance.model.vo.XpVehiclePreparationVO; import com.xiaopeng.maintenance.service.IXpVehiclePreparationService; import com.xiaopeng.maintenance.service.XpTaskService; @@ -26,7 +24,6 @@ import javax.validation.Valid; import java.io.UnsupportedEncodingException; import java.util.ArrayList; /** * <p> @@ -78,8 +75,10 @@ String vehiclePictures = xpVehiclePreparationVO.getVehiclePictures(); if (StringUtils.isNotBlank(vehiclePictures)) { JSONObject jsonObject = JSONObject.parseObject(vehiclePictures); // 1 String downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); xpVehiclePreparationVO.setVehiclePictures(downloadUrl); jsonObject.put("url", downloadUrl); xpVehiclePreparationVO.setVehiclePictures(jsonObject.toJSONString()); }
@@ -1,7 +1,7 @@ package com.xiaopeng.maintenance.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.xiaopeng.api.model.maintenance.XpVehicleRepair; @@ -97,25 +97,27 @@ String vehiclePictures = xpVehicleRepairVO.getVehiclePictures(); if (StringUtils.isNotBlank(vehiclePictures)) { JSONObject jsonObject = JSONObject.parseObject(vehiclePictures); // 1 String downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); xpVehicleRepairVO.setVehiclePictures(downloadUrl); jsonObject.put("url", downloadUrl); xpVehicleRepairVO.setVehiclePictures(jsonObject.toJSONString()); } String startRepairPicture = xpVehicleRepairVO.getStartRepairPicture(); if (StringUtils.isNotBlank(startRepairPicture)) { JSONArray jsonArray = JSONArray.parseArray(startRepairPicture); ArrayList<String> list = new ArrayList<>(jsonArray.size()); for (Object o : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(o.toString()); JSONObject jsonObject = (JSONObject)o; String downloadUrl = null; try { // 1 downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } list.add(downloadUrl); jsonObject.put("url", downloadUrl); } xpVehicleRepairVO.setStartRepairPicture(String.join(",", list)); xpVehicleRepairVO.setStartRepairPicture(JSONArray.toJSONString(jsonArray)); } @@ -136,25 +138,27 @@ String vehiclePictures = record.getVehiclePictures(); if (StringUtils.isNotBlank(vehiclePictures)) { JSONObject jsonObject = JSONObject.parseObject(vehiclePictures); //1 String downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); record.setVehiclePictures(downloadUrl); jsonObject.put("url", downloadUrl); record.setVehiclePictures(jsonObject.toJSONString()); } String startRepairPicture = record.getStartRepairPicture(); if (StringUtils.isNotBlank(startRepairPicture)) { JSONArray jsonArray = JSONArray.parseArray(startRepairPicture); ArrayList<String> list = new ArrayList<>(jsonArray.size()); for (Object o : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(o.toString()); JSONObject jsonObject = (JSONObject)o; String downloadUrl = null; try { //1 downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } list.add(downloadUrl); jsonObject.put("url", downloadUrl); } record.setStartRepairPicture(String.join(",", list)); record.setStartRepairPicture(JSONArray.toJSONString(jsonArray)); } } xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpWorkOrderController.java
@@ -1,7 +1,7 @@ package com.xiaopeng.maintenance.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.xiaopeng.api.model.maintenance.XpWorkOrder; @@ -85,18 +85,18 @@ String problemImage = detail.getProblemImage(); if (StringUtils.isNotBlank(problemImage)) { JSONArray jsonArray = JSONArray.parseArray(problemImage); ArrayList<String> list = new ArrayList<>(jsonArray.size()); for (Object o : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(o.toString()); JSONObject jsonObject = (JSONObject)o; String downloadUrl = null; try { // 1 downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } list.add(downloadUrl); jsonObject.put("url", downloadUrl); } detail.setProblemImage(String.join(",", list)); detail.setProblemImage(JSONArray.toJSONString(jsonArray)); } } return R.ok(detail); xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpChargingRecordServiceImpl.java
@@ -1,24 +1,23 @@ package com.xiaopeng.maintenance.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.xiaopeng.api.feignClient.account.XpOperationUserClient; import com.xiaopeng.api.feignClient.vehicleConvoy.XpVehicleClient; import com.xiaopeng.api.model.account.XpOperationsUser; import com.xiaopeng.api.model.maintenance.XpChargingRecord; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.xiaopeng.api.model.vehicleConvoy.XpVehicle; import com.xiaopeng.api.vo.automaticPilot.VehiclePosition; import com.xiaopeng.evi.oss.service.AliOssService; import com.xiaopeng.maintenance.model.query.XpChargingRecordPageQuery; import com.xiaopeng.common.core.domain.R; import com.xiaopeng.common.core.web.page.PageInfo; import com.xiaopeng.evi.oss.service.AliOssService; import com.xiaopeng.maintenance.dto.XpChargingRecordStartDTO; import com.xiaopeng.maintenance.dto.XpChargingRecordStopDTO; import com.xiaopeng.maintenance.mapper.XpChargingRecordMapper; import com.xiaopeng.maintenance.model.query.XpChargingRecordPageQuery; import com.xiaopeng.maintenance.model.vo.XpChargingRecordVO; import com.xiaopeng.maintenance.service.IXpChargingRecordService; import com.xiaopeng.maintenance.vo.ChargingStatusVO; @@ -119,8 +118,10 @@ String vehiclePictures =xpVehicle.getVehiclePictures(); if (StringUtils.isNotBlank(vehiclePictures)) { JSONObject jsonObject = JSONObject.parseObject(vehiclePictures); // 1 String downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); xpChargingRecordVO.setVehiclePictures(downloadUrl); jsonObject.put("url", downloadUrl); xpChargingRecordVO.setVehiclePictures(jsonObject.toJSONString()); } @@ -231,18 +232,18 @@ String vehiclePictures = vo.getVehiclePictures(); if (StringUtils.isNotBlank(vehiclePictures)) { JSONArray jsonArray = JSONArray.parseArray(vehiclePictures); ArrayList<String> list = new ArrayList<>(jsonArray.size()); for (Object o : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(o.toString()); JSONObject jsonObject = (JSONObject)o; String downloadUrl = null; try { //1 downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } list.add(downloadUrl); jsonObject.put("url", downloadUrl); } vo.setVehiclePictures(String.join(",", list)); vo.setVehiclePictures(JSONArray.toJSONString(jsonArray)); } @@ -250,18 +251,18 @@ String startChargingPicture = vo.getStartChargingPicture(); if (StringUtils.isNotBlank(startChargingPicture)) { JSONArray jsonArray = JSONArray.parseArray(startChargingPicture); ArrayList<String> list = new ArrayList<>(jsonArray.size()); for (Object o : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(o.toString()); JSONObject jsonObject = (JSONObject)o; String downloadUrl = null; try { // 1 downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } list.add(downloadUrl); jsonObject.put("url", downloadUrl); } vo.setStartChargingPicture(String.join(",", list)); vo.setStartChargingPicture(JSONArray.toJSONString(jsonArray)); } @@ -269,18 +270,18 @@ String endChargingPicture = vo.getEndChargingPicture(); if (StringUtils.isNotBlank(endChargingPicture)) { JSONArray jsonArray = JSONArray.parseArray(endChargingPicture); ArrayList<String> list = new ArrayList<>(jsonArray.size()); for (Object o : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(o.toString()); JSONObject jsonObject = (JSONObject)o; String downloadUrl = null; try { // 1 downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } list.add(downloadUrl); jsonObject.put("url", downloadUrl); } vo.setEndChargingPicture(String.join(",", list)); vo.setEndChargingPicture(JSONArray.toJSONString(jsonArray)); }
@@ -1,7 +1,7 @@ package com.xiaopeng.maintenance.service.impl; import cn.hutool.core.collection.CollUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpSchedulingDetailServiceImpl.java
@@ -1,6 +1,6 @@ package com.xiaopeng.maintenance.service.impl; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpTaskServiceImpl.java
@@ -1,7 +1,7 @@ package com.xiaopeng.maintenance.service.impl; import cn.hutool.core.collection.CollUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -149,8 +149,10 @@ String vehiclePictures = workBenchVO.getVehiclePictures(); if (StringUtils.isNotBlank(vehiclePictures)) { JSONObject jsonObject = JSONObject.parseObject(vehiclePictures); //1 String downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); workBenchVO.setVehiclePictures(downloadUrl); jsonObject.put("url", downloadUrl); workBenchVO.setVehiclePictures(jsonObject.toJSONString()); } } @@ -434,13 +436,13 @@ String taskImage = res.getTaskImage(); if (StringUtils.isNotBlank(taskImage)) { JSONArray jsonArray = JSONArray.parseArray(taskImage); ArrayList<String> list = new ArrayList<>(jsonArray.size()); for (Object o : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(o.toString()); JSONObject jsonObject = (JSONObject)o; // 1 String downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); list.add(downloadUrl); jsonObject.put("url", downloadUrl); } res.setTaskImage(String.join(",", list)); res.setTaskImage(JSONArray.toJSONString(jsonArray)); } return R.ok(res); @@ -535,13 +537,13 @@ String taskImage = res.getTaskImage(); if (StringUtils.isNotBlank(taskImage)) { JSONArray jsonArray = JSONArray.parseArray(taskImage); ArrayList<String> list = new ArrayList<>(jsonArray.size()); for (Object o : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(o.toString()); JSONObject jsonObject = (JSONObject)o; // 1 String downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); list.add(downloadUrl); jsonObject.put("url", downloadUrl); } res.setTaskImage(String.join(",", list)); res.setTaskImage(JSONArray.toJSONString(jsonArray)); } @@ -587,18 +589,18 @@ String startChargingPicture = res.getStartChargingPicture(); if (StringUtils.isNotBlank(startChargingPicture)) { JSONArray jsonArray = JSONArray.parseArray(startChargingPicture); ArrayList<String> list = new ArrayList<>(jsonArray.size()); for (Object o : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(o.toString()); JSONObject jsonObject = (JSONObject)o; String downloadUrl = null; try { //1 downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } list.add(downloadUrl); jsonObject.put("url", downloadUrl); } res.setStartChargingPicture(String.join(",", list)); res.setStartChargingPicture(JSONArray.toJSONString(jsonArray)); } res.setStartTime(chargingRecord.getStartTime()); @@ -610,18 +612,18 @@ String endChargingPicture = chargingRecord.getEndChargingPicture(); if (StringUtils.isNotBlank(endChargingPicture)) { JSONArray jsonArray = JSONArray.parseArray(endChargingPicture); ArrayList<String> list = new ArrayList<>(jsonArray.size()); for (Object o : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(o.toString()); JSONObject jsonObject = (JSONObject)o; String downloadUrl = null; try { //1 downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } list.add(downloadUrl); jsonObject.put("url", downloadUrl); } res.setEndChargingPicture(String.join(",", list)); res.setEndChargingPicture(JSONArray.toJSONString(jsonArray)); } res.setEndTime(chargingRecord.getEndTime()); @@ -688,18 +690,18 @@ String startRepairPicture = vehicleRepair.getStartRepairPicture(); if (StringUtils.isNotBlank(startRepairPicture)) { JSONArray jsonArray = JSONArray.parseArray(startRepairPicture); ArrayList<String> list = new ArrayList<>(jsonArray.size()); for (Object o : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(o.toString()); JSONObject jsonObject = (JSONObject)o; String downloadUrl = null; try { // 1 downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } list.add(downloadUrl); jsonObject.put("url", downloadUrl); } res.setStartRepairPicture(String.join(",", list)); res.setStartRepairPicture(JSONArray.toJSONString(jsonArray)); } res.setRepairMoney(vehicleRepair.getRepairMoney()); @@ -832,18 +834,18 @@ String SensorCleaningPicture = vehicleDetection.getSensorCleaningPicture(); if (StringUtils.isNotBlank(SensorCleaningPicture)) { JSONArray jsonArray = JSONArray.parseArray(SensorCleaningPicture); ArrayList<String> list = new ArrayList<>(jsonArray.size()); for (Object o : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(o.toString()); JSONObject jsonObject =(JSONObject)o; String downloadUrl = null; try { // 1 downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } list.add(downloadUrl); jsonObject.put("url", downloadUrl); } res.setSensorCleaningPicture(String.join(",", list)); res.setSensorCleaningPicture(JSONArray.toJSONString(jsonArray)); } @@ -853,18 +855,18 @@ String InteractiveScreenPicture =vehicleDetection.getInteractiveScreenPicture(); if (StringUtils.isNotBlank(InteractiveScreenPicture)) { JSONArray jsonArray = JSONArray.parseArray(InteractiveScreenPicture); ArrayList<String> list = new ArrayList<>(jsonArray.size()); for (Object o : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(o.toString()); JSONObject jsonObject = (JSONObject)o; String downloadUrl = null; try { // 1 downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } list.add(downloadUrl); jsonObject.put("url", downloadUrl); } res.setInteractiveScreenPicture(String.join(",", list)); res.setInteractiveScreenPicture(JSONArray.toJSONString(jsonArray)); } @@ -877,18 +879,18 @@ String HelpButtonPicture =vehicleDetection.getHelpButtonPicture(); if (StringUtils.isNotBlank(HelpButtonPicture)) { JSONArray jsonArray = JSONArray.parseArray(HelpButtonPicture); ArrayList<String> list = new ArrayList<>(jsonArray.size()); for (Object o : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(o.toString()); JSONObject jsonObject =(JSONObject)o; String downloadUrl = null; try { // 1 downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } list.add(downloadUrl); jsonObject.put("url", downloadUrl); } res.setHelpButtonPicture(String.join(",", list)); res.setHelpButtonPicture(JSONArray.toJSONString(jsonArray)); } res.setPaymentFunction(vehicleDetection.getPaymentFunction()); @@ -898,18 +900,18 @@ String PaymentFunctionPicture =vehicleDetection.getPaymentFunctionPicture(); if (StringUtils.isNotBlank(PaymentFunctionPicture)) { JSONArray jsonArray = JSONArray.parseArray(PaymentFunctionPicture); ArrayList<String> list = new ArrayList<>(jsonArray.size()); for (Object o : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(o.toString()); JSONObject jsonObject = (JSONObject)o; String downloadUrl = null; try { // 1 downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } list.add(downloadUrl); jsonObject.put("url", downloadUrl); } res.setPaymentFunctionPicture(String.join(",", list)); res.setPaymentFunctionPicture(JSONArray.toJSONString(jsonArray)); } res.setSystemCheck(vehicleDetection.getSystemCheck()); @@ -918,18 +920,18 @@ String SystemCheckPicture =vehicleDetection.getSystemCheckPicture(); if (StringUtils.isNotBlank(SystemCheckPicture)) { JSONArray jsonArray = JSONArray.parseArray(SystemCheckPicture); ArrayList<String> list = new ArrayList<>(jsonArray.size()); for (Object o : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(o.toString()); JSONObject jsonObject =(JSONObject)o; String downloadUrl = null; try { // 1 downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } list.add(downloadUrl); jsonObject.put("url", downloadUrl); } res.setSystemCheckPicture(String.join(",", list)); res.setSystemCheckPicture(JSONArray.toJSONString(jsonArray)); } res.setCheckTime(vehicleDetection.getCheckTime()); res.setOperationsUserId(vehicleDetection.getOperationsUserId()); @@ -1025,13 +1027,13 @@ String taskImage = res.getTaskImage(); if (StringUtils.isNotBlank(taskImage)) { JSONArray jsonArray = JSONArray.parseArray(taskImage); ArrayList<String> list = new ArrayList<>(jsonArray.size()); for (Object o : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(o.toString()); JSONObject jsonObject = (JSONObject)o; // 1 String downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); list.add(downloadUrl); jsonObject.put("url", downloadUrl); } res.setTaskImage(String.join(",", list)); res.setTaskImage(JSONArray.toJSONString(jsonArray)); } res.setOperationUserId(vehicleDetection.getOperationsUserId()); @@ -1248,18 +1250,18 @@ String taskImage =record.getTaskImage(); if (StringUtils.isNotBlank(taskImage)) { JSONArray jsonArray = JSONArray.parseArray(taskImage); ArrayList<String> list = new ArrayList<>(jsonArray.size()); for (Object o : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(o.toString()); JSONObject jsonObject = (JSONObject)o; String downloadUrl = null; try { // 1 downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } list.add(downloadUrl); jsonObject.put("url", downloadUrl); } record.setTaskImage(String.join(",", list)); record.setTaskImage(JSONArray.toJSONString(jsonArray)); } } @@ -1573,8 +1575,10 @@ if(vehicle.getVehiclePictures()!=null){ JSONObject jsonObject = JSONObject.parseObject(vehicle.getVehiclePictures()); // 1 String downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); taskManagementDetectionDetailVO.setVehiclePictures(downloadUrl); jsonObject.put("url", downloadUrl); taskManagementDetectionDetailVO.setVehiclePictures(jsonObject.toJSONString()); } taskManagementDetectionDetailVO.setTaskCode(task.getTaskCode()); @@ -1593,18 +1597,18 @@ String SensorCleaningPicture = vehicleDetection.getSensorCleaningPicture(); if (StringUtils.isNotBlank(SensorCleaningPicture)) { JSONArray jsonArray = JSONArray.parseArray(SensorCleaningPicture); ArrayList<String> list = new ArrayList<>(jsonArray.size()); for (Object o : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(o.toString()); JSONObject jsonObject = (JSONObject)o; String downloadUrl = null; try { // 1 downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } list.add(downloadUrl); jsonObject.put("url", downloadUrl); } taskManagementDetectionDetailVO.setSensorCleaningPicture(String.join(",", list)); taskManagementDetectionDetailVO.setSensorCleaningPicture(JSONArray.toJSONString(jsonArray)); } @@ -1615,18 +1619,18 @@ String InteractiveScreenPicture =vehicleDetection.getInteractiveScreenPicture(); if (StringUtils.isNotBlank(InteractiveScreenPicture)) { JSONArray jsonArray = JSONArray.parseArray(InteractiveScreenPicture); ArrayList<String> list = new ArrayList<>(jsonArray.size()); for (Object o : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(o.toString()); JSONObject jsonObject = (JSONObject)o; String downloadUrl = null; try { // 1 downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } list.add(downloadUrl); jsonObject.put("url", downloadUrl); } taskManagementDetectionDetailVO.setInteractiveScreenPicture(String.join(",", list)); taskManagementDetectionDetailVO.setInteractiveScreenPicture(JSONArray.toJSONString(jsonArray)); } taskManagementDetectionDetailVO.setHelpButton(vehicleDetection.getHelpButton()); @@ -1635,18 +1639,18 @@ String HelpButtonPicture =vehicleDetection.getHelpButtonPicture(); if (StringUtils.isNotBlank(HelpButtonPicture)) { JSONArray jsonArray = JSONArray.parseArray(HelpButtonPicture); ArrayList<String> list = new ArrayList<>(jsonArray.size()); for (Object o : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(o.toString()); JSONObject jsonObject = (JSONObject)o; String downloadUrl = null; try { // 1 downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } list.add(downloadUrl); jsonObject.put("url", downloadUrl); } taskManagementDetectionDetailVO.setHelpButtonPicture(String.join(",", list)); taskManagementDetectionDetailVO.setHelpButtonPicture(JSONArray.toJSONString(jsonArray)); } taskManagementDetectionDetailVO.setPaymentFunction(vehicleDetection.getPaymentFunction()); @@ -1655,18 +1659,18 @@ String PaymentFunctionPicture =vehicleDetection.getPaymentFunctionPicture(); if (StringUtils.isNotBlank(PaymentFunctionPicture)) { JSONArray jsonArray = JSONArray.parseArray(PaymentFunctionPicture); ArrayList<String> list = new ArrayList<>(jsonArray.size()); for (Object o : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(o.toString()); JSONObject jsonObject = (JSONObject)o; String downloadUrl = null; try { // 1 downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } list.add(downloadUrl); jsonObject.put("url", downloadUrl); } taskManagementDetectionDetailVO.setPaymentFunctionPicture(String.join(",", list)); taskManagementDetectionDetailVO.setPaymentFunctionPicture(JSONArray.toJSONString(jsonArray)); } @@ -1676,18 +1680,18 @@ String SystemCheckPicture =vehicleDetection.getSystemCheckPicture(); if (StringUtils.isNotBlank(SystemCheckPicture)) { JSONArray jsonArray = JSONArray.parseArray(SystemCheckPicture); ArrayList<String> list = new ArrayList<>(jsonArray.size()); for (Object o : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(o.toString()); JSONObject jsonObject = (JSONObject)o; String downloadUrl = null; try { // 1 downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } list.add(downloadUrl); jsonObject.put("url", downloadUrl); } taskManagementDetectionDetailVO.setSystemCheckPicture(String.join(",", list)); taskManagementDetectionDetailVO.setSystemCheckPicture(JSONArray.toJSONString(jsonArray)); } taskManagementDetectionDetailVO.setCheckTime(vehicleDetection.getCheckTime()); xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpVehicleRepairServiceImpl.java
@@ -1,6 +1,6 @@ package com.xiaopeng.maintenance.service.impl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -175,18 +175,18 @@ String RepairMoneyDetail = vo.getRepairMoneyDetail(); if (StringUtils.isNotBlank(RepairMoneyDetail)) { JSONArray jsonArray = JSONArray.parseArray(RepairMoneyDetail); ArrayList<String> list = new ArrayList<>(jsonArray.size()); for (Object o : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(o.toString()); JSONObject jsonObject = (JSONObject)o; String downloadUrl = null; try { // 1 downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } list.add(downloadUrl); jsonObject.put("url", downloadUrl); } vo.setRepairMoneyDetail(String.join(",", list)); vo.setRepairMoneyDetail(JSONArray.toJSONString(jsonArray)); } @@ -196,18 +196,18 @@ String StartRepairPicture = vo.getStartRepairPicture(); if (StringUtils.isNotBlank(StartRepairPicture)) { JSONArray jsonArray = JSONArray.parseArray(StartRepairPicture); ArrayList<String> list = new ArrayList<>(jsonArray.size()); for (Object o : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(o.toString()); JSONObject jsonObject =(JSONObject)o; String downloadUrl = null; try { // 1 downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } list.add(downloadUrl); jsonObject.put("url", downloadUrl); } vo.setStartRepairPicture(String.join(",", list)); vo.setStartRepairPicture(JSONArray.toJSONString(jsonArray)); }
@@ -1,7 +1,7 @@ package com.xiaopeng.maintenance.utils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.xiaopeng.common.core.utils.HttpUtils; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/config/MyLocaleResolver.java
@@ -1,7 +1,7 @@ package com.xiaopeng.map.config; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import org.springframework.util.StringUtils; import org.springframework.web.servlet.LocaleResolver;
@@ -1,6 +1,6 @@ package com.xiaopeng.map.config.log; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpElectronicFenceAreaServiceImpl.java
@@ -1,8 +1,8 @@ package com.xiaopeng.map.service.serviceimpl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.xiaopeng.api.dto.map.RouteAndFareDto; import com.xiaopeng.api.dto.operation.LonLatCityCodeDto; xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/utils/AmapWalkingRouteUtil.java
@@ -1,7 +1,7 @@ package com.xiaopeng.map.utils; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.xiaopeng.api.dto.operation.LonLatDto; xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/utils/GDMapGeocodingUtil.java
@@ -1,8 +1,8 @@ package com.xiaopeng.map.utils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.xiaopeng.api.dto.operation.LonLatDto; import com.xiaopeng.api.vo.operation.RouteVo; import com.xiaopeng.common.core.utils.HttpUtils; xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/utils/TimeRangeChecker.java
@@ -1,7 +1,7 @@ package com.xiaopeng.map.utils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONArray; import java.time.LocalTime; import java.time.format.DateTimeFormatter; xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/config/MyLocaleResolver.java
@@ -1,7 +1,7 @@ package com.xiaopeng.operation.config; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import org.springframework.util.StringUtils; import org.springframework.web.servlet.LocaleResolver;
@@ -1,6 +1,6 @@ package com.xiaopeng.operation.config.log; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpBannerManagementController.java
@@ -62,11 +62,13 @@ JSONObject jsonObject = JSON.parseArray(xpBanner.getBannerPictures()).getJSONObject(0); String downloadUrl = null; try { // 1 downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } xpBanner.setBannerPictures(downloadUrl); jsonObject.put("url", downloadUrl); xpBanner.setBannerPictures(jsonObject.toJSONString()); return R.ok(xpBanner); xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpAgreementServiceImpl.java
@@ -2,7 +2,7 @@ import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.xiaopeng.api.dto.pushMessage.AliPushMessageDTO; xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpAppVersionServiceImpl.java
@@ -1,7 +1,7 @@ package com.xiaopeng.operation.service.impl; import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.xiaopeng.api.dto.pushMessage.AliPushMessageDTO; xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpBannerServiceImpl.java
@@ -2,6 +2,7 @@ import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -50,14 +51,20 @@ vo.setId(item.getId()); vo.setJumpType(item.getJumpType()); vo.setJumpUrl(item.getJumpUrl()); JSONObject jsonObject = JSON.parseArray(item.getBannerPictures()).getJSONObject(0); String downloadUrl = null; try { downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); JSONArray jsonArray = JSONArray.parseArray(item.getBannerPictures()); for (Object o : jsonArray) { JSONObject jsonObject = (JSONObject) o; String downloadUrl = null; try { // 1 downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } jsonObject.put("url", downloadUrl); } vo.setImageUrl(downloadUrl); vo.setImageUrl(JSONArray.toJSONString(jsonArray)); return vo; }).collect(Collectors.toList()); } @@ -69,14 +76,21 @@ PageInfo<XpBanner> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); List<XpBanner> list = this.baseMapper.pageList(pageInfo, query); for (XpBanner xpBanner : list) { JSONObject jsonObject = JSON.parseArray(xpBanner.getBannerPictures()).getJSONObject(0); String downloadUrl = null; try { downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); JSONArray jsonArray = JSONArray.parse(xpBanner.getBannerPictures()); for (Object o : jsonArray) { JSONObject jsonObject = (JSONObject) o; String downloadUrl = null; try { // 1 downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } jsonObject.put("url", downloadUrl); } xpBanner.setBannerPictures(downloadUrl); xpBanner.setBannerPictures(JSONArray.toJSONString(jsonArray)); } pageInfo.setRecords(list); return pageInfo; xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPricingServiceImpl.java
@@ -1,9 +1,9 @@ package com.xiaopeng.operation.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpRideGuideServiceImpl.java
@@ -66,11 +66,13 @@ JSONObject jsonObject = JSON.parseObject(xpRideGuide.getGuideImage()); String downloadUrl = null; try { // 1 downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } xpRideGuide.setGuideImage(downloadUrl); jsonObject.put("url", downloadUrl); xpRideGuide.setGuideImage(jsonObject.toJSONString()); } return list; } xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpUserFeedbackServiceImpl.java
@@ -2,7 +2,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.xiaopeng.api.dto.account.UcUserInfo; @@ -84,18 +84,18 @@ String feedbackPictures = xpUserFeedbackVO.getFeedbackPictures(); if (StringUtils.isNotBlank(feedbackPictures)) { JSONArray jsonArray = JSONArray.parseArray(feedbackPictures); ArrayList<String> list = new ArrayList<>(jsonArray.size()); for (Object o : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(o.toString()); JSONObject jsonObject = (JSONObject)o; String downloadUrl = null; try { // 1 downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } list.add(downloadUrl); jsonObject.put("url", downloadUrl); } xpUserFeedbackVO.setFeedbackPictures(String.join(",", list)); xpUserFeedbackVO.setFeedbackPictures(JSONArray.toJSONString(jsonArray)); } } xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/GDMapGeocodingUtil.java
@@ -1,7 +1,7 @@ package com.xiaopeng.operation.utils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.xiaopeng.common.core.utils.HttpUtils; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java
@@ -1,8 +1,7 @@ package com.xiaopeng.operation.utils; import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSON; import com.xiaopeng.api.dto.automaticPilot.PushOrderDto; import com.xiaopeng.api.dto.map.RouteAndFareDto; import com.xiaopeng.api.dto.operation.LonLatDto; @@ -350,6 +349,9 @@ } } // 距离差 if (max1.equals(weightDistanceDifference)) { for (VehiclePositionVo vehiclePosition : availableVehiclesNearby) { RouteAndFareDto routeAndFareDto = new RouteAndFareDto(); @@ -400,10 +402,10 @@ // 分数计算 把时间短的分数调高 availableVehiclesNearby = availableVehiclesNearby.stream().sorted(Comparator.comparing(VehiclePositionVo::getDistance)).collect(Collectors.toList()); for (int count1 = 0; count1 < availableVehiclesNearby.size(); count1++) { VehiclePositionVo vehiclePosition = availableVehiclesNearby.get(count1); VehiclePositionVo vehiclePosition1 = availableVehiclesNearby.get(availableVehiclesNearby.size()-count1-1); vehiclePosition.setDistance(vehiclePosition1.getDistance()); double score = 10; for (VehiclePositionVo vehiclePosition : availableVehiclesNearby) { vehiclePosition.setDistance(score); score--; } } @@ -432,10 +434,10 @@ } // 分数计算 把时间短的分数调高 availableVehiclesNearby = availableVehiclesNearby.stream().sorted(Comparator.comparing(VehiclePositionVo::getSecond)).collect(Collectors.toList()); for (int count1 = 0; count1 < availableVehiclesNearby.size(); count1++) { VehiclePositionVo vehiclePosition = availableVehiclesNearby.get(count1); VehiclePositionVo vehiclePosition1 = availableVehiclesNearby.get(availableVehiclesNearby.size()-count1-1); vehiclePosition.setSecond(vehiclePosition1.getSecond()); int score = 10; for (VehiclePositionVo vehiclePosition : availableVehiclesNearby) { vehiclePosition.setSecond(score); score--; } } xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TimeRangeChecker.java
@@ -1,7 +1,7 @@ package com.xiaopeng.operation.utils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONArray; import java.time.LocalTime; import java.time.format.DateTimeFormatter;
@@ -1,7 +1,7 @@ package com.xiaopeng.operation.utils; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.xiaopeng.api.dto.order.GetOrderNumDto; import com.xiaopeng.api.feignClient.order.XpOrderClient; import com.xiaopeng.api.vo.order.XpPricingCardVo; xp-robotaxi-operation-boot/src/main/resources/mapper/operation/XpWhitelistMapper.xml
@@ -11,6 +11,7 @@ ,create_time as createTime,update_time as updateTime,create_by as createBy,update_by as updateBy from xp_whitelist where is_deleted = 0 group by account <if test="query.account != null and query.account != ''"> and account like concat('%',#{query.account},'%') </if> xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/config/MyLocaleResolver.java
@@ -1,7 +1,7 @@ package com.xiaopeng.order.config; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import org.springframework.util.StringUtils; import org.springframework.web.servlet.LocaleResolver;
@@ -1,6 +1,6 @@ package com.xiaopeng.order.config.log; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java
@@ -3,7 +3,7 @@ import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.xiaopeng.api.dto.QueryOrderRouteDTO; import com.xiaopeng.api.dto.operation.LonLatDto; @@ -334,7 +334,11 @@ String uid = request.getHeader("XP-Uid"); OrderDetailVo orderDetailVo = xpOrderService.orderDetail(orderId, uid); BigDecimal orderMoney = orderDetailVo.getOrderMoney(); orderDetailVo.setOrderMoneyStr(orderMoney.setScale(2, RoundingMode.HALF_UP).toString()); if(orderMoney==null){ orderDetailVo.setOrderMoneyStr("0.00"); }else { orderDetailVo.setOrderMoneyStr(orderMoney.setScale(2, RoundingMode.HALF_UP).toString()); } return R.ok(); }
@@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -614,7 +614,7 @@ if (null == order.getVehicleId()) { Object cacheObject1 = redisService.getCacheObject("CREATE_ORDER:" + order.getId().toString()); if (null != cacheObject1) { com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSON.parseObject(cacheObject1.toString()); com.alibaba.fastjson2.JSONObject jsonObject = com.alibaba.fastjson2.JSON.parseObject(cacheObject1.toString()); String vin = jsonObject.getString("vin"); XpVehicle vehicle = xpVehicleClient.findByVehicleVin(vin).getData(); if (null != vehicle && 0 != vehicle.getState()) { @@ -1202,7 +1202,7 @@ if (null == order.getVehicleId()) { Object cacheObject1 = redisService.getCacheObject("CREATE_ORDER:" + order.getId().toString()); if (null != cacheObject1) { com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSON.parseObject(cacheObject1.toString()); com.alibaba.fastjson2.JSONObject jsonObject = com.alibaba.fastjson2.JSON.parseObject(cacheObject1.toString()); String vin = jsonObject.getString("vin"); XpVehicle vehicle = xpVehicleClient.findByVehicleVin(vin).getData(); if (null != vehicle && 0 != vehicle.getState()) { @@ -1539,7 +1539,7 @@ Double mileageKilometers = order.getMileageKilometers(); Double duration1 = order.getDuration(); com.alibaba.fastjson.JSONObject basicPricingJson = com.alibaba.fastjson.JSONObject.parseObject(pricing.getBasicPricingJson()); com.alibaba.fastjson2.JSONObject basicPricingJson = com.alibaba.fastjson2.JSONObject.parseObject(pricing.getBasicPricingJson()); XpPricingCardVo xpPricingCardVo = xpPricingUtil.calculationFixedPrice(uid, basicPricingJson, null, mileageKilometers, duration1, 0, 0.0, pricing.getIsDynamicPrice(), order.getCityId(), pricing.getDynamicPricingJson()); XpOrderDetail xpOrderDetail = new XpOrderDetail(); @@ -1578,7 +1578,7 @@ if (pricing.getPricingType() == 1) { for (int i = 0; i < startingFareJsonArray.size(); i++) { com.alibaba.fastjson.JSONObject jsonObject = startingFareJsonArray.getJSONObject(i); com.alibaba.fastjson2.JSONObject jsonObject = startingFareJsonArray.getJSONObject(i); String num1 = jsonObject.getString("num1"); String num2 = jsonObject.getString("num2"); String num3 = jsonObject.getString("num3"); xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/utils/XpPricingUtil.java
@@ -1,7 +1,7 @@ package com.xiaopeng.order.utils; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.xiaopeng.api.dto.order.GetOrderNumDto; import com.xiaopeng.api.feignClient.order.XpOrderClient; import com.xiaopeng.api.vo.order.XpPricingCardVo; xp-robotaxi-payment-boot/src/main/java/com/xiaopeng/payment/config/MyLocaleResolver.java
@@ -1,7 +1,7 @@ package com.xiaopeng.payment.config; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import org.springframework.util.StringUtils; import org.springframework.web.servlet.LocaleResolver;
@@ -1,6 +1,6 @@ package com.xiaopeng.payment.config.log; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; xp-robotaxi-push-message-boot/src/main/java/com/xiaopeng/pushMessage/config/MyLocaleResolver.java
@@ -1,7 +1,7 @@ package com.xiaopeng.pushMessage.config; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import org.springframework.util.StringUtils; import org.springframework.web.servlet.LocaleResolver;
@@ -1,6 +1,6 @@ package com.xiaopeng.pushMessage.config.log; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; xp-robotaxi-push-message-boot/src/main/java/com/xiaopeng/pushMessage/controller/PushOrderRouteController.java
@@ -1,6 +1,6 @@ package com.xiaopeng.pushMessage.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.xiaopeng.api.dto.operation.LonLatDto; import com.xiaopeng.api.dto.pushMessage.PushOrderRouteDTO; xp-robotaxi-push-message-boot/src/main/java/com/xiaopeng/pushMessage/webSocket/controller/WebSocketController.java
@@ -1,6 +1,5 @@ package com.xiaopeng.pushMessage.webSocket.controller; import com.alibaba.fastjson.JSONObject; import com.xiaopeng.api.dto.pushMessage.SendMessageDTO; import com.xiaopeng.common.core.domain.R; import com.xiaopeng.common.core.web.controller.BaseController; xp-robotaxi-push-message-boot/src/main/java/com/xiaopeng/pushMessage/webSocket/handler/WebSocketTextFrameHandler.java
@@ -1,7 +1,7 @@ package com.xiaopeng.pushMessage.webSocket.handler; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.xiaopeng.pushMessage.webSocket.service.WebSocketUserConnectionManager; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; xp-robotaxi-push-message-boot/src/main/java/com/xiaopeng/pushMessage/webSocket/service/WebSocketUserService.java
@@ -281,6 +281,6 @@ message.put("targetUserId", targetUserId); } return com.alibaba.fastjson.JSON.toJSONString(message); return com.alibaba.fastjson2.JSON.toJSONString(message); } } xp-robotaxi-remote-driving-boot/src/main/java/com/xiaopeng/remoteDriving/config/MyLocaleResolver.java
@@ -1,7 +1,7 @@ package com.xiaopeng.remoteDriving.config; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import org.springframework.util.StringUtils; import org.springframework.web.servlet.LocaleResolver;
@@ -160,6 +160,11 @@ <artifactId>easypoi-annotation</artifactId> <version>4.4.0</version> </dependency> <dependency> <groupId>com.xiaopeng.logan</groupId> <artifactId>xp-evi-oss-sdk</artifactId> <version>1.0.1-SNAPSHOT</version> </dependency> </dependencies> <build> xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/config/MyLocaleResolver.java
@@ -1,7 +1,7 @@ package com.xiaopeng.vehicleConvoy.config; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import org.springframework.util.StringUtils; import org.springframework.web.servlet.LocaleResolver;
@@ -1,6 +1,6 @@ package com.xiaopeng.vehicleConvoy.config.log; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/controller/XpVehicleController.java
@@ -144,8 +144,10 @@ String vehiclePictures = xpVehicle.getVehiclePictures(); if(vehiclePictures!=null){ JSONObject jsonObject = JSON.parseObject(vehiclePictures); // 1 String downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); xpVehicle.setVehiclePictures(downloadUrl); jsonObject.put("url", downloadUrl); xpVehicle.setVehiclePictures(jsonObject.toJSONString()); } // 获取车队 xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/service/impl/XpVehicleAnnualRecordServiceImpl.java
@@ -1,6 +1,6 @@ package com.xiaopeng.vehicleConvoy.service.impl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.xiaopeng.api.model.order.XpOrder; @@ -60,13 +60,13 @@ String inspectionAttachments = record.getInspectionAttachments(); if (StringUtils.isNotBlank(inspectionAttachments)) { JSONArray jsonArray = JSONArray.parseArray(inspectionAttachments); ArrayList<String> list = new ArrayList<>(jsonArray.size()); for (Object o : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(o.toString()); JSONObject jsonObject = (JSONObject)o; // 1 String downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); list.add(downloadUrl); jsonObject.put("url", downloadUrl); } record.setInspectionAttachments(String.join(",", list)); record.setInspectionAttachments(JSONArray.toJSONString(jsonArray)); } @@ -76,26 +76,26 @@ String operationQualification = record.getOperationQualification(); if (StringUtils.isNotBlank(operationQualification)) { JSONArray jsonArray = JSONArray.parseArray(operationQualification); ArrayList<String> list = new ArrayList<>(jsonArray.size()); for (Object o : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(o.toString()); JSONObject jsonObject = (JSONObject)o; // 1 String downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); list.add(downloadUrl); jsonObject.put("url", downloadUrl); } record.setOperationQualification(String.join(",", list)); record.setOperationQualification(JSONArray.toJSONString(jsonArray)); } String policyInformation = record.getPolicyInformation(); if (StringUtils.isNotBlank(policyInformation)) { JSONArray jsonArray = JSONArray.parseArray(policyInformation); ArrayList<String> list = new ArrayList<>(jsonArray.size()); for (Object o : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(o.toString()); JSONObject jsonObject = (JSONObject)o; // 1 String downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); list.add(downloadUrl); jsonObject.put("url", downloadUrl); } record.setPolicyInformation(String.join(",", list)); record.setPolicyInformation(JSONArray.toJSONString(jsonArray)); }
