update

liujie

2026-03-19 77d130ca8b5925ee1772c24b61c13aeedbef69bc

update

 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-common/xp-common-redis/pom.xml

@@ -32,18 +32,18 @@
        <dependency>
            <groupId>org.redisson</groupId>
            <artifactId>redisson-spring-boot-starter</artifactId>
            <version>3.19.3</version>
            <exclusions>
                <exclusion>
                    <groupId>org.redisson</groupId>
                    <artifactId>redisson-spring-data-30</artifactId>
                </exclusion>
            </exclusions>
            <version>3.17.7</version>
<!--            <exclusions>-->
<!--                <exclusion>-->
<!--                    <groupId>org.redisson</groupId>-->
<!--                    <artifactId>redisson-spring-data-30</artifactId>-->
<!--                </exclusion>-->
<!--            </exclusions>-->
        </dependency>
        <dependency>
            <groupId>org.redisson</groupId>
            <artifactId>redisson-spring-data-27</artifactId>
            <version>3.19.3</version>
        </dependency>
<!--        <dependency>-->
<!--            <groupId>org.redisson</groupId>-->
<!--            <artifactId>redisson-spring-data-27</artifactId>-->
<!--            <version>3.19.3</version>-->
<!--        </dependency>-->
    </dependencies>
</project>

 xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleDetectionController.java

@@ -216,28 +216,28 @@
            String vehiclePictures = xpVehicleDetectionVO.getVehiclePictures();
            if (vehiclePictures != null && !vehiclePictures.isEmpty()) {
                JSONObject jsonObject = JSONObject.parseObject(vehiclePictures);
                // 2
                // 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());
                    String downloadUrl = null;
                    try {
                        // 2
                        // 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));
            }



 xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleOperationsController.java

@@ -157,9 +157,10 @@
            String vehiclePictures = record.getVehiclePictures();
            if (StringUtils.isNotBlank(vehiclePictures)) {
                JSONObject jsonObject = JSONObject.parseObject(vehiclePictures);
                // 2
                // 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/XpVehicleRepairController.java

@@ -106,19 +106,18 @@
        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());
                String downloadUrl = null;
                try {
                    // 2
                    // 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));
        }



 xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpWorkOrderController.java

@@ -85,19 +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());
                    String downloadUrl = null;
                    try {
                        // 2
                        // 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

@@ -252,19 +252,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());
                        String downloadUrl = null;
                        try {
                            // 2
                            // 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));
                }


@@ -272,19 +271,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());
                        String downloadUrl = null;
                        try {
                            // 2
                            // 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));
                }



 xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpTaskServiceImpl.java

@@ -436,14 +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());
                // 2
                // 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);
@@ -538,14 +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());
                // 2
                // 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));
        }


@@ -692,19 +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());
                    String downloadUrl = null;
                    try {
                        // 2
                        // 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());
@@ -837,19 +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());
                    String downloadUrl = null;
                    try {
                        // 2
                        // 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));
            }


@@ -859,19 +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());
                    String downloadUrl = null;
                    try {
                        // 2
                        // 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));
            }


@@ -884,19 +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());
                    String downloadUrl = null;
                    try {
                        // 2
                        // 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());
@@ -906,19 +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());
                    String downloadUrl = null;
                    try {
                        // 2
                        // 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());
@@ -927,19 +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());
                    String downloadUrl = null;
                    try {
                        // 2
                        // 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());
@@ -1035,14 +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());
                    // 2
                    // 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());
@@ -1259,19 +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());
                    String downloadUrl = null;
                    try {
                        // 2
                        // 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));
            }

        }
@@ -1585,9 +1575,10 @@

                    if(vehicle.getVehiclePictures()!=null){
                        JSONObject jsonObject = JSONObject.parseObject(vehicle.getVehiclePictures());
                        // 2
                        // 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());
@@ -1606,19 +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());
                                String downloadUrl = null;
                                try {
                                    // 2
                                    // 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));
                        }


@@ -1629,19 +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());
                                String downloadUrl = null;
                                try {
                                    // 2
                                    // 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());
@@ -1650,19 +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());
                                String downloadUrl = null;
                                try {
                                    // 2
                                    // 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());
@@ -1671,19 +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());
                                String downloadUrl = null;
                                try {
                                    // 2
                                    // 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));
                        }


@@ -1693,19 +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());
                                String downloadUrl = null;
                                try {
                                    // 2
                                    // 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

@@ -196,19 +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());
                        String downloadUrl = null;
                        try {
                            // 2
                            // 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));
                }



 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpBannerManagementController.java

@@ -62,12 +62,13 @@
        JSONObject jsonObject = JSON.parseArray(xpBanner.getBannerPictures()).getJSONObject(0);
        String downloadUrl = null;
        try {
            // 2
            // 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/XpBannerServiceImpl.java

@@ -53,12 +53,13 @@
                JSONObject jsonObject = JSON.parseArray(item.getBannerPictures()).getJSONObject(0);
                String downloadUrl = null;
                try {
                    // 2
                    // 1
                    downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
                } catch (UnsupportedEncodingException e) {
                    throw new RuntimeException(e);
                }
                vo.setImageUrl(downloadUrl);
                jsonObject.put("url", downloadUrl);
                vo.setImageUrl(jsonObject.toJSONString());
                return vo;
            }).collect(Collectors.toList());
        }
@@ -73,12 +74,13 @@
            JSONObject jsonObject = JSON.parseArray(xpBanner.getBannerPictures()).getJSONObject(0);
            String downloadUrl = null;
            try {
                // 2
                // 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());
        }
        pageInfo.setRecords(list);
        return pageInfo;

 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpRideGuideServiceImpl.java

@@ -66,7 +66,7 @@
            JSONObject jsonObject = JSON.parseObject(xpRideGuide.getGuideImage());
            String downloadUrl = null;
            try {
                // 2
                // 1
                downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
            } catch (UnsupportedEncodingException e) {
                throw new RuntimeException(e);

 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpUserFeedbackServiceImpl.java

@@ -84,19 +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());
                    String downloadUrl = null;
                    try {
                        // 2
                        // 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-vehicle-convoy-boot/pom.xml

@@ -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/controller/XpVehicleController.java

@@ -144,9 +144,10 @@
            String vehiclePictures = xpVehicle.getVehiclePictures();
            if(vehiclePictures!=null){
                JSONObject jsonObject = JSON.parseObject(vehiclePictures);
                // 2
                // 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

@@ -60,14 +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());
                    // 2
                    // 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));
            }


@@ -77,14 +76,13 @@
            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());
                    // 2
                    // 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));
            }