建筑设施接口typeFacilityInfo调整参数方式

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/BaseBuildController.java

@@ -106,16 +106,12 @@ public class BaseBuildController {
     /**
      * 类型设施关联查询
      *
-     * @param id  主键ID
-     * @param floor  所属楼层
-     * @param typeCode  类型编码
+     * @param baseBuildFacilityVO
      * @return
      */
-    @GetMapping("typeFacilityInfo")
-    public ApiResult<List<BaseBuildFacility>> typeFacilityInfo(@RequestParam(value = "id") Integer id,
-                                                               @RequestParam(value = "floor") String floor,
-                                                               @RequestParam(value = "typeCode",required = false) String typeCode) {
-        return ApiResult.success(baseBuildService.typeFacilityInfo(id,floor,typeCode));
+    @PostMapping("typeFacilityInfo")
+    public ApiResult<List<BaseBuildFacility>> typeFacilityInfo(@RequestBody BaseBuildFacilityVO baseBuildFacilityVO) {
+        return ApiResult.success(baseBuildService.typeFacilityInfo(baseBuildFacilityVO));
     }
 
     /**

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/BaseBuildService.java

@@ -45,11 +45,9 @@ public interface BaseBuildService extends CrudService<BaseBuild> {
     /**
      * 类型设施关联查询
      *
-     * @param id  主键ID
-     * @param floor  所属楼层
-     * @param typeCode  类型编码
+     * @param baseBuildFacilityVO  主键ID
      */
-    List<BaseBuildFacility> typeFacilityInfo(Integer id, String floor, String typeCode);
+    List<BaseBuildFacility> typeFacilityInfo(BaseBuildFacilityVO baseBuildFacilityVO);
 
     /**
      * 建筑关联类型查询

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

@@ -286,9 +286,9 @@ public class BaseBuildServiceImpl extends AbstractCrudService<BaseBuildMapper, B
     }
 
     @Override
-    public List<BaseBuildFacility> typeFacilityInfo(Integer id, String floor, String typeCode) {
+    public List<BaseBuildFacility> typeFacilityInfo(BaseBuildFacilityVO baseBuildFacilityVO) {
         LambdaQueryWrapper<BaseBuildFacilityRelate> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(BaseBuildFacilityRelate::getBuildId,id);
+        queryWrapper.eq(BaseBuildFacilityRelate::getBuildId,baseBuildFacilityVO.getId());
         List<BaseBuildFacilityRelate> baseBuildFacilityList = baseBuildFacilityRelateService.list(queryWrapper);
         List<Integer> facilityIdList = new ArrayList<>();
         List<String> facilityCodeList = new ArrayList<>();
@@ -299,8 +299,8 @@ public class BaseBuildServiceImpl extends AbstractCrudService<BaseBuildMapper, B
             }
             LambdaQueryWrapper<BaseBuildFacility> queryWrapper1 = Wrappers.lambdaQuery();
             queryWrapper1.in(BaseBuildFacility::getId,facilityIdList)
-                    .eq(StringUtils.isNotBlank(typeCode),BaseBuildFacility::getFacilityType,typeCode)
-                    .eq(StringUtils.isNotBlank(floor),BaseBuildFacility::getFloor,floor)
+                    .in(CollectionUtils.isNotEmpty(baseBuildFacilityVO.getFacilityType()),BaseBuildFacility::getFacilityType,baseBuildFacilityVO.getFacilityType())
+                    .eq(StringUtils.isNotBlank(baseBuildFacilityVO.getFloor()),BaseBuildFacility::getFloor,baseBuildFacilityVO.getFloor())
                     .eq(BaseBuildFacility::getDeleteFlag,0);
             list = baseBuildFacilityService.list(queryWrapper1);
             if (CollectionUtils.isNotEmpty(list)){