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

service-iot/service-iot-biz/src/main/java/com/usky/iot/mapper/BaseBuildMapper.java

@@ -2,6 +2,7 @@ package com.usky.iot.mapper;
 
 import com.usky.iot.domain.BaseBuild;
 import com.usky.common.mybatis.core.CrudMapper;
+import org.springframework.stereotype.Repository;
 
 /**
  * <p>
@@ -11,6 +12,7 @@ import com.usky.common.mybatis.core.CrudMapper;
  * @author han
  * @since 2023-06-07
  */
+@Repository
 public interface BaseBuildMapper extends CrudMapper<BaseBuild> {
 
 }

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

@@ -16,6 +16,7 @@ import com.usky.common.core.util.BeanMapperUtils;
 import com.usky.common.core.util.UUIDUtils;
 import com.usky.common.security.utils.SecurityUtils;
 import com.usky.iot.domain.*;
+import com.usky.iot.mapper.BaseBuildMapper;
 import com.usky.iot.mapper.BaseFacilityTypeMapper;
 import com.usky.iot.mapper.BaseGgpFacilityMapper;
 import com.usky.iot.service.*;
@@ -54,8 +55,8 @@ public class BaseGgpFacilityServiceImpl extends AbstractCrudService<BaseGgpFacil
     private BaseFacilityBuildService baseFacilityBuildService;
     @Autowired
     private DmpDeviceInfoService dmpDeviceInfoService;
-//    @Autowired
-//    private BaseBuildService baseBuildService;
+    @Autowired
+    private BaseBuildMapper baseBuildMapper;
     @Autowired
     private BaseFacilityTypeMapper baseFacilityTypeMapper;
     @Autowired
@@ -306,12 +307,19 @@ public class BaseGgpFacilityServiceImpl extends AbstractCrudService<BaseGgpFacil
         LambdaQueryWrapper<BaseFacilityDevice> lambdaQuery = Wrappers.lambdaQuery();
         lambdaQuery.eq(BaseFacilityDevice::getFacilityId,id);
         List<BaseFacilityDevice> baseFacilityDeviceList = baseFacilityDeviceService.list(lambdaQuery);
+        LambdaQueryWrapper<BaseBuild> lambdaQuery3 = Wrappers.lambdaQuery();
+        lambdaQuery3.eq(BaseBuild::getFacilityId,id);
+        List<BaseBuild> baseFacilityBuildList = baseBuildMapper.selectList(lambdaQuery3);
         Map<String, Object> map = new HashMap<>();
         map.put("id", baseGgpFacilityList.get(0).getId());
         map.put("facilityName", baseGgpFacilityList.get(0).getFacilityName());
         map.put("facilityAddress", baseGgpFacilityList.get(0).getFacilityAddress());
         map.put("contact", baseGgpFacilityList.get(0).getContact());
         map.put("contactPhone", baseGgpFacilityList.get(0).getContactPhone());
+        map.put("buildId", null);
+        if (CollectionUtils.isNotEmpty(baseFacilityBuildList)){
+            map.put("buildId", baseFacilityBuildList.get(0).getId());
+        }
         LambdaQueryWrapper<DmpProductInfo> queryWrapper2 = Wrappers.lambdaQuery();
         queryWrapper2.eq(DmpProductInfo::getTenantId,SecurityUtils.getTenantId());
         List<DmpProductInfo> dmpProductInfoList = dmpProductInfoService.list(queryWrapper2);