清淤

aijinhui

2023-11-02 d4c8d478007e72916a92516c42338ed0d9a84f58

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

@@ -17,6 +17,7 @@
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.sy.domain.ArdAccessFence;
import com.ruoyi.utils.gis.GisUtil;
import com.ruoyi.utils.gis.Point;
import com.ruoyi.scheduling.domian.SchedulingParam;
@@ -42,6 +43,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,6 +81,9 @@
    RedisCache redisCache;
    @Resource
    private ArdSyCarDayMapper ardSyCarDayMapper;

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

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

@@ -269,8 +274,10 @@
                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;
@@ -309,11 +316,12 @@
                            break;
                        default:
                            break;
                    }
                    }*/
                    listObjetcName.add(map);
                }
                return listObjetcName;
            } catch (Exception ex) {
                ex.printStackTrace();
                //log.error("minio获取桶下对象异常：" + ex.getMessage());
            }
        }
@@ -405,8 +413,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);
                }
            }
@@ -617,13 +626,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());
@@ -784,6 +793,18 @@
        Map<String, Object> result0 = new HashMap();
        result0 = sYClient.getCarNearPositionByCarId(syURL, carId, result.get("userId"), result.get("sessionId"));
        return Results.succeed(result0);
    }

    @Override
    public Map<String, Object> getCarPicture(String carId, String syURL, ArdSyUser ardSyUser) {
        //31用户名密码
        String username31 = ardSyUser.getUserId();
        String password31 = ardSyUser.getPassword();
        String passwordMd5 = DigestUtils.md5Hex(password31);
        Map<String, Object> result1 = sYClient.logIn(syURL, passwordMd5, username31);
        Map<String, Object> result0 = new HashMap();
        result0 = sYClient.getCarPicture(syURL, carId, (String) result1.get("sessionId"));
        return result0;
    }

    @Override
@@ -1155,4 +1176,12 @@
        }
        return filteredList;
    }

    @Override
    public List<ArdSyCar> all() {
        QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
        queryWrapper.ne("reserved_1","");
        return ardSyCarMapper.selectList(queryWrapper);
    }

}