From a3f47b5e065878e5f41699ac1c597fd9ac9c4a21 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 25 九月 2023 14:56:24 +0800
Subject: [PATCH] 修改3.0 9.25
---
inspect-server/src/main/java/com/yuanchu/mom/controller/MeteringPlanController.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/MeteringPlanController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/MeteringPlanController.java
index afd2879..55435c5 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/MeteringPlanController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/MeteringPlanController.java
@@ -1,7 +1,5 @@
package com.yuanchu.mom.controller;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.pojo.MeteringPlan;
import com.yuanchu.mom.service.DeviceService;
import com.yuanchu.mom.service.MeteringPlanService;
@@ -17,10 +15,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-import org.springframework.stereotype.Controller;
-import java.util.Date;
-import java.util.HashMap;
+import javax.validation.Valid;
import java.util.List;
import java.util.Map;
@@ -50,7 +46,7 @@
private Jwt jwt;
@ApiOperation(value = "璁￠噺璁″垝-->鏂板鎸夐挳")
@PostMapping("/add_plan")
- public Result<?> addMeteringPlan(@RequestHeader("token") String token,@Validated @RequestBody MeteringPlan meteringPlan) throws Exception {
+ public Result<?> addMeteringPlan(@RequestHeader("token") String token, @Validated @RequestBody MeteringPlan meteringPlan) throws Exception {
Map<String, String> data = JackSonUtil.unmarshal(jwt.readJWT(token).get("data"), Map.class);
String id = data.get("id").replaceAll("\"", "");
meteringPlan.setFounder(Integer.valueOf(id));
@@ -84,18 +80,21 @@
})
@GetMapping("/metering_table")
public Result<?> selectMeteringTable(Integer pageNo, Integer pageSize, String code, String meteringUnit){
+ pageNo = (pageNo - 1) * pageSize;
Map<String, Object> maps = meteringPlanService.selectMeteringTable(pageNo, pageSize, code, meteringUnit);
return Result.success(maps);
}
@ApiOperation(value = "璁￠噺璁″垝<-->璁￠噺鍙拌处锛氭煡鐪嬭閲忓饱鍘�")
@ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "pageNo", value = "鏉℃暟/椤�", dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class),
@ApiImplicitParam(name = "measureId", value = "璁￠噺Id", dataTypeClass = Integer.class, required = true),
@ApiImplicitParam(name = "accountOrPlan", value = "true涓哄彴璐false涓鸿鍒�", dataTypeClass = Boolean.class, required = true),
})
@GetMapping("/list_record")
- public Result<?> standingBook(Integer measureId, Boolean accountOrPlan){
- Object maps = meteringPlanService.standingBook(measureId, accountOrPlan);
+ public Result<?> standingBook(Integer pageNo, Integer pageSize, Integer measureId, Boolean accountOrPlan){
+ Object maps = meteringPlanService.standingBook(pageNo, pageSize, measureId, accountOrPlan);
return Result.success(maps);
}
--
Gitblit v1.9.3