设备管理列表分页查询

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/mapper/EquipmentMapper.java

 package com.yeejoin.amos.boot.module.ugp.api.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.module.ugp.api.dto.CompanyDto;
 import com.yeejoin.amos.boot.module.ugp.api.dto.EquipmentDto;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Company;
@@ -17,6 +18,6 @@ import java.util.List;
  */
 @Mapper
 public interface EquipmentMapper extends BaseMapper<Equipment> {
-    List<EquipmentDto> queryEquipmentPage(Equipment equipmentParam);
+    IPage<EquipmentDto> queryEquipmentPage(IPage<EquipmentDto> page, Equipment equipment);
 
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/service/IEquipmentService.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.ugp.api.service;
 
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.ugp.api.dto.EquipmentDto;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Equipment;
@@ -19,7 +20,7 @@ import java.util.List;
 public interface IEquipmentService {
     //添加设备+附件
     EquipmentDto saveEI(JSONObject object);
-    Page<EquipmentDto> queryEquipmentPage(int current, int size, Equipment equipment);
+    IPage<EquipmentDto> queryEquipmentPage(IPage<EquipmentDto> page,Equipment equipment);
 
 
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/EquipmentMapper.xml

@@ -5,14 +5,14 @@
     <select id="queryEquipmentPage"  resultType="com.yeejoin.amos.boot.module.ugp.api.entity.Equipment">
         select * from tz_ugp_equipment
         <where>
-            <if test="name != '' and name != null">
-                and `name` like concat('%',#{name},'%')
+            <if test="equipment.name != '' and equipment.name != null">
+                and `name` like concat('%',#{equipment.name},'%')
             </if>
-            <if test="code != '' and code != null">
-                and `code` like concat('%',#{code},'%')
+            <if test="equipment.code != '' and equipment.code != null">
+                and `code` like concat('%',#{equipment.code},'%')
             </if>
-            <if test="verifyStatus != '' and verifyStatus != null">
-                and `verify_status` like concat('%',#{verifyStatus},'%')
+            <if test="equipment.verifyStatus != '' and equipment.verifyStatus != null">
+                and `verify_status` like concat('%',#{equipment.verifyStatus},'%')
             </if>
         </where>
     </select>

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/EquipmentController.java

@@ -128,10 +128,13 @@ public class EquipmentController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "设备信息表分页查询",  notes = "设备信息表分页查询")
-	public ResponseModel<Page<EquipmentDto>> queryForPage(
+	public ResponseModel<IPage<EquipmentDto>> queryForPage(
 			@RequestParam(value = "current") int current,
 			@RequestParam(value = "size") int size, Equipment equipment) {
-		return ResponseHelper.buildResponse(equipmentServiceImpl.queryEquipmentPage(current,size,equipment));
+		IPage<EquipmentDto> page = new Page<>();
+		page.setSize(size);
+		page.setCurrent(current);
+		return ResponseHelper.buildResponse(equipmentServiceImpl.queryEquipmentPage(page,equipment));
 
 	}
 

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/EquipmentServiceImpl.java

@@ -5,31 +5,23 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.module.ugp.api.dto.AttachmentDto;
-import com.yeejoin.amos.boot.module.ugp.api.dto.CompanyDto;
-import com.yeejoin.amos.boot.module.ugp.api.dto.WelderDto;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Attachment;
-import com.yeejoin.amos.boot.module.ugp.api.entity.Company;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Equipment;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Project;
-import com.yeejoin.amos.boot.module.ugp.api.mapper.AttachmentMapper;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.EquipmentMapper;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.ProjectMapper;
 import com.yeejoin.amos.boot.module.ugp.api.service.IEquipmentService;
 import com.yeejoin.amos.boot.module.ugp.api.dto.EquipmentDto;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Repository;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 设备信息表服务实现类
@@ -177,15 +169,9 @@ public class EquipmentServiceImpl extends BaseService<EquipmentDto, Equipment, E
 
     }
     //设备模糊筛选
-    public Page<EquipmentDto> queryEquipmentPage(int current, int size, Equipment equipment) {
-        Page<EquipmentDto> page = new Page<>();
-        page.setSize(size);
-        page.setCurrent(current);
-
-        this.list();
-        List<EquipmentDto> equipments = equipmentMapper.queryEquipmentPage(equipment);
-        page.setRecords(equipments);
-        return page;
+    public IPage<EquipmentDto> queryEquipmentPage(IPage<EquipmentDto> page, Equipment equipment) {
+        return equipmentMapper.queryEquipmentPage(page,equipment);
     }
 
+
 }
\ No newline at end of file