分页

ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/BidRecordController.java

@@ -2,10 +2,8 @@ package com.wwdz.ch.admin.controller;
 
 
 import com.wwdz.ch.db.dto.request.BidRecordRequestDto;
-import com.wwdz.ch.admin.entity.vo.BidRecordVo;
 import com.wwdz.ch.admin.service.BidRecordService;
 import com.wwdz.ch.admin.util.AuthSupport;
-import com.wwdz.ch.core.type.ListResult;
 import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.core.type.SimpleResult;
 import com.wwdz.ch.db.domain.BidRecord;
@@ -16,8 +14,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import javax.validation.constraints.NotNull;
-import java.util.List;
-import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping("/admin/bidrecord")
@@ -31,12 +27,10 @@ public class BidRecordController {
 
     @PostMapping("/list")
     @ApiOperation(value = "成交记录列表")
-    public ListResult<BidRecordVo> list(@RequestBody BidRecordRequestDto dto) {
+    public Object list(@RequestBody BidRecordRequestDto dto) {
         int cid = dto.getCid();
         logger.info("【请求开始】操作人:[" + AuthSupport.userName()+ "] 钱币管理->成交记录->查询,请求参数:cid:{}", cid);
-        List<BidRecord> collectList = bidRecordService.query(dto);
-        List<BidRecordVo> data = collectList.parallelStream().map(a -> new BidRecordVo(a)).collect(Collectors.toList());
-        return new ListResult<BidRecordVo>(data, data.size());
+        return bidRecordService.query(dto);
     }
 
     @PostMapping("/add")

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/BidRecordServiceImpl.java

 package com.wwdz.ch.admin.impl;
 
+import com.github.pagehelper.PageInfo;
+import com.wwdz.ch.admin.controller.AdminGoodsController;
+import com.wwdz.ch.core.util.ResponseUtil;
 import com.wwdz.ch.db.dto.request.BidRecordRequestDto;
 import com.wwdz.ch.admin.service.BidRecordService;
 import com.wwdz.ch.db.domain.BidRecord;
 import com.wwdz.ch.db.manager.BidRecordManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class BidRecordServiceImpl implements BidRecordService {
 
+    private static final Logger logger = LoggerFactory.getLogger(BidRecordServiceImpl.class);
+
     @Autowired
     BidRecordManager bidRecordManager;
 
@@ -36,8 +46,18 @@ public class BidRecordServiceImpl implements BidRecordService {
     }
 
     @Override
-    public List<BidRecord> query(BidRecordRequestDto dto) {
-        return bidRecordManager.query(dto);
+    public Object query(BidRecordRequestDto dto) {
+        Map<String, Object> data = new HashMap<>();
+        try {
+            List<BidRecord> list = bidRecordManager.query(dto);
+            long total = PageInfo.of(list).getTotal();
+            data.put("total", total);
+            data.put("data", list);
+            return ResponseUtil.ok(data);
+        } catch (Exception e) {
+            logger.error("查询成交记录error{}", e);
+        }
+        return ResponseUtil.fail();
     }
 
     @Override

ch-admin-api/src/main/java/com/wwdz/ch/admin/service/BidRecordService.java

@@ -15,7 +15,7 @@ public interface BidRecordService {
 
     List<BidRecord> queryByCid (Integer cid);
 
-    List<BidRecord> query (BidRecordRequestDto dto);
+    Object query (BidRecordRequestDto dto);
 
     void deleteById (Long id);
 

ch-core/src/main/java/com/wwdz/ch/core/consts/ResultCode.java

@@ -7,7 +7,7 @@ package com.wwdz.ch.core.consts;
  */
 public enum ResultCode {
 
-    SUCCESS(1000, "成功"),
+    SUCCESS(0, "成功"),
     FAILED(4000, "操作失败"),
     UNKNOWN_USER(4001, "请先登录"),
     INVALID_FILE(4002, "文件类型不正确"),

ch-dao/src/main/java/com/wwdz/ch/db/manager/impl/BidRecordManagerImpl.java

 package com.wwdz.ch.db.manager.impl;
 
+import com.github.pagehelper.PageHelper;
 import com.wwdz.ch.db.dao.BidRecordMapper;
 import com.wwdz.ch.db.domain.BidRecord;
 import com.wwdz.ch.db.domain.BidRecordExample;
@@ -49,6 +50,7 @@ public class BidRecordManagerImpl implements BidRecordManager {
         JdbcHelper.ifPresent(dto.getEndPrice(), criteria :: andPriceLessThanOrEqualTo);
         JdbcHelper.ifPresent(dto.getStartBidTime(), criteria :: andBidTimeGreaterThanOrEqualTo);
         JdbcHelper.ifPresent(dto.getEndBidTime(), criteria :: andBidTimeLessThanOrEqualTo);
+        PageHelper.startPage(dto.getPage(), dto.getLimit());
         return bidRecordMapper.selectByExample(example);
     }