xml名称冲突

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/FaultCaseController.java

 package com.yeejoin.equipmanage.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.equipmanage.common.dto.FaultCaseImportParam;
-import com.yeejoin.equipmanage.common.entity.*;
-import com.yeejoin.equipmanage.common.entity.publics.CommonResponse;
+import com.yeejoin.equipmanage.common.entity.Equipment;
+import com.yeejoin.equipmanage.common.entity.FaultCase;
+import com.yeejoin.equipmanage.common.entity.SignalClassify;
 import com.yeejoin.equipmanage.common.entity.vo.EquiplistSpecificBySystemVO;
 import com.yeejoin.equipmanage.common.enums.EmergencyLevelEum;
 import com.yeejoin.equipmanage.common.utils.CommonResponseUtil;
 import com.yeejoin.equipmanage.common.utils.StringUtil;
 import com.yeejoin.equipmanage.common.vo.EquipmentManageVo;
-import com.yeejoin.equipmanage.common.vo.EquipmentVo;
 import com.yeejoin.equipmanage.service.*;
 import com.yeejoin.equipmanage.utils.FileHelper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import liquibase.pro.packaged.S;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
-import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;

amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

@@ -7713,36 +7713,6 @@
         AND equipIds != ''
     </select>
 
-    <select id="getEquipIndexList" resultType="java.util.Map">
-        SELECT
-        equipment_specific_id AS equipmentSpecificId,
-        update_date AS updateDate,
-        equipment_index_key AS equipmentIndexKey
-        FROM
-        (
-        SELECT
-        equipment_specific_id,
-        update_date,
-        equipment_index_key,
-        ROW_NUMBER() OVER ( PARTITION BY equipment_specific_id ORDER BY update_date DESC ) AS rn
-        FROM
-        wl_equipment_specific_index
-        WHERE
-        equipment_index_key IN ( 'ONL_DrainOilValve_Open', 'ONL_DrainOilValve_Close' )
-        AND `value` = 'true'
-        AND equipment_specific_id IN
-        <foreach collection="collect" item="item" index="index" open="(" close=")" separator=",">
-            #{item}
-        </foreach>
-        ) t
-        WHERE
-        t.rn = 1
-        GROUP BY
-        equipment_specific_id
-        ORDER BY
-        update_date DESC
-    </select>
-
     <select id="getSystemStateByIndexKey" resultType="java.util.Map">
         SELECT
             IFNULL(systemStatus, '--') AS status