aijinhui
2024-03-26 163942aec6316425d2eeaf93f34f7a8ff627d8b8
lock
已修改2个文件
20 ■■■■■ 文件已修改
ard-work/src/main/java/com/ruoyi/sy/controller/OilWallController.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdAccessFenceServiceImpl.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/sy/controller/OilWallController.java
@@ -37,6 +37,9 @@
    @Autowired
    private ISysConfigService sysConfigService;
    @Autowired
    private ArdSyCarLockService lockService;
    @PostMapping("/add")
    @ApiOperation("添加电子围栏")
    public AjaxResult add(@RequestBody ArdOilWall ardOilWall){
@@ -91,7 +94,11 @@
    @ApiOperation("所有进入围栏的车辆")
    public AjaxResult wallCar(){
        String url  = sysConfigService.selectConfigByKey("minioIn")+"/";
        return AjaxResult.success(ardAccessFenceService.all(url));
        List<ArdAccessFence> list = ardAccessFenceService.all(url);
        for (int i = 0; i < list.size(); i++) {
            list.get(i).setIsLock(lockService.isLock(list.get(i).getCarId()));
        }
        return AjaxResult.success(list);
    }
    @GetMapping("/rollTime")
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdAccessFenceServiceImpl.java
@@ -23,8 +23,6 @@
    private ArdAccessFenceMapper ardAccessFenceMapper;
    @Autowired
    private ArdSyCarMapper carMapper;
    @Autowired
    private ArdSyCarLockService lockService;
    @Override
    public int access(ArdAccessFence ardAccessFence) {
@@ -60,14 +58,7 @@
    @Override
    public List<ArdAccessFence> all(String url) {
        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(ardAccessFence.getCarModel());
            ardAccessFence.setIsLock(lockService.isLock(ardAccessFence.getCarId()));
        }
        return list;
        return ardAccessFenceMapper.selectList(null);
    }
    @Override