修改bug

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/EquipmentSpecificMapper.java

@@ -26,7 +26,7 @@ public interface EquipmentSpecificMapper extends BaseMapper<EquipmentSpecificVo>
 
     int deletPointBuFmeaId(@Param("fmeaId")Long fmeaId,@Param("importantEquipId")Long importantEquipId);
 
-    List<AssoEquipsVo>getAssoEquips(@Param("fmeaId")Long fmeaId, @Param("pageNumber")int pageNumber,@Param("pageSize") int pageSize);
+    List<AssoEquipsVo>getAssoEquips(@Param("fmeaId")Long fmeaId, @Param("indexIds")List<Long> indexIds, @Param("pageNumber")int pageNumber,@Param("pageSize") int pageSize);
     /**
      * 查询设备指标
      * @param fmeaId
@@ -83,4 +83,6 @@ public interface EquipmentSpecificMapper extends BaseMapper<EquipmentSpecificVo>
     int getOneByQrcode(@Param("qrCode") String qrCode);
 
     EquipmentSpecific getSpecificById(@Param("id") Long id);
+
+    Long getIndexByIndexId(@Param("indexId") Long indexId);
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/FmeaEquipmentPointMapper.java

@@ -32,4 +32,6 @@ public interface FmeaEquipmentPointMapper extends BaseMapper {
                           @Param("ids") List<Long> ids);
 
     List<FmeaEquipmentPoint> listFmeaByEquipIndexIdAndEquipId(@Param("specificIndexId") long specificIndexId, @Param("equipId") long equipId);
+
+    List<FmeaEquipmentPoint> getOneByFmeaId(@Param("fmeaId") Long fmeaId);
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/EquipmentSpecificServiceImpl.java

 package com.yeejoin.amos.fas.business.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.fas.business.dao.mapper.EquipmentSpecificMapper;
+import com.yeejoin.amos.fas.business.dao.mapper.FmeaEquipmentPointMapper;
 import com.yeejoin.amos.fas.business.param.FmeaBindParam;
 import com.yeejoin.amos.fas.business.service.intfc.EquipmentSpecificService;
 import com.yeejoin.amos.fas.business.service.intfc.IEquipmentCategoryService;
+import com.yeejoin.amos.fas.business.service.intfc.IFmeaService;
 import com.yeejoin.amos.fas.business.util.TreeUtil;
 import com.yeejoin.amos.fas.business.vo.AssoEquipsVo;
 import com.yeejoin.amos.fas.business.vo.EquipmentPointVo;
 import com.yeejoin.amos.fas.business.vo.EquipmentSpecificVo;
 import com.yeejoin.amos.fas.dao.entity.EquipmentCategory;
+import com.yeejoin.amos.fas.dao.entity.EquipmentSpecific;
+import com.yeejoin.amos.fas.dao.entity.Fmea;
 import com.yeejoin.amos.fas.dao.entity.FmeaEquipmentPoint;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -29,6 +35,8 @@ public class EquipmentSpecificServiceImpl implements EquipmentSpecificService {
     EquipmentSpecificMapper equipmentSpecificMapper;
     @Autowired
     IEquipmentCategoryService categoryService;
+    @Autowired
+    FmeaEquipmentPointMapper equipmentPointMapper;
 
     @Override
     public List<FmeaEquipmentPoint> upDateEquimentPoint(FmeaBindParam fmeaBindParam) {
@@ -53,7 +61,15 @@ public class EquipmentSpecificServiceImpl implements EquipmentSpecificService {
     public Map<String, Object> getAssoEquips(Long fmeaId, int pageNumber, int pageSize) {
         Map<String, Object> map = new HashMap<>();
         pageNumber = pageNumber*pageSize;
-        List<AssoEquipsVo> assoEquips = equipmentSpecificMapper.getAssoEquips(fmeaId, pageNumber, pageSize);
+        List<FmeaEquipmentPoint> fmeas = equipmentPointMapper.getOneByFmeaId(fmeaId);
+        List<Long> indexIds = new ArrayList<>();
+        if (0 < fmeas.size()) {
+            for (FmeaEquipmentPoint point : fmeas) {
+                Long indexId = equipmentSpecificMapper.getIndexByIndexId(point.getEquipmentPointId());
+                indexIds.add(indexId);
+            }
+        }
+        List<AssoEquipsVo> assoEquips = equipmentSpecificMapper.getAssoEquips(fmeaId, indexIds, pageNumber, pageSize);
         map.put("content",assoEquips);
         return map;
     }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IFmeaService.java

 package com.yeejoin.amos.fas.business.service.intfc;
 
 import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
+import com.yeejoin.amos.fas.dao.entity.Fmea;
 import org.springframework.data.domain.Page;
 
 import java.util.HashMap;
@@ -29,4 +30,5 @@ public interface IFmeaService {
      * 查询关联的关联对象个数
      */
     int queryControlObjCount(String[] ids);
+
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/vo/EquipmentSpecificVo.java

@@ -27,4 +27,7 @@ public class EquipmentSpecificVo {
     //系统名称
     private String systemName;
 
+    // 指标id
+    private String indexId;
+
 }

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_equipment_specific.xml

@@ -115,14 +115,14 @@
         </if>
     </select>
     <select id="getFireEquiments" resultType="com.yeejoin.amos.fas.business.vo.EquipmentSpeVo">
-        select
-        sto.equipment_specific_id as id ,
+        select DISTINCT
+        sto.equipment_specific_id as id,
         spec.code as f_code,
         det.name as f_name
         from
         wl_stock_detail as sto
         left join wl_equipment_detail as det on sto.equipment_detail_id = det.id
-        left join wl_equipment_specific   as spec on spec.equipment_detail_id = det.id
+        left join wl_equipment_specific  as spec on spec.equipment_detail_id = det.id
         left join wl_equipment as equ on det.equipment_id = equ.id
         left join f_equipment_fire_equipment as fire on sto.equipment_specific_id = fire.fire_equipment_id
         where sto.amount <![CDATA[>]]> 0
@@ -166,12 +166,16 @@
             </if>
     </select>
     <select id="getAssoEquips" resultType="com.yeejoin.amos.fas.business.vo.AssoEquipsVo">
-             select
+             select DISTINCT
                  sto.id as equipmentId,
                  spe.code as equipmentCode,
                  det.name as equipmentName ,
                  fqe.name as importantEquipName ,
-                 (select group_concat(concat( name, '##', state )) from  wl_equipment_index as equindex where equip.id = equindex.equipment_id and type_code = 'BREAKDOWN' group by equindex.equipment_id) as equipmentPointNames,
+                 (select group_concat(concat( name, '##', state )) from  wl_equipment_index as equindex where equip.id = equindex.equipment_id and type_code = 'BREAKDOWN' AND equindex.id IN
+                 <foreach collection="indexIds" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+                 group by equindex.equipment_id) as equipmentPointNames,
                  poin.important_equipment_id as importantEquipId,
                  fmea_id as  fmeaId
              from
@@ -250,4 +254,13 @@
         wl_equipment_specific wes
         WHERE wes.id=#{id}
     </select>
+
+    <select id="getIndexByIndexId" resultType="Long">
+        SELECT
+        equipment_index_id
+        FROM
+        wl_equipment_specific_index wesi
+        WHERE wesi.id=#{indexId}
+        limit 1
+    </select>
 </mapper>
\ No newline at end of file

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_fmea_equipment_point.xml

@@ -181,4 +181,17 @@
             equipment_point_id = #{specificIndexId} and important_equipment_id = #{equipId}
     </select>
 
+    <select id="getOneByFmeaId" resultType="com.yeejoin.amos.fas.dao.entity.FmeaEquipmentPoint">
+        select
+            id,
+            fmea_id as fmeaId,
+            equipment_point_id as equipmentPointId,
+            state,
+            important_equipment_id as importantEquipmentId
+        from
+            f_fmea_equipment_point
+        where
+            fmea_id = #{fmeaId}
+    </select>
+
 </mapper>
\ No newline at end of file