修改楼层

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

@@ -95,7 +95,7 @@ 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) {
+        if (floorId == -99L && subId != null) {
             return ResultData.success(labSparseHardwareService.selectSpeakerBySubId(subId));
         }
         return ResultData.success(labSparseHardwareService.selectSpeakerByFloorId(floorId, subId));

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

@@ -812,7 +812,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, null, subjectId);
+                R deviceList = remoteSpeakService.getDeviceList(1, count + 10, -99L, subjectId);
                 log.info("关闭喇叭-远程调用喇叭列表返回内容： deviceList={}", JSON.toJSONString(deviceList));
                 if (deviceList.getCode() == 200) {
                     List<Map<String, Object>> mapList = (List<Map<String, Object>>) deviceList.getData();
@@ -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, null, subjectId);
+                R deviceList = remoteSpeakService.getDeviceList(1, count + 10, -99L, subjectId);
                 log.info("打开喇叭-远程调用喇叭列表返回内容： deviceList={}", JSON.toJSONString(deviceList));
                 if (deviceList.getCode() == 200) {
                     List<PlayVo> playVoList = new ArrayList<>();