分支自 ard/ruoyi-api
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
‘liusuyi’
2023-08-23 aea81128444acb8ca9a90bc7ef04758bf2cd284d 
 ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java


@@ -1,6 +1,5 @@


package com.ruoyi.sy.service.impl;




import java.awt.geom.Point2D;


import java.io.IOException;


import java.io.InputStream;


import java.text.ParseException;


@@ -24,7 +23,7 @@


import com.ruoyi.sy.mapper.ArdSyCarDayMapper;


import com.ruoyi.utils.tools.GisTool;


import com.ruoyi.utils.websocket.util.WebSocketUtils;


import com.ruoyi.device.hiksdk.config.MinioClientSingleton;


import com.ruoyi.storage.minio.utils.MinioConfig;


import com.ruoyi.storage.minio.utils.MinioUtils;


import com.ruoyi.sy.domain.ArdSyUser;


import com.ruoyi.sy.gps31.PositionContainer;


@@ -83,7 +82,8 @@


    RedisCache redisCache;


    @Resource


    private ArdSyCarDayMapper ardSyCarDayMapper;




    @Resource


    private MinioUtils minioUtil;


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




    private Map<String, Timer> userCarTimerMap = new HashMap();


@@ -147,7 +147,7 @@


                objectNames.add(ardSyCar.getCarPicture().split("/sycar/")[1]);


            }


        }


        MinioUtils.removeObjects("sycar", objectNames);


        minioUtil.removeObjects("sycar", objectNames);


        return ardSyCarMapper.deleteArdSyCarByIds(ids);


    }




@@ -264,12 +264,12 @@




    @Override


    public List<Map<String, String>> getAllCarModel() {


        boolean exsit = MinioUtils.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 = MinioClientSingleton.getMinioClient().listObjects(listObjectsArgs);


               // ListObjectsArgs listObjectsArgs = ListObjectsArgs.builder().prefix("carmodel/").bucket("sycar").build();


                Iterable<Result<Item>> myObjects = minioUtil.getObjectsByBucket("sycar","carmodel");


                for (Result<Item> result : myObjects) {


                    Item item = result.get();


                    Map<String, String> map = new HashMap();


@@ -332,16 +332,16 @@


            if (ardSyCarr.getCarPicture() != null || !ardSyCarr.getCarPicture().equals("")) {


                String objectName = ardSyCarr.getCarPicture().split("/sycar/")[1];


                objectNames.add(objectName);


                MinioUtils.removeObjects("sycar", objectNames);


                minioUtil.removeObjects("sycar", objectNames);


            }


        }


        //判断文件是否为空


        if (null == carPicture || 0 == carPicture.getSize()) {


            return "";


        }


        boolean exsit = MinioUtils.exitsBucket("sycar");


        boolean exsit = minioUtil.exitsBucket("sycar");


        if (!exsit) {


            boolean bucket = MinioUtils.createBucket("sycar");


            boolean bucket = minioUtil.createBucket("sycar");


        }


        //文件名


        String originalFilename = carPicture.getOriginalFilename();


@@ -350,14 +350,15 @@


        try {


            InputStream inputStream = carPicture.getInputStream();


            /*上传对象*/


            PutObjectArgs putObjectArgs = PutObjectArgs


                    .builder()


                    .bucket("sycar")


                    .object(fileName)


                    .stream(inputStream, carPicture.getSize(), -1)


                    .contentType(carPicture.getContentType())


                    .build();


            MinioClientSingleton.getMinioClient().putObject(putObjectArgs);


//            PutObjectArgs putObjectArgs = PutObjectArgs


//                    .builder()


//                    .bucket("sycar")


//                    .object(fileName)


//                    .stream(inputStream, carPicture.getSize(), -1)


//                    .contentType(carPicture.getContentType())


//                    .build();


//            MinioConfig.getMinioClient().putObject(putObjectArgs);


            minioUtil.uploadObject("sycar",fileName,inputStream,carPicture.getSize(),carPicture.getContentType());


            inputStream.close();


            /*获取url*/


            GetPresignedObjectUrlArgs getPresignedObjectUrlArgs = GetPresignedObjectUrlArgs


@@ -366,8 +367,8 @@


                    .object(fileName)


                    .method(Method.GET)


                    .build();


            String presignedObjectUrl = MinioClientSingleton.getMinioClient().getPresignedObjectUrl(getPresignedObjectUrlArgs);


            String ObjectUrl = presignedObjectUrl.substring(0, presignedObjectUrl.indexOf("?"));


            //String presignedObjectUrl = MinioConfig.getMinioClient().getPresignedObjectUrl(getPresignedObjectUrlArgs);


            String ObjectUrl = minioUtil.getBucketObjectUrl("sycar", fileName);


            if (id != null && !id.equals("")) {//id为非必要


                ArdSyCar ardSyCar = new ArdSyCar();


                ardSyCar.setId(id);


@@ -1143,9 +1144,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"));


                Point point = new Point();


                point.setLongitude(lng);


                point.setLatitude(lat);


                Point point = new Point(lng,lat);


                boolean inPolygon = GisTool.isInPolygon(point, partitionLocation);


                if (inPolygon) {


                    carMap.put("longitude", lng);