修复问题

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) {
+                                         @RequestParam Long deviceTypeId,@RequestParam Long blockId) {
-        return Response.succeed(deviceService.page(currentPage, pageSize, gasWellName,gasStationName,deviceTypeId));
+        return Response.succeed(deviceService.page(currentPage, pageSize, gasWellName,gasStationName,deviceTypeId,blockId));
     }
 
     /**

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

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

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){
+    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);
+        Page<DeviceVO> page = deviceDao.page(new Page<>(currentPage, pageSize),gasWellName,gasStationName,deviceTypeId,blockId);
         List<DeviceVO> deviceVOList = page.getRecords();
         // 从Redis获取设备运行数据
         if(CollectionUtil.isNotEmpty(deviceVOList)) {

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>