Merge remote-tracking branch 'origin/dev' into dev

aijinhui

2024-03-26 493caef7413992d0215b9c2e2bcedd30471d89e7

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

@@ -4,9 +4,11 @@
import com.ruoyi.sy.domain.ArdAccessFence;
import com.ruoyi.sy.domain.ArdSyCar;
import com.ruoyi.sy.mapper.ArdAccessFenceMapper;
import com.ruoyi.sy.mapper.ArdSyCarLockMapper;
import com.ruoyi.sy.mapper.ArdSyCarMapper;
import com.ruoyi.sy.param.OilWallParam;
import com.ruoyi.sy.service.ArdAccessFenceService;
import com.ruoyi.sy.service.ArdSyCarLockService;
import com.ruoyi.sy.vo.CarVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -21,6 +23,8 @@
    private ArdAccessFenceMapper ardAccessFenceMapper;
    @Autowired
    private ArdSyCarMapper carMapper;
    @Autowired
    private ArdSyCarLockService lockService;

    @Override
    public int access(ArdAccessFence ardAccessFence) {
@@ -59,7 +63,9 @@
        List<ArdAccessFence> list = ardAccessFenceMapper.selectList(null);
        for (int i = 0; i < list.size(); i++) {
            ArdAccessFence ardAccessFence = list.get(i);
            ardAccessFence.setCarModel(url+ardAccessFence.getCarModel());
//            ardAccessFence.setCarModel(url+ardAccessFence.getCarModel());
            ardAccessFence.setCarModel(ardAccessFence.getCarModel());
            ardAccessFence.setIsLock(lockService.isLock(ardAccessFence.getCarId()));
        }
        return list;
    }