From 1c0be9b5ee11b6cacd80e1238f004b4c1ae29788 Mon Sep 17 00:00:00 2001 From: dfdg <2710245601@qq.com> Date: Mon, 17 Nov 2025 20:13:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BD=A6=E8=BE=86=E5=AE=9E?= =?UTF-8?q?=E6=97=B6=E8=BD=A8=E8=BF=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vehicle/domain/VehVehicleInfo.java | 5 +++++ .../vehicle/domain/bo/VehVehicleInfoBo.java | 5 +++++ .../vehicle/domain/vo/VehVehicleInfoVo.java | 5 +++++ .../impl/VehVehicleInfoServiceImpl.java | 21 +++++++++++++++++++ 4 files changed, 36 insertions(+) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/domain/VehVehicleInfo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/domain/VehVehicleInfo.java index a320b257..9c382a45 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/domain/VehVehicleInfo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/domain/VehVehicleInfo.java @@ -150,4 +150,9 @@ public class VehVehicleInfo extends BaseEntity { */ private String clientId; + /** + * 车辆图片id + */ + private String vehicleIcon; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/domain/bo/VehVehicleInfoBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/domain/bo/VehVehicleInfoBo.java index 3f8cf368..e3905951 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/domain/bo/VehVehicleInfoBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/domain/bo/VehVehicleInfoBo.java @@ -159,4 +159,9 @@ public class VehVehicleInfoBo extends BaseEntity { */ private String clientId; + /** + * 车辆图片id + */ + private String vehicleIcon; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/domain/vo/VehVehicleInfoVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/domain/vo/VehVehicleInfoVo.java index a8d4a6d7..3a206733 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/domain/vo/VehVehicleInfoVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/domain/vo/VehVehicleInfoVo.java @@ -52,6 +52,11 @@ public class VehVehicleInfoVo implements Serializable { @ExcelProperty(value = "车辆品牌") private String vehicleBrand; + /** + * 车辆图片id + */ + private String vehicleIcon; + /** * 车辆类型 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/service/impl/VehVehicleInfoServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/service/impl/VehVehicleInfoServiceImpl.java index f60604ea..60ecddb2 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/service/impl/VehVehicleInfoServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/service/impl/VehVehicleInfoServiceImpl.java @@ -2,6 +2,7 @@ package org.dromara.vehicle.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -16,6 +17,7 @@ import org.dromara.gps.domain.GpsEquipment; import org.dromara.gps.domain.GpsManmachine; import org.dromara.gps.service.IGpsEquipmentService; import org.dromara.gps.service.IGpsManmachineService; +import org.dromara.system.service.ISysOssService; import org.dromara.vehicle.domain.VehVehicleInfo; import org.dromara.vehicle.domain.bo.VehVehicleInfoBo; import org.dromara.vehicle.domain.enums.VehVehicleInfoStatusEnum; @@ -29,6 +31,7 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.Map; @@ -57,6 +60,10 @@ public class VehVehicleInfoServiceImpl extends ServiceImpl ids, Boolean isValid) { if (isValid) { //TODO 做一些业务上的校验,判断是否需要校验 } + List vehVehicleInfoVos = baseMapper.selectVoByIds(ids); + for (VehVehicleInfoVo v : vehVehicleInfoVos) { + if (StringUtils.isNotBlank(v.getFileIds())) { + String[] split = v.getFileIds().split(","); + List fileIds = Arrays.stream(split).map(Long::parseLong).toList(); + ossService.deleteWithValidByIds(fileIds,false); + } + if (StringUtils.isNotBlank(v.getVehicleIcon())) { + String[] split = v.getVehicleIcon().split(","); + List fileIds = Arrays.stream(split).map(Long::parseLong).toList(); + ossService.deleteWithValidByIds(fileIds,false); + } + } return baseMapper.deleteByIds(ids) > 0; }