From b831d28e8940ca0fb74eba3d7971edd9845e5fbd Mon Sep 17 00:00:00 2001
From: qinjie <463333974@qq.com>
Date: Thu, 28 Nov 2024 16:38:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/isu/gaswellwatch/controller/DeviceController.java    | 4 ++--
 src/main/java/com/isu/gaswellwatch/dao/DeviceDao.java        | 3 ++-
 .../java/com/isu/gaswellwatch/service/DeviceService.java     | 2 +-
 .../com/isu/gaswellwatch/service/impl/DeviceServiceImpl.java | 5 ++---
 src/main/resources/mapper/DeviceDao.xml                      | 3 +++
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/isu/gaswellwatch/controller/DeviceController.java b/src/main/java/com/isu/gaswellwatch/controller/DeviceController.java
index 79290b6..355c901 100644
--- a/src/main/java/com/isu/gaswellwatch/controller/DeviceController.java
+++ b/src/main/java/com/isu/gaswellwatch/controller/DeviceController.java
@@ -39,8 +39,8 @@ public class DeviceController {
                                          @RequestParam(defaultValue = "10") Integer pageSize,
                                          @RequestParam(required = false) String gasWellName,
                                          @RequestParam(required = false) String gasStationName,
-                                         @RequestParam Long deviceTypeId) {
-        return Response.succeed(deviceService.page(currentPage, pageSize, gasWellName,gasStationName,deviceTypeId));
+                                         @RequestParam Long deviceTypeId,@RequestParam Long blockId) {
+        return Response.succeed(deviceService.page(currentPage, pageSize, gasWellName,gasStationName,deviceTypeId,blockId));
     }
 
     /**
diff --git a/src/main/java/com/isu/gaswellwatch/dao/DeviceDao.java b/src/main/java/com/isu/gaswellwatch/dao/DeviceDao.java
index 6ad7cac..af7948d 100644
--- a/src/main/java/com/isu/gaswellwatch/dao/DeviceDao.java
+++ b/src/main/java/com/isu/gaswellwatch/dao/DeviceDao.java
@@ -20,7 +20,8 @@ public interface DeviceDao extends BaseMapper<Device> {
     Page<DeviceVO> page(Page<Object> page,
                         @Param("gasWellName") String gasWellName,
                         @Param("gasStationName") String gasStationName,
-                        @Param("deviceTypeId") Long deviceTypeId);
+                        @Param("deviceTypeId") Long deviceTypeId,
+                        @Param("blockId") Long blockId);
 
 
     DeviceVO getDeviceById(@Param("id") Long id);
diff --git a/src/main/java/com/isu/gaswellwatch/service/DeviceService.java b/src/main/java/com/isu/gaswellwatch/service/DeviceService.java
index c834134..075d156 100644
--- a/src/main/java/com/isu/gaswellwatch/service/DeviceService.java
+++ b/src/main/java/com/isu/gaswellwatch/service/DeviceService.java
@@ -15,7 +15,7 @@ import java.util.Map;
 
 public interface DeviceService extends IService<Device> {
 
-    Page<DeviceVO> page(Integer currentPage, Integer pageSize, String gasWellName, String gasStationName, Long deviceTypeId);
+    Page<DeviceVO> page(Integer currentPage, Integer pageSize, String gasWellName, String gasStationName, Long deviceTypeId, Long blockId);
 
     void add(DeviceCreateDTO deviceCreateDTO);
 
diff --git a/src/main/java/com/isu/gaswellwatch/service/impl/DeviceServiceImpl.java b/src/main/java/com/isu/gaswellwatch/service/impl/DeviceServiceImpl.java
index cd6bde6..399492c 100644
--- a/src/main/java/com/isu/gaswellwatch/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/isu/gaswellwatch/service/impl/DeviceServiceImpl.java
@@ -29,7 +29,6 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 
 
 @Service("deviceService")
@@ -53,8 +52,8 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceDao, Device> implements
     private DynamicRabbitListener dynamicRabbitListener;
 
     @Override
-    public Page<DeviceVO> page(Integer currentPage, Integer pageSize, String gasWellName, String gasStationName,Long deviceTypeId){
-        Page<DeviceVO> page = deviceDao.page(new Page<>(currentPage, pageSize),gasWellName,gasStationName,deviceTypeId);
+    public Page<DeviceVO> page(Integer currentPage, Integer pageSize, String gasWellName, String gasStationName, Long deviceTypeId, Long blockId){
+        Page<DeviceVO> page = deviceDao.page(new Page<>(currentPage, pageSize),gasWellName,gasStationName,deviceTypeId,blockId);
         List<DeviceVO> deviceVOList = page.getRecords();
         // 从Redis获取设备运行数据
         if(CollectionUtil.isNotEmpty(deviceVOList)) {
diff --git a/src/main/resources/mapper/DeviceDao.xml b/src/main/resources/mapper/DeviceDao.xml
index 757ce90..daa621e 100644
--- a/src/main/resources/mapper/DeviceDao.xml
+++ b/src/main/resources/mapper/DeviceDao.xml
@@ -48,6 +48,9 @@
             <if test="deviceTypeId!=null and deviceTypeId!='' ">
                 and u.device_type = #{deviceTypeId}
             </if>
+            <if test="blockId!=null and blockId!='' ">
+                and g.block_id = #{blockId}
+            </if>
         </where>
         order by u.id desc
     </select>