From 76abbaa08ea2bf8026d191881de057edc9c23b2a Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Fri, 29 Aug 2025 11:02:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8D=A2=E7=83=AD=E7=AB=99?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/jeecg/exportapi/api/HomeApi.java | 31 ++++++++++++++++---
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/exportapi/api/HomeApi.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/exportapi/api/HomeApi.java
index aadfa59..86200ca 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/exportapi/api/HomeApi.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/exportapi/api/HomeApi.java
@@ -1,5 +1,6 @@
 package org.jeecg.exportapi.api;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
@@ -33,6 +34,7 @@ public class HomeApi {
     @Autowired
     private HeatsourceService heatsourceService;
     //换热站
+    @Autowired
     private HeatsourcestationService heatsourcestationService;
     //各信息（温度、压力、热量、流量等）
     @Autowired
@@ -100,11 +102,32 @@ public class HomeApi {
         Map<String,Object> result = new HashMap<>();
 
         //城区锅炉房供回水温度
-        LambdaQueryChainWrapper<Heatanalysis> qw = heatanalysisService.lambdaQuery();
-        qw.eq(Heatanalysis::getDelFlag,"0");
+        QueryWrapper<Heatanalysis> qw = new QueryWrapper<>();
+        qw.eq("del_flag","0");
+        qw.isNull("view004");
 //        qw.eq(Heatanalysis::getRegionType,"城区");
-        qw.orderByAsc(Heatanalysis::getId);
-        List<Heatanalysis> list = qw.list();
+        qw.orderByAsc("id");
+        List<Heatanalysis> list = heatanalysisService.list(qw);
+        result.put("data",list);
+        return Result.ok(result);
+    }
+
+    /**
+     * 锅炉房指标
+     * @param dto
+     * @return
+     */
+    @RequestMapping(value = "/glfzb", method = RequestMethod.POST)
+    public Result<?> glfzb(HomeApiEntity dto) {
+        Map<String,Object> result = new HashMap<>();
+
+        //城区锅炉房供回水温度
+        QueryWrapper<Heatanalysis> qw = new QueryWrapper<>();
+        qw.eq("del_flag","0");
+        qw.isNotNull("view004");
+//        qw.eq(Heatanalysis::getRegionType,"城区");
+        qw.orderByAsc("id");
+        List<Heatanalysis> list = heatanalysisService.list(qw);
         result.put("data",list);
         return Result.ok(result);
     }