zhangnaisong
2024-07-06 775524110885e27fe860be1feb156ca78b5040b2
电子围栏分页查询修改提交
已修改5个文件
28 ■■■■ 文件已修改
ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankWallMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/sy/service/IArdTankWallService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallServiceImpl.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/resources/mapper/sy/ArdTankWallMapper.xml 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java
@@ -250,11 +250,11 @@
        PageHelper.startPage((Integer) para.get("pageNum"), (Integer) para.get("pageSize"));
        ArdTankWall ardTankWall = new ArdTankWall();
        ardTankWall.setWallName((String) para.get("wallName"));
        List<ArdTankWall> list = ardTankWallService.selectArdTankWallList(ardTankWall);
        Map<String,Object> result = ardTankWallService.selectArdTankWallList(ardTankWall);
        TableDataInfo dataTable = new TableDataInfo();
        dataTable.setRows(list);
        dataTable.setTotal(list.size());
        dataTable.setRows((List<ArdTankWall>) 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/ArdTankWallMapper.java
@@ -64,4 +64,6 @@
    public List<ArdTankWall> getAllArdTankWall();
    public List<Map<String,String>> getArdTankWallByLockId(String id);
    public Long selectArdTankWallTotal(String wallName);
}
ard-work/src/main/java/com/ruoyi/sy/service/IArdTankWallService.java
@@ -27,7 +27,7 @@
     * @param ardTankWall 电磁锁电子围栏
     * @return 电磁锁电子围栏集合
     */
    public List<ArdTankWall> selectArdTankWallList(ArdTankWall ardTankWall);
    public Map<String,Object> selectArdTankWallList(ArdTankWall ardTankWall);
    /**
     * 新增电磁锁电子围栏
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallServiceImpl.java
@@ -1,5 +1,6 @@
package com.ruoyi.sy.service.impl;
import java.util.HashMap;
import java.util.List;
import com.ruoyi.common.utils.uuid.IdUtils;
@@ -49,8 +50,14 @@
     * @return 电磁锁电子围栏
     */
    @Override
    public List<ArdTankWall> selectArdTankWallList(ArdTankWall ardTankWall) {
        return ardTankWallMapper.selectArdTankWallList(ardTankWall);
    public Map<String,Object> selectArdTankWallList(ArdTankWall ardTankWall) {
        List<ArdTankWall> result = ardTankWallMapper.selectArdTankWallList(ardTankWall);
        Long total = ardTankWallMapper.selectArdTankWallTotal(ardTankWall.getWallName());
        Map<String,Object> resultMap = new HashMap();
        resultMap.put("list",result);
        resultMap.put("total",total);
        return resultMap;
        //return ardTankWallMapper.selectArdTankWallList(ardTankWall);
    }
    /**
ard-work/src/main/resources/mapper/sy/ArdTankWallMapper.xml
@@ -74,4 +74,11 @@
        inner join ard_tank_wall atw on atwl.wall_id = atw.id
        where atwl.lock_id = #{id}
    </select>
    <select id="selectArdTankWallTotal" parameterType="java.lang.String" resultType="java.lang.Long">
        select count(*) from ard_tank_wall atw
        <where>
            <if test="wallName != null  and wallName != ''"> and wall_name like '%'||#{wallName}||'%'</if>
        </where>
    </select>
</mapper>