From 953e336a00991b1258865f41e81e160e58d12c22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E4=B9=BE=E7=BF=94?= Date: Sat, 25 Apr 2026 11:04:38 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=AF=E4=BF=9D=E7=AE=A1=E7=90=86-=E5=BA=9F?= =?UTF-8?q?=E6=B0=B4=E5=A4=84=E7=90=86-=E4=BB=AA=E8=A1=A8=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../energy/controller/BsMeterParamController.java | 12 ++++++++---- .../desk/energy/pojo/vo/BsMeterParamVO.java | 5 +++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsMeterParamController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsMeterParamController.java index ca4912d9..10073954 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsMeterParamController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsMeterParamController.java @@ -25,6 +25,7 @@ */ package org.springblade.desk.energy.controller; +import com.alibaba.fastjson.JSONObject; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -42,7 +43,9 @@ import org.springblade.desk.energy.excel.BsMeterParamExcel; import org.springblade.desk.energy.pojo.entity.BsMeterParamEntity; import org.springblade.desk.energy.pojo.vo.BsMeterParamVO; import org.springblade.desk.energy.service.IBsMeterParamService; +import org.springblade.desk.energy.util.HttpRequestService; import org.springblade.desk.energy.wrapper.BsMeterParamWrapper; +import org.springblade.desk.oldv1.pojo.ResultInfo; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -67,7 +70,7 @@ import jakarta.servlet.http.HttpServletResponse; public class BsMeterParamController extends BladeController { private final IBsMeterParamService bsMeterParamService; - + private final HttpRequestService httpRequestService; /** * 仪表参数表 详情 */ @@ -95,9 +98,10 @@ public class BsMeterParamController extends BladeController { @GetMapping("/page") @ApiOperationSupport(order = 3) @Operation(summary = "分页", description = "传入bsMeterParam") - public R> page(BsMeterParamVO bsMeterParam, Query query) { - IPage pages = bsMeterParamService.selectBsMeterParamPage(Condition.getPage(query), bsMeterParam); - return R.data(pages); + public R> page(BsMeterParamVO bsMeterParam, Query query) { + //IPage pages = bsMeterParamService.selectBsMeterParamPage(Condition.getPage(query), bsMeterParam); + return R.data(httpRequestService.getWasteWaterAndGas(bsMeterParam.getDeviceId(), false, "kanban")); + //return R.data(pages); } /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsMeterParamVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsMeterParamVO.java index b44c3f2a..b7a9100e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsMeterParamVO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsMeterParamVO.java @@ -40,7 +40,8 @@ import java.io.Serial; @Data @EqualsAndHashCode(callSuper = true) public class BsMeterParamVO extends BsMeterParamEntity { - @Serial - private static final long serialVersionUID = 1L; + @Serial + private static final long serialVersionUID = 1L; + private String deviceId; }