'优化建筑信息-关联设施信息列表和建筑设施-建筑设施关联设备列表接口'

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

@@ -146,6 +146,12 @@ public class BaseBuildFacilityServiceImpl extends AbstractCrudService<BaseBuildF
     public CommonPage<BuildFacilityResponeVO> deviceList(BuildFacilityRequestVO requestVO){
         List<BuildFacilityResponeVO> list = new ArrayList<>();
 
+        LambdaQueryWrapper<BaseBuildFacility> query = Wrappers.lambdaQuery();
+        query.eq(BaseBuildFacility::getId,requestVO.getBaseBuildFacilityId())
+                .eq(BaseBuildFacility::getDeleteFlag,0);
+        BaseBuildFacility buildFacilityOne = this.getOne(query);
+        String relateDeviceId = buildFacilityOne.getDeviceId();
+
         IPage<DmpDeviceInfo> page = new Page<>(requestVO.getCurrent(),requestVO.getSize());
         LambdaQueryWrapper<DmpDeviceInfo> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.like(StringUtils.isNotBlank(requestVO.getDeviceId()),DmpDeviceInfo::getDeviceId,requestVO.getDeviceId())
@@ -170,7 +176,7 @@ public class BaseBuildFacilityServiceImpl extends AbstractCrudService<BaseBuildF
 
                 responeVO.setInstallAddress(page.getRecords().get(i).getInstallAddress());
 
-                if(page.getRecords().get(i).getDeviceId().equals(requestVO.getRelateDeviceId())){
+                if(page.getRecords().get(i).getDeviceId().equals(relateDeviceId)){
                     responeVO.setStatus(1);
                 }else{
                     responeVO.setStatus(0);

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

@@ -114,10 +114,19 @@ public class BaseBuildServiceImpl extends AbstractCrudService<BaseBuildMapper, B
     @Override
     public CommonPage<BuildFacilityRelateResponeVO> buildFacilityRelateList(BuildFacilityRelateRequestVO requestVO){
         List<BuildFacilityRelateResponeVO> list = new ArrayList<>();
+
+        LambdaQueryWrapper<BaseBuild> queryBuild = Wrappers.lambdaQuery();
+        queryBuild.eq(BaseBuild::getId,requestVO.getBuildId())
+                .eq(BaseBuild::getDeleteFlag,0)
+                .eq(BaseBuild::getTenantId,SecurityUtils.getTenantId())
+                .orderByDesc(BaseBuild::getId);
+        BaseBuild buildOne = this.getOne(queryBuild);
+        Integer buildFacilityId = buildOne.getFacilityId();
+
         IPage<BaseGgpFacility> page = new Page<>(requestVO.getCurrent(),requestVO.getSize());
         LambdaQueryWrapper<BaseGgpFacility> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.like(StringUtils.isNotBlank(requestVO.getFacilityNum()),BaseGgpFacility::getFacilityNum,requestVO.getFacilityNum())
-                .eq(requestVO.getFacilityType() != null,BaseGgpFacility::getFacilityType,requestVO.getFacilityType())
+                .eq(StringUtils.isNotBlank(requestVO.getFacilityType()),BaseGgpFacility::getFacilityType,requestVO.getFacilityType())
                 .eq(BaseGgpFacility::getTenantId,SecurityUtils.getTenantId());
         page = baseGgpFacilityService.page(page,queryWrapper);
         if(CollectionUtils.isNotEmpty(page.getRecords())){
@@ -137,7 +146,7 @@ public class BaseBuildServiceImpl extends AbstractCrudService<BaseBuildMapper, B
 
                 responeVO.setAddress(page.getRecords().get(i).getAddress());
 
-                if(page.getRecords().get(i).getId().equals(requestVO.getBuildFacilityId())){
+                if(page.getRecords().get(i).getId().equals(buildFacilityId)){
                     responeVO.setStatus(1);
                 }else{
                     responeVO.setStatus(0);

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

@@ -9,11 +9,6 @@ public class BuildFacilityRelateRequestVO {
      */
     private Integer buildId;
 
-    /**
-     * 建筑信息表-设施ID
-     */
-    private Integer buildFacilityId;
-
     /**
      * 页数
      */

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

@@ -9,11 +9,6 @@ public class BuildFacilityRequestVO {
      */
     private Integer baseBuildFacilityId;
 
-    /**
-     * 建筑设施表-设备ID
-     */
-    private String relateDeviceId;
-
     /**
      * 页数
      */