Merge branch 'han' of uskycloud/usky-modules into server-165

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/BaseBuildServiceImpl.java

@@ -215,6 +215,8 @@ public class BaseBuildServiceImpl extends AbstractCrudService<BaseBuildMapper, B
                     .in(CollectionUtils.isNotEmpty(baseBuildFacilityVO.getFacilityType()),"facility_type",
                             baseBuildFacilityVO.getFacilityType())
                     .eq("delete_flag",0)
+                    .eq(StringUtils.isNotBlank(baseBuildFacilityVO.getFloor()),"floor",
+                            baseBuildFacilityVO.getFloor())
                     .groupBy("floor","facility_type");
             List<Map<String, Object>> baseBuildFacilityList1 = baseBuildFacilityService.listMaps(query2);
             QueryWrapper<BaseBuildFacility> query3 = Wrappers.query();
@@ -223,6 +225,8 @@ public class BaseBuildServiceImpl extends AbstractCrudService<BaseBuildMapper, B
                     .in(CollectionUtils.isNotEmpty(baseBuildFacilityVO.getFacilityType()),"facility_type",
                             baseBuildFacilityVO.getFacilityType())
                     .eq("delete_flag",0)
+                    .eq(StringUtils.isNotBlank(baseBuildFacilityVO.getFloor()),"floor",
+                            baseBuildFacilityVO.getFloor())
                     .groupBy("floor");
             List<Map<String, Object>> baseBuildFacilityList2 = baseBuildFacilityService.listMaps(query3);
             QueryWrapper<BaseBuildFacility> query4 = Wrappers.query();
@@ -231,6 +235,8 @@ public class BaseBuildServiceImpl extends AbstractCrudService<BaseBuildMapper, B
                     .in(CollectionUtils.isNotEmpty(baseBuildFacilityVO.getFacilityType()),"facility_type",
                             baseBuildFacilityVO.getFacilityType())
                     .eq("delete_flag",0)
+                    .eq(StringUtils.isNotBlank(baseBuildFacilityVO.getFloor()),"floor",
+                            baseBuildFacilityVO.getFloor())
                     .groupBy("facility_type");
             List<Map<String, Object>> baseBuildFacilityList3 = baseBuildFacilityService.listMaps(query4);
             List<String> facilityTypeList = new ArrayList<>();

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/vo/BaseBuildFacilityVO.java

@@ -19,4 +19,5 @@ public class BaseBuildFacilityVO {
 
         private List<String> facilityType;
 
+        private String floor;
 }