zhangnaisong
2024-07-06 9b8bb10acf41929d9fa2750fa069302ad317c8cf
电磁锁车辆查询修改提交
已修改5个文件
30 ■■■■■ 文件已修改
ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankLockMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/sy/service/IArdTankLockService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockServiceImpl.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/resources/mapper/sy/ArdTankLockMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java
@@ -158,11 +158,11 @@
        PageHelper.startPage((Integer) para.get("pageNum"), (Integer) para.get("pageSize"));
        String userId = SecurityUtils.getUserId();
        List<Map<String,Object>> result = ardTankLockService.getAll(userId);
        Map<String,Object> result = ardTankLockService.getAll(userId);
        TableDataInfo dataTable = new TableDataInfo();
        dataTable.setRows(result);
        dataTable.setTotal(result.size());
        dataTable.setRows((List<Map<String,Object>>) result.get("list"));
        dataTable.setTotal((Long) result.get("total"));
        dataTable.setCode(200);
        dataTable.setMsg("查询成功");
        return dataTable;
ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankLockMapper.java
@@ -71,4 +71,6 @@
    public int deleteLockByCarId(String carId);
    public int deleteArdTankLockByIdSet(@Param("idSet") Set<String> idSet);
    public Long selectArdTankLockTotal();
}
ard-work/src/main/java/com/ruoyi/sy/service/IArdTankLockService.java
@@ -63,7 +63,7 @@
    public int deleteArdTankLockById(String id);
    //public Results getAll(String usersId);
    public List<Map<String,Object>> getAll(String usersId);
    public Map<String,Object> getAll(String usersId);
    public Map<String, Object> getLockByCarId(String carId,String usersId);
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockServiceImpl.java
@@ -138,22 +138,23 @@
    @Override
    //public Results List<Map<String,Object>> getAll(String usersId) {
    public List<Map<String,Object>> getAll(String usersId) {
    public Map<String,Object> getAll(String usersId) {
        List<ArdTankLock> ardTankLockList = ardTankLockMapper.getAll();
        ArdSyUser ardSyUser = ardSyUserMapper.userById(usersId);
        if(ardSyUser == null){
            return new ArrayList();
            return new HashMap();
        }
        List<SysConfig> syURLResult = sysConfigMapper.selectByType("syCarPT");
        String syURL = "";
        if(syURLResult.size() != 0){
            syURL = syURLResult.get(0).getConfigValue();
        }else{
            return new ArrayList();
            return new HashMap();
        }
        String passwordMd5 = DigestUtils.md5Hex(ardSyUser.getPassword());
        Map<String, Object> LogInResult = sYClient.logIn(syURL, passwordMd5, ardSyUser.getUserId());
        String sessionId = (String) LogInResult.get("sessionId");
        List<ArdTankLock> ardTankLockList = ardTankLockMapper.getAll();
        //List<ArdTankLock> ardTankLockList = ardTankLockMapper.getAll();
        List<Map<String,Object>> result = new ArrayList();
        for(ArdTankLock ardTankLock : ardTankLockList){
            Map<String,Object> map = new HashMap();
@@ -200,8 +201,11 @@
                }
            }
        }
        //return Results.succeed(result0);
        return result0;
        Long total = ardTankLockMapper.selectArdTankLockTotal();
        Map<String,Object> resultMap = new HashMap();
        resultMap.put("list",result0);
        resultMap.put("total",total);
        return resultMap;
    }
    @Override
ard-work/src/main/resources/mapper/sy/ArdTankLockMapper.xml
@@ -122,4 +122,8 @@
            #{id}
        </foreach>
    </delete>
    <select id="selectArdTankLockTotal" resultType="java.lang.Long">
        select count(distinct atl.car_id) from ard_tank_lock atl
    </select>
</mapper>