环保管理-废水处理-仪表参数

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<IPage<BsMeterParamVO>> page(BsMeterParamVO bsMeterParam, Query query) {
-		IPage<BsMeterParamVO> pages = bsMeterParamService.selectBsMeterParamPage(Condition.getPage(query), bsMeterParam);
-		return R.data(pages);
+	public R<List<JSONObject>> page(BsMeterParamVO bsMeterParam, Query query) {
+		//IPage<BsMeterParamVO> pages = bsMeterParamService.selectBsMeterParamPage(Condition.getPage(query), bsMeterParam);
+		return R.data(httpRequestService.getWasteWaterAndGas(bsMeterParam.getDeviceId(), false, "kanban"));
+		//return R.data(pages);
 	}
 
 	/**

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;
 }