Merge remote-tracking branch 'origin/master'

艾金辉

2023-07-22 64c7668818aa8272c0aae206a3c0f7007ca38e5d

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

@@ -21,11 +21,14 @@
import com.ruoyi.system.mapper.SysConfigMapper;
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.utils.httpclient.SYCarClient;
import com.ruoyi.utils.result.Constants;
import com.ruoyi.utils.result.Results;
import io.minio.GetPresignedObjectUrlArgs;
import io.minio.ListObjectsArgs;
import io.minio.PutObjectArgs;
import io.minio.Result;
import io.minio.http.Method;
import io.minio.messages.Contents;
import io.minio.messages.Item;
import org.springframework.stereotype.Service;
import com.ruoyi.sy.mapper.ArdSyCarMapper;
@@ -334,10 +337,26 @@
        }
    }

//    @Override
//    public List<ArdSyCar> getArdSyCarWithRightByCarIdList(List<String> carIdList) {
//        List<ArdSyCar> result = ardSyCarMapper.getArdSyCarWithRightByCarIdList(carIdList);
//        return result;
//    }


    @Override
    public List<ArdSyCar> carListById(String id) {
        return ardSyCarMapper.carListById(id);
    public Results carListById(String id) {
        try {
            List<ArdSyCar> list = ardSyCarMapper.carListById(id);
            if(list.size()>0){
                ArdSyCar ardSyCar = list.get(0);
                return Results.succeed(ardSyCar);
            }else {
                return Results.succeed();
            }
        } catch (Exception e) {
            return Results.error(e.toString());
        }
    }

    @Override