aijinhui
2024-01-12 ddb23d4fa6d666ef51db3cd8e4f0f6cab7a1fe78

已修改3个文件
12 ■■■■■ 文件已修改
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/sy/service/ArdSyCarLockService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java
@@ -217,7 +217,7 @@
    @GetMapping("/lockIng")
    @ApiOperation("实时锁状态")
    public AjaxResult lockIng(String carId)  {
        return AjaxResult.success(ardSyCarLockService.lockIng(carId));
        return ardSyCarLockService.lockIng(carId);
    }
ard-work/src/main/java/com/ruoyi/sy/service/ArdSyCarLockService.java
@@ -51,6 +51,6 @@
    AjaxResult onOff(LockTypeParam lockTypeParam) throws MqttException;
    List<ArdSyCarLock> lockIng(String carId);
    AjaxResult lockIng(String carId);
}
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java
@@ -387,10 +387,11 @@
    }
    @Override
    public List<ArdSyCarLock> lockIng(String carId) {
    public AjaxResult lockIng(String carId) {
        QueryWrapper<ArdSyCarRtu> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("car_id",carId);
        ArdSyCarRtu ardSyCarRtu = rtuMapper.selectOne(queryWrapper);
        if(ardSyCarRtu!=null){
        List<ArdSyCarLock> locks = lockMapper.lockList(ardSyCarRtu.getId());
        for (int i = 0; i < locks.size(); i++) {
            ArdSyCarLock ardSyCarLock = locks.get(i);
@@ -398,7 +399,10 @@
            int d = (int) ((int)(info*150/138.3 - 4)/0.16);
            ardSyCarLock.setCurrentInfo((double) d);
        }
        return locks;
            return AjaxResult.success(locks);
        }else {
            return AjaxResult.error("无该车的锁数据!");
        }
    }