优化地理设施-导入接口，全量查询设施类型

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

@@ -19,6 +19,7 @@ import java.util.List;
 @Repository
 public interface BaseFacilityTypeMapper extends CrudMapper<BaseFacilityType> {
     List<BaseGgpFacilityTypeNumVO> typeNumList(@Param("tenantId") Integer tenantId);
+    List<BaseGgpFacilityTypeNumVO> facilitTypeNumList();
     List<BaseGgpFacilityTypeNumVO> typeNormalNumList(@Param("tenantId") Integer tenantId);
     List<BaseGgpFacilityTypeNumVO> typeUpkeepNumList(@Param("tenantId") Integer tenantId);
     List<BaseGgpFacilityTypeNumVO> typeCloseNumList(@Param("tenantId") Integer tenantId);

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

@@ -435,7 +435,7 @@ public class BaseGgpFacilityServiceImpl extends AbstractCrudService<BaseGgpFacil
                 int rot=3;
                 for (FacilityImportVo facilityImportVo:facilityImportVos) {
                     BaseGgpFacility baseGgpFacility = BeanMapperUtils.map(facilityImportVo, BaseGgpFacility.class);
-                    List<BaseGgpFacilityTypeNumVO> typeList = baseFacilityTypeMapper.typeNumList(SecurityUtils.getTenantId());
+                    List<BaseGgpFacilityTypeNumVO> typeList = baseFacilityTypeMapper.facilitTypeNumList();
                     if (CollectionUtils.isNotEmpty(typeList)) {
                         for (int j = 0; j < typeList.size(); j++) {
                             if (baseGgpFacility.getFacilityType().equals(typeList.get(j).getTypeName())) {

service-iot/service-iot-biz/src/main/resources/mapper/iot/BaseFacilityTypeMapper.xml

@@ -32,6 +32,10 @@
         </where>
         GROUP BY d.id
     </select>
+    <select id="facilitTypeNumList" resultType="com.usky.iot.service.vo.BaseGgpFacilityTypeNumVO">
+        SELECT d.id,d.type_name as typeName,d.type_code as typeCode,d.type_img as typeImg
+        FROM base_facility_type d
+    </select>
     <select id="typeNormalNumList" resultType="com.usky.iot.service.vo.BaseGgpFacilityTypeNumVO">
         SELECT d.id,IF(facility_type IS NULL,0,COUNT(*)) AS
         normalFacilityNum