diff --git a/src/main/java/com/example/demo/controller/coin/HistoryRecordController.java b/src/main/java/com/example/demo/controller/coin/HistoryRecordController.java index ab41f30..1879441 100644 --- a/src/main/java/com/example/demo/controller/coin/HistoryRecordController.java +++ b/src/main/java/com/example/demo/controller/coin/HistoryRecordController.java @@ -41,17 +41,22 @@ public class HistoryRecordController { //获取旧的历史记录 @RequestMapping("/getOldHistoryRecord") - public Result getOldHistoryRecord(@RequestBody Page page){ + public Result getOldHistoryRecord(@RequestBody HistoryRecord historyRecord){ try { //页码校验 - if (ObjectUtils.isEmpty(page.getPageNum())) { + if (ObjectUtils.isEmpty(historyRecord.getPageNum())) { return Result.error("页码数为空！"); } //页面大小校验 - if (ObjectUtils.isEmpty(page.getPageSize())) { + if (ObjectUtils.isEmpty(historyRecord.getPageSize())) { return Result.error("页大小为空！"); - } else { - return Result.success(historyRecordService.getOldHistoryRecord(page.getPageNum(), page.getPageSize(),page.getHistoryRecord())); + } + if((historyRecord.getJwcode()==null|| historyRecord.getJwcode().isEmpty())&&(historyRecord.getName()==null|| historyRecord.getName().isEmpty())){ +// return Result.success(historyRecordService.getOldHistoryRecord(historyRecord.getPageNum(), historyRecord.getPageSize(),historyRecord)); + return Result.error("姓名，精网号不能都为空"); + } + else { + return Result.success(historyRecordService.getOldHistoryRecord(historyRecord.getPageNum(), historyRecord.getPageSize(),historyRecord)); } } catch (Exception e) { e.printStackTrace(); @@ -71,6 +76,7 @@ public class HistoryRecordController { return Result.error("页大小为空！"); } if((historyRecord.getJwcode()==null|| historyRecord.getJwcode().isEmpty())&&(historyRecord.getName()==null|| historyRecord.getName().isEmpty())){ +// return Result.success(historyRecordService.getNewHistoryRecord(historyRecord.getPageNum(), historyRecord.getPageSize(),historyRecord)); return Result.error("姓名，精网号不能都为空"); } else { diff --git a/src/main/java/com/example/demo/mapper/sqlserver/HistoryRecordMapper.java b/src/main/java/com/example/demo/mapper/sqlserver/HistoryRecordMapper.java index ad5c0d2..263605e 100644 --- a/src/main/java/com/example/demo/mapper/sqlserver/HistoryRecordMapper.java +++ b/src/main/java/com/example/demo/mapper/sqlserver/HistoryRecordMapper.java @@ -25,4 +25,6 @@ public interface HistoryRecordMapper { // 统计总条数 long countNewHistoryRecord(HistoryRecord historyRecord); + // 统计总条数 + long countOldHistoryRecord(HistoryRecord historyRecord); } diff --git a/src/main/java/com/example/demo/serviceImpl/coin/HistoryRecordServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/HistoryRecordServiceImpl.java index dd62a7a..dc996db 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/HistoryRecordServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/HistoryRecordServiceImpl.java @@ -26,9 +26,33 @@ public class HistoryRecordServiceImpl implements HistoryRecordService { @Override public PageInfo getOldHistoryRecord(Integer pageNum, Integer pageSize, HistoryRecord historyRecord) { - PageHelper.startPage(pageNum, pageSize); - List historyRecords = historyRecordMapper.getOldHistoryRecord(historyRecord); - return new PageInfo<>(historyRecords); + + // 1. 校验分页参数（避免pageNum为0或负数） + if (pageNum == null || pageNum < 1) { + pageNum = 1; + } + if (pageSize == null || pageSize < 1) { + pageSize = 10; // 默认每页10条 + } + + // 2. 计算偏移量 (SQL Server的OFFSET从0开始) + int offset = (pageNum - 1) * pageSize; + + historyRecord.setOffset(offset); + // 3. 查询当前页数据 + List records = historyRecordMapper.getOldHistoryRecord(historyRecord); + + // 4. 查询总记录数 + long total = historyRecordMapper.countOldHistoryRecord(historyRecord); + + // 5. 手动构建PageInfo对象 + PageInfo pageInfo = new PageInfo<>(records); + pageInfo.setPageNum(pageNum); // 当前页码 + pageInfo.setPageSize(pageSize); // 每页条数 + pageInfo.setTotal(total); // 总记录数 + pageInfo.setPages((int) (total + pageSize - 1) / pageSize); // 总页数 + + return pageInfo; } @Override diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 5855c38..3998a3d 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -44,9 +44,9 @@ spring: pool-name: mysql5HikariCP maximum-pool-size: 10 sqlserver1: - jdbc-url: jdbc:sqlserver://10.19.183.6:1433;databaseName=hwhcGold;encrypt=true;sslProtocol=TLSv1;trustServerCertificate=true; - username: hwhc_gold_query - password: hwhc_gold_query4564jkj + jdbc-url: jdbc:sqlserver://52.76.43.43:1433;encrypt=true;sslProtocol=TLSv1;trustServerCertificate=true; + username: gjb_test + password: qweuio!@#$2 driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver application: diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 036401a..006ac35 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -44,9 +44,9 @@ spring: pool-name: mysql5HikariCP maximum-pool-size: 10 sqlserver1: - jdbc-url: jdbc:sqlserver://10.19.183.6:1433;databaseName=hwhcGold;encrypt=true;sslProtocol=TLSv1;trustServerCertificate=true; - username: hwhc_gold_query - password: hwhc_gold_query4564jkj + jdbc-url: jdbc:sqlserver://52.76.43.43:1433;encrypt=true;sslProtocol=TLSv1;trustServerCertificate=true; + username: gjb_test + password: qweuio!@#$2 driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver diff --git a/src/main/resources/sqlserverMapper/HistoryRecordMapper.xml b/src/main/resources/sqlserverMapper/HistoryRecordMapper.xml index 3afab86..7b5f663 100644 --- a/src/main/resources/sqlserverMapper/HistoryRecordMapper.xml +++ b/src/main/resources/sqlserverMapper/HistoryRecordMapper.xml @@ -2,10 +2,6 @@ - - - + + + + + + \ No newline at end of file