2022-12-30 一体机调用的接口，排除一键灭火类型

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/mapper/LabHardwareMapper.java

@@ -30,6 +30,15 @@ public interface LabHardwareMapper {
 
 
     /**
+     * 查询硬件列表-根据实验室IDS(排除一键灭火类型)
+     *
+     * @param ids 实验室IDS
+     * @return 硬件集合
+     */
+    List<LabHardware> selLabHardwareBySubIds(Long... ids);
+
+
+    /**
      * 查询硬件列表-根据实验室IDS
      *
      * @param ids 实验室IDS

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabSubjectManagerService.java

@@ -1056,7 +1056,7 @@ public class LabSubjectManagerService {
      * @return
      */
     public List<HardwareCVO> queryHardwareCVOSBySubId(Long id) {
-        List<LabHardware> labSensors = hardwareMapper.selectLabHardwareBySubIds(id);
+        List<LabHardware> labSensors = hardwareMapper.selLabHardwareBySubIds(id);
         return Optional.ofNullable(labSensors).orElseGet(Collections::emptyList)
                 .stream()
                 .map(a -> getHardwareCVO(a))

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabHardwareMapper.xml

@@ -212,6 +212,15 @@
             #{id}
         </foreach>
     </select>
+
+    <!--   通过实验室ids查询设备 -->
+    <select id="selLabHardwareBySubIds" resultMap="LabHardwareResult">
+        <include refid="selectLabHardwareVo"/>
+        where xx.is_pcfire = 0 and xx. xx.subject_id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
     <select id="queryBySubjectId" resultMap="LabHardwareResult">
         <include refid="selectLabHardwareVo"/>
         where xx.subject_id = #{subjectId}