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

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

@@ -4,6 +4,7 @@ import com.usky.iot.domain.BaseFacilityType;
 import com.usky.common.mybatis.core.CrudMapper;
 import com.usky.iot.service.vo.BaseGgpFacilityTypeNumVO;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
@@ -15,6 +16,7 @@ import java.util.List;
  * @author han
  * @since 2023-06-06
  */
+@Repository
 public interface BaseFacilityTypeMapper extends CrudMapper<BaseFacilityType> {
     List<BaseGgpFacilityTypeNumVO> typeNumList(@Param("tenantId") Integer tenantId);
     List<BaseGgpFacilityTypeNumVO> typeNormalNumList(@Param("tenantId") Integer tenantId);

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

@@ -10,11 +10,13 @@ import com.usky.common.core.bean.CommonPage;
 import com.usky.common.core.util.UUIDUtils;
 import com.usky.common.security.utils.SecurityUtils;
 import com.usky.iot.domain.*;
+import com.usky.iot.mapper.BaseFacilityTypeMapper;
 import com.usky.iot.mapper.BaseGgpFacilityMapper;
 import com.usky.iot.service.*;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.iot.service.vo.BaseGgpFacilityExportVo;
 import com.usky.iot.service.vo.BaseGgpFacilityRequest;
+import com.usky.iot.service.vo.BaseGgpFacilityTypeNumVO;
 import com.usky.iot.service.vo.BaseGgpFacilityVO;
 import com.usky.system.model.LoginUser;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,7 +48,7 @@ public class BaseGgpFacilityServiceImpl extends AbstractCrudService<BaseGgpFacil
     @Autowired
     private BaseBuildService baseBuildService;
     @Autowired
-    private BaseFacilityTypeService baseFacilityTypeService;
+    private BaseFacilityTypeMapper baseFacilityTypeMapper;
 
     @Override
     public boolean add(BaseGgpFacility baseGgpFacility) {
@@ -96,8 +98,7 @@ public class BaseGgpFacilityServiceImpl extends AbstractCrudService<BaseGgpFacil
                 .orderByDesc(BaseGgpFacility::getId);
         List<BaseGgpFacility> baseGgpFacilityList = this.list(queryWrapper);
         List<BaseGgpFacilityExportVo> list = new ArrayList<>();
-        LambdaQueryWrapper<BaseFacilityType> lambdaQuery = Wrappers.lambdaQuery();
-        List<BaseFacilityType> typeList = baseFacilityTypeService.list(lambdaQuery);
+        List<BaseGgpFacilityTypeNumVO> typeList = baseFacilityTypeMapper.typeNumList(1);
         if (CollectionUtils.isNotEmpty(baseGgpFacilityList)) {
             for (int i = 0; i < baseGgpFacilityList.size(); i++) {
                 BaseGgpFacilityExportVo baseGgpFacilityExportVo = new BaseGgpFacilityExportVo();