林武泰/新增分页搜索接口

lab-admin/src/main/java/com/ruoyi/asset/controller/TbAssetController.java

@@ -3,6 +3,7 @@ package com.ruoyi.asset.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.asset.domain.dto.TbAssetDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -139,13 +140,33 @@ public class TbAssetController extends BaseController
     @ApiOperation("小程序：获取资产信息")
     @PreAuthorize("@ss.hasPermi('asset:asset:query')")
     @GetMapping(value = "/search")
-    public TableDataInfo selectTbAssetByBarCode(
+    public AjaxResult  selectTbAssetByBarCode(
             @RequestParam(value = "barCode", required = false) String barCode,
             @RequestParam(value = "numberOrName", required = false) String numberOrName
     ) {
-        startPage();
         List<TbAssetDTO> tbAssetDTOS = tbAssetService.selectTbAsset(barCode, numberOrName);
-        return getDataTable(tbAssetDTOS);
+        if (barCode != null) {
+            if (tbAssetDTOS.isEmpty()) {
+                return AjaxResult.success("查询成功", new TbAsset());
+            }
+            return AjaxResult.success(tbAssetDTOS.get(0));
+        }
+        return AjaxResult.success(tbAssetDTOS);
+    }
+
+    /**
+     * 小程序：获取资产信息
+     */
+    @ApiOperation("小程序：获取资产信息")
+    @PreAuthorize("@ss.hasPermi('asset:asset:query')")
+    @GetMapping(value = "/search/list/{pageNum}/{pageSize}")
+    public AjaxResult  selectTbAssetByBarCode(
+            @PathVariable("pageNum") Integer pageNum,
+            @PathVariable("pageSize") Integer pageSize,
+            @RequestParam(value = "numberOrName", required = false) String numberOrName
+    ) {
+        Page<TbAssetDTO> tbAssetDTOPage = tbAssetService.selectTbAssetPage(pageNum, pageSize, numberOrName);
+        return AjaxResult.success(tbAssetDTOPage);
     }
 
     /**

lab-admin/src/main/java/com/ruoyi/asset/service/ITbAssetService.java

@@ -2,6 +2,7 @@ package com.ruoyi.asset.service;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.asset.domain.TbAsset;
 import com.ruoyi.asset.domain.dto.TbAssetDTO;
@@ -90,6 +91,16 @@ public interface ITbAssetService extends IService<TbAsset>
     List<TbAssetDTO> selectTbAsset(String barCode, String numberOrName);
 
     /**
+     * 分页查询资产信息
+     *
+     * @param pageNum 页码
+     * @param pageSize 数量
+     * @param numberOrName 关键词
+     * @return 资产信息列表
+     */
+    Page<TbAssetDTO> selectTbAssetPage(Integer pageNum, Integer pageSize, String numberOrName);
+
+    /**
      * 资产信息统计
      *
      * @return 结果

lab-admin/src/main/java/com/ruoyi/asset/service/impl/TbAssetServiceImpl.java

@@ -6,6 +6,8 @@ import java.util.stream.Collectors;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.conditions.query.QueryChainWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.asset.domain.TbAssetBorrowRecord;
 import com.ruoyi.asset.domain.TbAssetCategory;
@@ -185,7 +187,6 @@ public class TbAssetServiceImpl extends ServiceImpl<TbAssetMapper, TbAsset> impl
      */
     @Override
     public List<TbAssetDTO> selectTbAsset(String barCode, String numberOrName) {
-        List<SysDept> deptList = sysDeptMapper.allDept();
         if (StrUtil.isBlank(barCode) && StrUtil.isBlank(numberOrName)) {
             return Collections.emptyList();
         }
@@ -203,6 +204,69 @@ public class TbAssetServiceImpl extends ServiceImpl<TbAssetMapper, TbAsset> impl
             return Collections.emptyList();
         }
 
+        return find(assetList);
+    }
+
+    @Override
+    public Page<TbAssetDTO> selectTbAssetPage(Integer pageNum, Integer pageSize, String numberOrName) {
+
+        Page<TbAsset> tbAssetPage = new Page<>(pageNum, pageSize);
+
+        QueryWrapper<TbAsset> queryWrapper = null;
+
+        if (StrUtil.isNotBlank(numberOrName)) {
+            queryWrapper = new QueryWrapper<>();
+            queryWrapper.like("bar_code", numberOrName).or().like("number", numberOrName).or().like("name", numberOrName);
+        }
+
+        page(tbAssetPage, queryWrapper);
+
+        List<TbAsset> assetList = tbAssetPage.getRecords();
+
+
+        assetList = assetList.stream().filter(Objects::nonNull).collect(Collectors.toList());
+
+        if (assetList.isEmpty()) {
+            Page<TbAssetDTO> dtoPage = new Page<>();
+            dtoPage.setRecords(Collections.emptyList());
+            dtoPage.setTotal(tbAssetPage.getTotal());
+            dtoPage.setCurrent(tbAssetPage.getCurrent());
+            dtoPage.setPages(tbAssetPage.getPages());
+            dtoPage.setSize(tbAssetPage.getSize());
+
+            return dtoPage;
+        }
+
+        ArrayList<TbAssetDTO> assetDTOS = find(assetList);
+
+        Page<TbAssetDTO> dtoPage = new Page<>();
+        dtoPage.setRecords(assetDTOS);
+        dtoPage.setTotal(tbAssetPage.getTotal());
+        dtoPage.setCurrent(tbAssetPage.getCurrent());
+        dtoPage.setPages(tbAssetPage.getPages());
+        dtoPage.setSize(tbAssetPage.getSize());
+
+        return dtoPage;
+    }
+
+    @Override
+    public AjaxResult countTbAsset() {
+        int allAsset = tbAssetMapper.countTbAssetAll();
+        int faultAsset = tbAssetMapper.countTbAssetByStatus(TbAssetStatusEnum.fault.getStatusCode());
+        int scrapAsset = tbAssetMapper.countTbAssetByStatus(TbAssetStatusEnum.scrap.getStatusCode());
+        int borrowAsset = tbAssetBorrowRecordMapper.countTbAssetBorrowRecordForNotReturn();
+
+        Map<String, Integer> resultMap = new HashMap<>();
+        resultMap.put("allAsset", allAsset); // 全部设备
+        resultMap.put("faultAsset", faultAsset); // 故障设备
+        resultMap.put("scrapAsset", scrapAsset); // 报废设备
+        resultMap.put("borrowAsset", borrowAsset); // 借出设备
+        return AjaxResult.success("查询成功", resultMap);
+    }
+
+    private ArrayList<TbAssetDTO> find(List<TbAsset> assetList) {
+        List<SysDept> deptList = sysDeptMapper.allDept();
+
         Long loginUserId = UserUtils.getLoginUserId();
 
         ArrayList<TbAssetDTO> assetDTOList = new ArrayList<>();
@@ -229,12 +293,7 @@ public class TbAssetServiceImpl extends ServiceImpl<TbAssetMapper, TbAsset> impl
                 assetDTOList.add(tbAssetDTO);
                 continue;
             }
-//            Long isReturn = borrowRecord.getIsreturn();
-//            if (isReturn > 0) {
-//                tbAssetDTO.setBorrowStatus("可借出");
-//                assetDTOList.add(tbAssetDTO);
-//                continue;
-//            }
+
             tbAssetDTO.setBorrowStatus("已借出");
             Long userId = borrowRecord.getUserId();
             SysUser sysUser = sysUserMapper.selectUserById(userId);
@@ -247,22 +306,6 @@ public class TbAssetServiceImpl extends ServiceImpl<TbAssetMapper, TbAsset> impl
             assetDTOList.add(tbAssetDTO);
         }
 
-
         return assetDTOList;
     }
-
-    @Override
-    public AjaxResult countTbAsset() {
-        int allAsset = tbAssetMapper.countTbAssetAll();
-        int faultAsset = tbAssetMapper.countTbAssetByStatus(TbAssetStatusEnum.fault.getStatusCode());
-        int scrapAsset = tbAssetMapper.countTbAssetByStatus(TbAssetStatusEnum.scrap.getStatusCode());
-        int borrowAsset = tbAssetBorrowRecordMapper.countTbAssetBorrowRecordForNotReturn();
-
-        Map<String, Integer> resultMap = new HashMap<>();
-        resultMap.put("allAsset", allAsset); // 全部设备
-        resultMap.put("faultAsset", faultAsset); // 故障设备
-        resultMap.put("scrapAsset", scrapAsset); // 报废设备
-        resultMap.put("borrowAsset", borrowAsset); // 借出设备
-        return AjaxResult.success("查询成功", resultMap);
-    }
 }

lab-admin/src/main/resources/application.yml

@@ -74,7 +74,7 @@ spring:
     # 端口，默认为6379
     port: 6379
     # 数据库索引
-    database: 0
+    database: 1
     # 密码
     password: foobared
     # 连接超时时间