添加车辆实时轨迹接口

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;
+
 }

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;
+
 }

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;
+
     /**
      * 车辆类型
      */

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<VehVehicleInfoMapper,
     @Lazy
     private IVehVehicleTripService vehVehicleTripService;
 
+    @Autowired
+    @Lazy
+    private ISysOssService ossService;
+
     /**
      * 查询车辆信息
      *
@@ -168,10 +175,24 @@ public class VehVehicleInfoServiceImpl extends ServiceImpl<VehVehicleInfoMapper,
      * @return 是否删除成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
+        List<VehVehicleInfoVo> vehVehicleInfoVos = baseMapper.selectVoByIds(ids);
+        for (VehVehicleInfoVo v : vehVehicleInfoVos) {
+            if (StringUtils.isNotBlank(v.getFileIds())) {
+                String[] split = v.getFileIds().split(",");
+                List<Long> fileIds = Arrays.stream(split).map(Long::parseLong).toList();
+                ossService.deleteWithValidByIds(fileIds,false);
+            }
+            if (StringUtils.isNotBlank(v.getVehicleIcon())) {
+                String[] split = v.getVehicleIcon().split(",");
+                List<Long> fileIds = Arrays.stream(split).map(Long::parseLong).toList();
+                ossService.deleteWithValidByIds(fileIds,false);
+            }
+        }
         return baseMapper.deleteByIds(ids) > 0;
     }