三一车辆模型url更改提交

zhangnaisong

2023-10-19 2c405f34c9bc32936957e45d1c38c55f5696fa46

 ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java

@@ -17,13 +17,13 @@
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.utils.tools.Point;
import com.ruoyi.utils.gis.GisUtil;
import com.ruoyi.utils.gis.Point;
import com.ruoyi.scheduling.domian.SchedulingParam;
import com.ruoyi.sy.domain.ArdSyCarDay;
import com.ruoyi.sy.mapper.ArdSyCarDayMapper;
import com.ruoyi.utils.tools.GisTool;
import com.ruoyi.utils.minio.MinioUtil;
import com.ruoyi.utils.websocket.util.WebSocketUtils;
import com.ruoyi.storage.minio.utils.MinioUtils;
import com.ruoyi.sy.domain.ArdSyUser;
import com.ruoyi.sy.gps31.PositionContainer;
import com.ruoyi.sy.mapper.ArdSyUserMapper;
@@ -42,6 +42,7 @@
import okhttp3.Response;
import okhttp3.ResponseBody;
import org.apache.commons.codec.digest.DigestUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import com.ruoyi.sy.mapper.ArdSyCarMapper;
import com.ruoyi.sy.domain.ArdSyCar;
@@ -79,8 +80,10 @@
    RedisCache redisCache;
    @Resource
    private ArdSyCarDayMapper ardSyCarDayMapper;
    @Resource
    private MinioUtils minioUtil;

    @Value("${minio.endpoint}")
    private String minioEndpoint;

    private Map<Integer, Map<String, String>> logInMap = new HashMap();

    private Map<String, Timer> userCarTimerMap = new HashMap();
@@ -144,7 +147,7 @@
                objectNames.add(ardSyCar.getCarPicture().split("/sycar/")[1]);
            }
        }
        minioUtil.removeObjects("sycar", objectNames);
        MinioUtil.removeObjects("sycar", objectNames);
        return ardSyCarMapper.deleteArdSyCarByIds(ids);
    }

@@ -261,17 +264,19 @@

    @Override
    public List<Map<String, String>> getAllCarModel() {
        boolean exsit = minioUtil.exitsBucket("sycar");
        boolean exsit = MinioUtil.exitsBucket("sycar");
        if (exsit) {
            List<Map<String, String>> listObjetcName = new ArrayList<>();
            try {
               // ListObjectsArgs listObjectsArgs = ListObjectsArgs.builder().prefix("carmodel/").bucket("sycar").build();
                Iterable<Result<Item>> myObjects = minioUtil.getObjectsByBucket("sycar","carmodel");
                Iterable<Result<Item>> myObjects = MinioUtil.getObjectsByBucket("sycar","carmodel");
                for (Result<Item> result : myObjects) {
                    Item item = result.get();
                    Map<String, String> map = new HashMap();
                    String[] strArr = item.objectName().split("/");
                    map.put("carType", strArr[1]);
                    map.put("carModel", "sycar/" + item.objectName());
                    switch (item.objectName()) {
                    /*switch (item.objectName()) {
                        case "carmodel/aodi.glb":
                            map.put("carType", "奥迪");
                            break;
@@ -310,11 +315,12 @@
                            break;
                        default:
                            break;
                    }
                    }*/
                    listObjetcName.add(map);
                }
                return listObjetcName;
            } catch (Exception ex) {
                ex.printStackTrace();
                //log.error("minio获取桶下对象异常：" + ex.getMessage());
            }
        }
@@ -329,16 +335,16 @@
            if (ardSyCarr.getCarPicture() != null || !ardSyCarr.getCarPicture().equals("")) {
                String objectName = ardSyCarr.getCarPicture().split("/sycar/")[1];
                objectNames.add(objectName);
                minioUtil.removeObjects("sycar", objectNames);
                MinioUtil.removeObjects("sycar", objectNames);
            }
        }
        //判断文件是否为空
        if (null == carPicture || 0 == carPicture.getSize()) {
            return "";
        }
        boolean exsit = minioUtil.exitsBucket("sycar");
        boolean exsit = MinioUtil.exitsBucket("sycar");
        if (!exsit) {
            boolean bucket = minioUtil.createBucket("sycar");
            boolean bucket = MinioUtil.createBucket("sycar");
        }
        //文件名
        String originalFilename = carPicture.getOriginalFilename();
@@ -355,7 +361,7 @@
//                    .contentType(carPicture.getContentType())
//                    .build();
//            MinioConfig.getMinioClient().putObject(putObjectArgs);
            minioUtil.uploadObject("sycar",fileName,inputStream,carPicture.getSize(),carPicture.getContentType());
            MinioUtil.uploadObject("sycar",fileName,inputStream,carPicture.getSize(),carPicture.getContentType());
            inputStream.close();
            /*获取url*/
            GetPresignedObjectUrlArgs getPresignedObjectUrlArgs = GetPresignedObjectUrlArgs
@@ -365,7 +371,7 @@
                    .method(Method.GET)
                    .build();
            //String presignedObjectUrl = MinioConfig.getMinioClient().getPresignedObjectUrl(getPresignedObjectUrlArgs);
            String ObjectUrl = minioUtil.getBucketObjectUrl("sycar", fileName);
            String ObjectUrl = MinioUtil.getBucketObjectUrl("sycar", fileName);
            if (id != null && !id.equals("")) {//id为非必要
                ArdSyCar ardSyCar = new ArdSyCar();
                ardSyCar.setId(id);
@@ -406,8 +412,9 @@
        if (result != null) {
            if (result.get("carPicture") != null) {
                if (!((String) result.get("carPicture")).equals("")) {
                    String url = ((String) result.get("carPicture")).split("sycar")[0];
                    String carModel = url + (String) result.get("carModel");
                    /*String url = ((String) result.get("carPicture")).split("sycar")[0];
                    String carModel = url + (String) result.get("carModel");*/
                    String carModel = this.minioEndpoint + "/" + (String) result.get("carModel");
                    result.put("carModel", carModel);
                }
            }
@@ -618,13 +625,13 @@
            for (int i = 0; i < carList.size(); i++) {
                ArdSyCar ardSyCar = carList.get(i);
                if (carId.equals(ardSyCar.getCarId())) {
                    String url = "";
                    /*String url = "";
                    if (ardSyCar.getCarPicture() != null) {
                        if (!ardSyCar.getCarPicture().equals("")) {
                            url = ardSyCar.getCarPicture().split("sycar")[0];
                        }
                    }
                    m.put("carModel", url + ardSyCar.getCarModel());//zns
                    }*/
                    m.put("carModel", this.minioEndpoint + "/" + ardSyCar.getCarModel());//zns
                    //m.put("carModel",ardSyCar.getCarModel());
                    m.put("carTypeArd", ardSyCar.getCarType());
                    m.put("carBrand", ardSyCar.getCarBrand());
@@ -1083,7 +1090,7 @@
            List<Map<String, Object>> carGPSMap = (List<Map<String, Object>>) carGPSTrack.get("list");
            Double lng = Double.valueOf((String) carGPSMap.get(0).get("lng"));
            Double lat = Double.valueOf((String) carGPSMap.get(0).get("lat"));
            double distance = GisTool.getDistance( new double[]{longitude,latitude}, new double[]{lng, lat});
            double distance = GisUtil.getDistance( new double[]{longitude,latitude}, new double[]{lng, lat});
            if (distance <= radius) {
                carMap.put("longitude",lng);
                carMap.put("latitude",lat);
@@ -1142,7 +1149,7 @@
                Double lng = Double.valueOf((String) carGPSMap.get(0).get("lng"));
                Double lat = Double.valueOf((String) carGPSMap.get(0).get("lat"));
                Point point = new Point(lng,lat);
                boolean inPolygon = GisTool.isInPolygon(point, partitionLocation);
                boolean inPolygon = GisUtil.isInPolygon(point, partitionLocation);
                if (inPolygon) {
                    carMap.put("longitude", lng);
                    carMap.put("latitude", lat);