Browse Source

优化地理信息-导出和地理设施-导入两个接口,使得地理设施系统-设施采集的地理设施信息的导入和导出共用一个模板2

james 3 weeks ago
parent
commit
c43f86278e

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

@@ -153,7 +153,7 @@ public class BaseGgpFacilityServiceImpl extends AbstractCrudService<BaseGgpFacil
                 baseGgpFacilityExportVo.setFacilityType("未知");
                 if (CollectionUtils.isNotEmpty(typeList)) {
                     for (int j = 0; j < typeList.size(); j++) {
-                        if (baseGgpFacilityList.get(i).getFacilityType().equals(typeList.get(j).getId())) {
+                        if (baseGgpFacilityList.get(i).getFacilityType().equals(typeList.get(j).getTypeCode())) {
                             baseGgpFacilityExportVo.setFacilityType(typeList.get(j).getTypeName());
                         }
                     }

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

@@ -20,7 +20,7 @@
         <result column="tenant_id" property="tenantId" />
     </resultMap>
     <select id="typeNumList" resultType="com.usky.iot.service.vo.BaseGgpFacilityTypeNumVO">
-        SELECT d.type_code,d.type_name as typeName,d.type_code as typeCode,d.type_img as typeImg,IF(facility_type IS
+        SELECT d.id,d.type_name as typeName,d.type_code as typeCode,d.type_img as typeImg,IF(facility_type IS
         NULL,0,COUNT(*)) AS
         typeFacilityNum
         FROM base_facility_type d