修改门锁展示接口

src/main/java/com/template/api/HouseLockControllerAPI.java

@@ -14,7 +14,7 @@ public interface HouseLockControllerAPI {
 
     @GetMapping("/list")
     @ApiOperation(value = "门锁管理页面展示", notes = "门锁管理页面展示", httpMethod = "GET")
-    CommonResult list(String permissionSettingId,String roomNumber,String roomName);
+    CommonResult list(String permissionSettingId,String roomNumber,String roomName,Integer houseType,Integer buildingId);
 
     @GetMapping("/particular")
     @ApiOperation(value = "门锁详情展示", notes = "门锁详情展示", httpMethod = "GET")

src/main/java/com/template/controller/HouseLockController.java

@@ -75,7 +75,7 @@ public class HouseLockController implements HouseLockControllerAPI {
     UnlockingEmployeeService unlockingEmployeeService;
 
     @Override
-    public CommonResult list(String permissionSettingId, String roomNumber, String roomName) {
+    public CommonResult list(String permissionSettingId, String roomNumber, String roomName,Integer houseType,Integer buildingId) {
         PermissionSetting permissionSetting = permissionSettingService.getById(permissionSettingId);
         if (ObjectUtils.isEmpty(permissionSetting)) {
             return CommonResult.fail("非法进入");
@@ -89,7 +89,7 @@ public class HouseLockController implements HouseLockControllerAPI {
 
         LambdaQueryWrapper<House> hWrapper = new LambdaQueryWrapper<>();
         hWrapper.eq(ObjectUtils.isNotEmpty(roomName), House::getRoomName, roomName);
-
+        hWrapper.eq(ObjectUtils.isNotEmpty(houseType),House::getRoomType,houseType);
         List<House> list = houseService.list(hWrapper);
         String houseIds = "";
         for (int i = 0; i < list.size(); i++) {
@@ -103,7 +103,7 @@ public class HouseLockController implements HouseLockControllerAPI {
             }
         }
 
-        List<houseLockListVo> voList = houseNumberService.houseLockPage(roomNumber, houseIds);
+        List<houseLockListVo> voList = houseNumberService.houseLockPage(roomNumber, houseIds,buildingId);
 
         ArrayList<HouseLockVo> vos = new ArrayList<>();
         for (House house : list) {

src/main/java/com/template/mapper/HouseNumberMapper.java

@@ -28,7 +28,7 @@ public interface HouseNumberMapper extends BaseMapper<HouseNumber> {
     IPage<CalendarPageVo> houseStateCalendarPage(Page<CalendarPageVo> pageVo, @Param("keyWord") String keyWord, @Param("houseType") String houseType,@Param("houseId") Integer houseId,@Param("buildingId")Integer buildingId);
 
 
-    List<houseLockListVo> houseLockListDto(@Param("roomNumber") String roomNumber, @Param("houseIds") String houseIds);
+    List<houseLockListVo> houseLockListDto(@Param("roomNumber") String roomNumber, @Param("houseIds") String houseIds,@Param("buildingId") Integer buildingId);
 
     List<Integer> getNumberState(@Param("date") Date date);
 

src/main/java/com/template/services/HouseNumberService.java

@@ -23,7 +23,7 @@ public interface HouseNumberService extends IService<HouseNumber> {
 
     PageUtils<CalendarPageVo> houseStateCalendarPage(String keyWord, String houseType, int page, int size,Integer houseId,Integer buildingId);
 
-    List<houseLockListVo>  houseLockPage(String roomNumber, String houseIds);
+    List<houseLockListVo>  houseLockPage(String roomNumber, String houseIds,Integer buildingId);
 
     List<Integer> getNumberState(Date date);
 

src/main/java/com/template/services/impl/HouseNumberServiceImpl.java

@@ -45,11 +45,11 @@ public class HouseNumberServiceImpl extends ServiceImpl<HouseNumberMapper, House
     }
 
     @Override
-    public  List<houseLockListVo> houseLockPage(String roomNumber, String houseIds) {
+    public  List<houseLockListVo> houseLockPage(String roomNumber, String houseIds,Integer buildingId) {
 //        Page<houseLockListVo> pageVo = new Page<>(page,size);
 //        IPage<houseLockListVo> result=houseNumberMapper.houseLockListDto(pageVo,roomNumber,houseIds);
 //        return new  PageUtils(result);
-        List<houseLockListVo> result=houseNumberMapper.houseLockListDto(roomNumber,houseIds);
+        List<houseLockListVo> result=houseNumberMapper.houseLockListDto(roomNumber,houseIds,buildingId);
         return result;
     }
 

src/main/resources/mapper/template/HouseNumberMapper.xml

@@ -131,12 +131,18 @@
         FROM
         `house_number` hn
         LEFT JOIN house_lock hl ON hl.house_number_id = hn.id and hl.deleted=0
+        LEFT JOIN building b ON b.id = hn.building_id AND b.deleted = 0
         <where>
             FIND_IN_SET( hn.house_id, #{houseIds})
             and hn.deleted = 0
             <if test="roomNumber != null and roomNumber != ''">
                 AND hn.room_number LIKE '%' #{roomNumber} '%'
             </if>
+
+            <if test="buildingId != null and buildingId != ''">
+                AND hn.building_id = #{buildingId}
+            </if>
+
         </where>
         ORDER BY
         hn.room_number