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

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

@@ -7,9 +7,7 @@ import com.usky.iot.domain.BaseBuild;
 import com.usky.iot.domain.BaseBuildFacility;
 import com.usky.iot.domain.BaseGgpFacility;
 import com.usky.iot.service.BaseBuildService;
-import com.usky.iot.service.vo.BuildFacilityRelateRequestVO;
-import com.usky.iot.service.vo.BuildFacilityRelateResponeVO;
-import com.usky.iot.service.vo.BuildFacilityStatusVO;
+import com.usky.iot.service.vo.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -96,12 +94,12 @@ public class BaseBuildController {
     /**
      * 建筑设施关联查询
      *
-     * @param id  主键ID
+     * @param baseBuildFacilityVO
      * @return
      */
-    @GetMapping("buildFacilityInfo")
-    public ApiResult<List<Object>> buildFacilityInfo(@RequestParam(value = "id") Integer id) {
-        return ApiResult.success(baseBuildService.buildFacilityInfo(id));
+    @PostMapping("buildFacilityInfo")
+    public ApiResult<List<Object>> buildFacilityInfo(@RequestBody BaseBuildFacilityVO baseBuildFacilityVO) {
+        return ApiResult.success(baseBuildService.buildFacilityInfo(baseBuildFacilityVO));
     }
 
     /**

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

@@ -4,6 +4,7 @@ import com.usky.common.core.bean.CommonPage;
 import com.usky.iot.domain.BaseBuild;
 import com.usky.common.mybatis.core.CrudService;
 import com.usky.iot.domain.BaseBuildFacility;
+import com.usky.iot.service.vo.BaseBuildFacilityVO;
 import com.usky.iot.service.vo.BuildFacilityRelateRequestVO;
 import com.usky.iot.service.vo.BuildFacilityRelateResponeVO;
 import com.usky.iot.service.vo.BuildFacilityStatusVO;
@@ -38,7 +39,7 @@ public interface BaseBuildService extends CrudService<BaseBuild> {
      *
      * @param id  主键ID
      */
-    List<Object> buildFacilityInfo(Integer id);
+    List<Object> buildFacilityInfo(BaseBuildFacilityVO baseBuildFacilityVO);
 
     /**
      * 类型设施关联查询

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

@@ -15,6 +15,7 @@ import com.usky.iot.domain.*;
 import com.usky.iot.mapper.BaseBuildMapper;
 import com.usky.iot.service.*;
 import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.iot.service.vo.BaseBuildFacilityVO;
 import com.usky.iot.service.vo.BuildFacilityRelateRequestVO;
 import com.usky.iot.service.vo.BuildFacilityRelateResponeVO;
 import com.usky.iot.service.vo.BuildFacilityStatusVO;
@@ -193,13 +194,13 @@ public class BaseBuildServiceImpl extends AbstractCrudService<BaseBuildMapper, B
     }
 
     @Override
-    public List<Object> buildFacilityInfo(Integer id) {
+    public List<Object> buildFacilityInfo(BaseBuildFacilityVO baseBuildFacilityVO) {
         List<Object> list = new ArrayList<>();
         List<Object> list2 = new ArrayList<>();
         LambdaQueryWrapper<BaseBuildFacilityRelate> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(BaseBuildFacilityRelate::getBuildId,id);
+        queryWrapper.eq(BaseBuildFacilityRelate::getBuildId,baseBuildFacilityVO.getId());
         List<BaseBuildFacilityRelate> baseBuildFacilityList = baseBuildFacilityRelateService.list(queryWrapper);
-        BaseBuild baseBuild = this.getById(id);
+        BaseBuild baseBuild = this.getById(baseBuildFacilityVO.getId());
         Map<String, Object> map = new HashMap<>();
         map.put("aboveFloor", baseBuild.getAboveFloor());
         map.put("underFloor", baseBuild.getUnderFloor());
@@ -211,18 +212,24 @@ public class BaseBuildServiceImpl extends AbstractCrudService<BaseBuildMapper, B
             QueryWrapper<BaseBuildFacility> query2 = Wrappers.query();
             query2.select("floor as floor","count(id) as count","facility_type as facilityType")
                     .in("id",facilityIdList)
+                    .in(CollectionUtils.isNotEmpty(baseBuildFacilityVO.getFacilityType()),"facility_type",
+                            baseBuildFacilityVO.getFacilityType())
                     .eq("delete_flag",0)
                     .groupBy("floor","facility_type");
             List<Map<String, Object>> baseBuildFacilityList1 = baseBuildFacilityService.listMaps(query2);
             QueryWrapper<BaseBuildFacility> query3 = Wrappers.query();
             query3.select("floor as floor","count(id) as count")
                     .in("id",facilityIdList)
+                    .in(CollectionUtils.isNotEmpty(baseBuildFacilityVO.getFacilityType()),"facility_type",
+                            baseBuildFacilityVO.getFacilityType())
                     .eq("delete_flag",0)
                     .groupBy("floor");
             List<Map<String, Object>> baseBuildFacilityList2 = baseBuildFacilityService.listMaps(query3);
             QueryWrapper<BaseBuildFacility> query4 = Wrappers.query();
             query4.select("facility_type as facilityType","count(id) as count")
                     .in("id",facilityIdList)
+                    .in(CollectionUtils.isNotEmpty(baseBuildFacilityVO.getFacilityType()),"facility_type",
+                            baseBuildFacilityVO.getFacilityType())
                     .eq("delete_flag",0)
                     .groupBy("facility_type");
             List<Map<String, Object>> baseBuildFacilityList3 = baseBuildFacilityService.listMaps(query4);

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

@@ -0,0 +1,22 @@
+package com.usky.iot.service.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author han
+ * @since 2023-08-07
+ */
+@Data
+public class BaseBuildFacilityVO {
+
+        private Integer id;
+
+        private List<String> facilityType;
+
+}