新增根据实验室id查询喇叭接口

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabSparseHardwareController.java

@@ -95,10 +95,21 @@ public class LabSparseHardwareController extends BaseController {
     @RequestMapping(value = "/getSpeaker/{floorId}/{subId}")
     public ResultData<List<Map<String,Object>>> getSpeakerBySub(
             @PathVariable("floorId") Long floorId, @PathVariable("subId") Long subId) {
-
+        if (floorId == null && subId != null) {
+            return ResultData.success(labSparseHardwareService.selectSpeakerBySubId(subId));
+        }
         return ResultData.success(labSparseHardwareService.selectSpeakerByFloorId(floorId, subId));
     }
 
+    /**
+     * 根据实验室id获取喇叭列表
+     */
+    @ApiOperation(value = "根据实验室id获取喇叭列表")
+    @RequestMapping(value = "/getSpeakerBySubId/{subId}")
+    public ResultData<List<Map<String,Object>>> getSpeakerBySubId(@PathVariable("subId") Long subId) {
+        return ResultData.success(labSparseHardwareService.selectSpeakerBySubId(subId));
+    }
+
 
     /**
      * 新增疏散硬件

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

@@ -83,6 +83,13 @@ public interface LabSparseHardwareMapper
     List<Map<String,Object>> selectListByFloorId(@Param("floorId") Long floorId, @Param("subId") Long subId, @Param("type") int type);
 
     /**
+     * 根据实验室id查询喇叭列表
+     * @param subId
+     * @return
+     */
+    List<Map<String,Object>> selectListBySubId(@Param("subId") Long subId);
+
+    /**
      * 根据楼层查询设备列表
      * @param floorId
      * @return

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/ILabSparseHardwareService.java

@@ -76,6 +76,13 @@ public interface ILabSparseHardwareService
     List<Map<String,Object>> selectSpeakerByFloorId(Long floorId, Long subId);
 
     /**
+     * 根据实验室id查询喇叭列表
+     * @param subId
+     * @return
+     */
+    List<Map<String,Object>> selectSpeakerBySubId(Long subId);
+
+    /**
      * 查询所有喇叭的数量
      * @Param []
      * @Return java.lang.Integer

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

@@ -1010,7 +1010,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                 log.info("打开喇叭-远程调用查询喇叭列表，楼层id={}，实验室id={}", floorId, subjectId);
                 Integer count = labSparseHardwareService.selectSpeakerCount();
                 log.info("查询喇叭总数：{}",count);
-                R deviceList = remoteSpeakService.getDeviceList(1, count + 10, floorId, subjectId);
+                R deviceList = remoteSpeakService.getDeviceList(1, count + 10, null, subjectId);
                 log.info("打开喇叭-远程调用喇叭列表返回内容： deviceList={}", JSON.toJSONString(deviceList));
                 if (deviceList.getCode() == 200) {
                     List<PlayVo> playVoList = new ArrayList<>();

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

@@ -117,6 +117,11 @@ public class LabSparseHardwareServiceImpl implements ILabSparseHardwareService {
     }
 
     @Override
+    public List<Map<String,Object>> selectSpeakerBySubId(Long subId) {
+        return labSparseHardwareMapper.selectListBySubId(subId);
+    }
+
+    @Override
     public Integer selectSpeakerCount() {
         return labSparseHardwareMapper.selectSpeakerCount();
     }

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

@@ -114,6 +114,14 @@
             or (subject_id = #{subId} and device_type = 2)
         </if>
     </select>
+
+    <select id="selectListBySubId" resultType="java.util.Map">
+        SELECT t.hardware_num as hardwareNum,t.`name`,t.operate,t.port,t.device_vol as deviceVol FROM lab_sparse_hardware t LEFT JOIN lab_build_floor d ON t.floor_id = d.id
+        WHERE t.`type`= 2
+        AND device_type = 2
+        AND subject_id = #{subId}
+    </select>
+
     <select id="selectCameraByFloorId" resultType="java.lang.String">
        SELECT  t.hardware_num FROM  lab_sparse_hardware t LEFT JOIN lab_build_floor d ON t.floor_id = d.id
        WHERE t.floor_id=#{floorId} AND t.`type`=1