zhangnaisong
2024-07-02 6fe3c583389375f1b54f5c260ae8e2604c11f515
电磁锁查询加入分页修改提交
已修改6个文件
47 ■■■■ 文件已修改
ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankWallLockMapper.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/sy/service/IArdTankLockService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockServiceImpl.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallServiceImpl.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/resources/mapper/sy/ArdTankWallLockMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java
@@ -131,13 +131,23 @@
        return toAjax(ardTankLockService.deleteArdTankLockById(id));
    }
    @ApiOperation("查询全部电磁锁")
    /*@ApiOperation("查询全部电磁锁")
    @PreAuthorize("@ss.hasPermi('sy:lock:getAll')")
    @GetMapping("/getAll")
    public Results getAll() {
        String userId = SecurityUtils.getUserId();
        Results result = ardTankLockService.getAll(userId);
        return result;
    }*/
    @ApiOperation("查询全部电磁锁")
    @PreAuthorize("@ss.hasPermi('sy:lock:getAll')")
    @GetMapping("/getAll")
    public TableDataInfo getAll() {
        startPage();
        String userId = SecurityUtils.getUserId();
        List<Map<String,Object>> result = ardTankLockService.getAll(userId);
        return getDataTable(result);
    }
    /**
ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankWallLockMapper.java
@@ -59,9 +59,7 @@
     */
    public int deleteArdTankWallLockByProcessTypes(String[] processTypes);
    /**
     *根据电磁锁主键删除电磁锁
     *
     */
    public int deleteArdTankWallLockByLockId(String lockId);
    public int deleteArdTankWallLockByWallId(String wallId);
}
ard-work/src/main/java/com/ruoyi/sy/service/IArdTankLockService.java
@@ -63,5 +63,6 @@
     */
    public int deleteArdTankLockById(String id);
    public Results getAll(String usersId);
    //public Results getAll(String usersId);
    public List<Map<String,Object>> getAll(String usersId);
}
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockServiceImpl.java
@@ -143,18 +143,19 @@
    }
    @Override
    public Results getAll(String usersId) {
    //public Results List<Map<String,Object>> getAll(String usersId) {
    public List<Map<String,Object>> getAll(String usersId) {
        ArdSyUser ardSyUser = ardSyUserMapper.userById(usersId);
        if(ardSyUser == null){
        /*if(ardSyUser == null){
            return Results.error("没有挂接三一车辆用户");
        }
        }*/
        List<SysConfig> syURLResult = sysConfigMapper.selectByType("syCarPT");
        String syURL = "";
        if(syURLResult.size() != 0){
            syURL = syURLResult.get(0).getConfigValue();
        }else{
        }/*else{
            return Results.error("三一车辆地址未录入");
        }
        }*/
        String passwordMd5 = DigestUtils.md5Hex(ardSyUser.getPassword());
        Map<String, Object> LogInResult = sYClient.logIn(syURL, passwordMd5, ardSyUser.getUserId());
        String sessionId = (String) LogInResult.get("sessionId");
@@ -205,6 +206,7 @@
                }
            }
        }
        return Results.succeed(result0);
        //return Results.succeed(result0);
        return result0;
    }
}
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallServiceImpl.java
@@ -3,6 +3,7 @@
import java.util.List;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.sy.mapper.ArdTankWallLockMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
@@ -24,6 +25,9 @@
public class ArdTankWallServiceImpl implements IArdTankWallService {
    @Resource
    private ArdTankWallMapper ardTankWallMapper;
    @Resource
    private ArdTankWallLockMapper ardTankWallLockMapper;
    /**
     * 查询电磁锁电子围栏
@@ -89,7 +93,11 @@
     */
    @Override
    public int deleteArdTankWallById(String id) {
        try{
        return ardTankWallMapper.deleteArdTankWallById(id);
        } finally {
            ardTankWallLockMapper.deleteArdTankWallLockByWallId(id);
        }
    }
    @Override
ard-work/src/main/resources/mapper/sy/ArdTankWallLockMapper.xml
@@ -69,4 +69,8 @@
    <delete id="deleteArdTankWallLockByLockId" parameterType="java.lang.String">
        delete from ard_tank_wall_lock where lock_id = #{lockId}
    </delete>
    <delete id="deleteArdTankWallLockByWallId" parameterType="java.lang.String">
        delete from ard_tank_wall_lock where wall_id = #{wallId}
    </delete>
</mapper>