查询设备从10调整到100

zd-modules/zd-algorithm/src/main/java/com/zd/alg/forward/listener/StartListener.java

@@ -1,16 +1,13 @@
 package com.zd.alg.forward.listener;
 
 import com.zd.alg.forward.properties.FireProperties;
-import com.zd.common.core.exception.ServiceException;
 import com.zd.alg.forward.serivce.FireImageService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
-import java.io.IOException;
 import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
 
 /**
  * 监听Spring容器启动完成，完成后启动Netty服务器
@@ -30,20 +27,20 @@ public class StartListener implements CommandLineRunner {
 
     @Override
     public void run(String... args) {
-        scheduledExecutorService.scheduleWithFixedDelay(() -> {
-            try {
-                String streamUrl = fireProperties.getStreamUrl();
-                if (streamUrl == null) {
-                    log.error("=========调用产生异常：未配置流媒体地址============");
-                    return;
-                }
-                fireImageService.catchImage();
-            } catch (ServiceException | IOException e) {
-                //异常回调,防止系统因异常问题被杀死
-                log.error("=========调用产生异常：{}============", e.getMessage());
-                run();
-            }
-        },0,fireProperties.getWaitTime(), TimeUnit.SECONDS);
+//        scheduledExecutorService.scheduleWithFixedDelay(() -> {
+//            try {
+//                String streamUrl = fireProperties.getStreamUrl();
+//                if (streamUrl == null) {
+//                    log.error("=========调用产生异常：未配置流媒体地址============");
+//                    return;
+//                }
+//                fireImageService.catchImage();
+//            } catch (ServiceException | IOException e) {
+//                //异常回调,防止系统因异常问题被杀死
+//                log.error("=========调用产生异常：{}============", e.getMessage());
+//                run();
+//            }
+//        },0,fireProperties.getWaitTime(), TimeUnit.SECONDS);
     }
 
 }

zd-modules/zd-algorithm/src/main/java/com/zd/alg/forward/serivce/FireImageService.java

@@ -12,6 +12,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.bytedeco.javacv.FFmpegFrameGrabber;
 import org.bytedeco.javacv.Frame;
 import org.springframework.http.HttpEntity;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestTemplate;
@@ -58,6 +59,21 @@ public class FireImageService {
      */
     private static final String IMAGE_FORMAT = "jpg";
 
+    @Scheduled(cron = "0/5 * * * * ?")
+    public void camera(){
+        try {
+            String streamUrl = fireProperties.getStreamUrl();
+            if (streamUrl == null) {
+                log.error("=========调用产生异常：未配置流媒体地址============");
+                return;
+            }
+            catchImage();
+        } catch (ServiceException | IOException e) {
+            //异常回调,防止系统因异常问题被杀死
+            log.error("=========调用产生异常：{}============", e.getMessage());
+        }
+    }
+
     public void catchImage() throws IOException {
         String streamUrl = fireProperties.getStreamUrl();
         if (streamUrl == null) {

zd-modules/zd-algorithm/src/main/java/com/zd/alg/forward/serivce/SendSginAccessLogService.java

@@ -148,7 +148,7 @@ public class SendSginAccessLogService {
         }
         String loudspeakerIp1 = algorithmYml.getLoudspeakerIp1();
         String loudspeakerIp2 = algorithmYml.getLoudspeakerIp2();
-        R deviceList = remoteSpeakService.getDeviceList(1, 10, 5L);
+        R deviceList = remoteSpeakService.getDeviceList(1, 100, 5L);
         if (deviceList.getCode() == HttpStatus.SUCCESS) {
             List<Map<String, Object>> mapList = (List<Map<String, Object>>) deviceList.getData();
             for (Map<String, Object> map : mapList) {

zd-modules/zd-algorithm/src/main/java/com/zd/alg/speaker/controller/SpeakerController.java

@@ -106,6 +106,7 @@ public class SpeakerController {
             return AjaxResult.error("获取设备列表失败！");
         }
         JSONObject jsonObject=JSONObject.parseObject(responseStr);
+        logger.info("jsonObject.toString():"+jsonObject.toString());
         JSONArray jsonArray=JSONArray.parseArray(jsonObject.getString("rows"));
         for(Map<String,Object> map: mapList){
             for(int i=0;i<jsonArray.size();i++){

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/LabRiskPlanLevel.java

@@ -142,7 +142,7 @@ public class LabRiskPlanLevel implements Serializable {
     private String riskName;
 
     /**
-     * 预案名称
+     * 院校实验室名称
      */
     @TableField(exist = false)
     private String topName;

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

@@ -102,7 +102,7 @@ public class LabContentMachineMsgServiceImpl implements ILabContentMachineMsgSer
     public int insert(LabMessageContent labMessageContent) {
 
         List<String> subIds = Arrays.asList(labMessageContent.getSubIds().split(","));
-
+        logger.error("一体机通知啊哈哈哈哈哈哈");
         LabContentMachineMsg labContentMachineMsg;
         for (String subId : subIds) {
             labContentMachineMsg = new LabContentMachineMsg();
@@ -117,10 +117,10 @@ public class LabContentMachineMsgServiceImpl implements ILabContentMachineMsgSer
             labContentMachineMsg.setDeptName(labMessageContent.getDeptName());
 
             insertLabContentMachineMsg(labContentMachineMsg);
-
+            logger.error("一体机通知消息={}",MqttConstants.TOPIC_LAB_CONTENT + subId);
             // 生成一条通知一个，此处不应该有重复的实验室ID
             commonSend.send(MqttConstants.TOPIC_LAB_CONTENT + subId, "收到一条新的消息通知！");
-            logger.info("发送实验室一体机消息通知：" + subId);
+            logger.error("发送实验室一体机消息通知：" + subId);
         }
 
         return 1;

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

@@ -367,7 +367,7 @@ public class LabExitLineServiceImpl implements ILabExitLineService
             List<LabAudioSynthesis> audioSynList = labAudioSynthesisMapper.selectLabAudioSynthesisList(audioSyn);
             if(audioSynList.size()>0){
                 LabAudioSynthesis audioSyntheses = audioSynList.get(0);
-                R deviceList = remoteSpeakService.getDeviceList(1,10,5L);
+                R deviceList = remoteSpeakService.getDeviceList(1,100,5L);
                 if(deviceList.getCode()==200){
                     List<Map<String,Object>> mapList = (List <Map <String, Object>>) deviceList.getData();
                     List<PlayVo> playVoList = new ArrayList<>();
@@ -521,7 +521,7 @@ public class LabExitLineServiceImpl implements ILabExitLineService
                 if(audioSynList.size()>0){
                     LabAudioSynthesis audioSyntheses = audioSynList.get(0);
                     //获取喇叭列表
-                    R deviceList = remoteSpeakService.getDeviceList(1,10, 5L);
+                    R deviceList = remoteSpeakService.getDeviceList(1,100, 5L);
                     if(deviceList.getCode()==200){
                         List<Map<String,Object>> mapList = (List <Map <String, Object>>) deviceList.getData();
 

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

@@ -377,7 +377,7 @@ public class LabExitLineVertexServiceImpl implements ILabExitLineVertexService {
             List<LabAudioSynthesis> audioSyntheses = labAudioSynthesisMapper.selectLabAudioSynthesisList(labAudioSynthesis);
             if(audioSyntheses.size()>0){
                 //预案调用喇叭
-                R deviceList = remoteSpeakService.getDeviceList(1,10,labExitLineEvacuationVo.getFloorId());
+                R deviceList = remoteSpeakService.getDeviceList(1,100,labExitLineEvacuationVo.getFloorId());
                 if(deviceList.getCode()==200){
                     List<Map<String,Object>> mapList = (List <Map <String, Object>>) deviceList.getData();
                     for(Map<String,Object> map:mapList){

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

@@ -157,6 +157,7 @@ public class LabMessageContentServiceImpl implements ILabMessageContentService {
 
         if (labMessageContent.getMessClass() == 3 && StringUtils.isNotBlank(labMessageContent.getSubIds())) {
             // 一体机消息发送mqtt 通知，并生成相关数据
+            logger.info("一体机消息发送通知，应该是弹窗");
             labContentMachineMsgService.insert(labMessageContent);
         }
         return true;

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

@@ -2,6 +2,7 @@ package com.zd.laboratory.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONObject;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -1133,15 +1134,19 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                     //这里查询预案下的合成音乐
                     LabAudioSynthesis labAudioSynthesis = new LabAudioSynthesis();
                     labAudioSynthesis.setRiskPlanId(labRiskPlanLevel.getRiskPlanId());
+                    log.error("预案id={}",labRiskPlanLevel.getRiskPlanId());
                     List<LabAudioSynthesis> audioSyntheses = labAudioSynthesisMapper.selectLabAudioSynthesisList(labAudioSynthesis);
+                    log.error("查询的音乐列表=audioSyntheses.size= {}",audioSyntheses.size());
+                    log.error("查询的音乐列表=audioSyntheses.toString= {}",audioSyntheses.toString());
                     if (audioSyntheses.size() > 0) {
                         //预案调用喇叭
-                        R deviceList = remoteSpeakService.getDeviceList(1, 10, labRiskPlanLevel.getFloorId(), subFunction.getSubId());
-                        log.info("调用喇叭查询内容： deviceList={}",deviceList.toString());
+                        log.error("调用喇叭");
+                        R deviceList = remoteSpeakService.getDeviceList(1, 100, labRiskPlanLevel.getFloorId(), subFunction.getSubId());
+                        log.error("调用喇叭查询内容： deviceList={}", JSON.toJSONString(deviceList));
                         if (deviceList.getCode() == 200) {
                             List<Map<String, Object>> mapList = (List<Map<String, Object>>) deviceList.getData();
                             for (Map<String, Object> map : mapList) {
-                                log.info("喇叭日志=============================" + map);
+                                log.error("喇叭日志=============================" + map);
                                 if (StringUtils.isNotNull(map.get("deviceSn")) && StringUtils.isNotNull(map.get("port"))) {
                                     List<PlayVo> playVoList = new ArrayList<>();
                                     PlayVo playVo = new PlayVo();
@@ -1152,13 +1157,16 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                                     paramVo.setVol(Integer.parseInt(map.get("deviceVol").toString()));
                                     playVo.setParams(paramVo);
                                     playVoList.add(playVo);
-                                    remoteSpeakService.textParseUrlAppIps(audioSyntheses.get(0).getNewMusicUrl(), playVoList);
+                                    log.error("url={}",audioSyntheses.get(0).getNewMusicUrl());
+                                    log.error("playVoList={}",playVoList.toString());
+                                    R r = remoteSpeakService.textParseUrlAppIps(audioSyntheses.get(0).getNewMusicUrl(), playVoList);
+                                    log.error("调用喇叭返回信息：{}",JSON.toJSONString(r));
                                 }else {
-                                    log.info("喇叭deviceSn/port为空！");
+                                    log.error("喇叭deviceSn/port为空！");
                                 }
                             }
                         }else {
-                            log.info("远程查询喇叭信息错误！");
+                            log.error("远程查询喇叭信息错误！");
                         }
                     }
                 } catch (Exception e) {
@@ -1215,7 +1223,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                     labAudioSynthesis.setRiskPlanId(groupVo.getRiskPlanId());
                     List<LabAudioSynthesis> audioSyntheses = labAudioSynthesisMapper.selectLabAudioSynthesisList(labAudioSynthesis);
                     if (audioSyntheses.size() > 0) {
-                        R deviceList = remoteSpeakService.getDeviceList(1, 10, groupVo.getFloorId(), subFunction.getSubId());
+                        R deviceList = remoteSpeakService.getDeviceList(1, 100, groupVo.getFloorId(), subFunction.getSubId());
                         if (deviceList.getCode() == 200) {
                             List<Map<String, Object>> mapList = (List<Map<String, Object>>) deviceList.getData();
                             List<PlayVo> playVoList = new ArrayList<>();
@@ -1334,7 +1342,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                 labAudioSynthesis.setRiskPlanId(groupVo.getRiskPlanId());
                 List<LabAudioSynthesis> audioSyntheses = labAudioSynthesisMapper.selectLabAudioSynthesisList(labAudioSynthesis);
                 if (audioSyntheses.size() > 0) {
-                    R deviceList = remoteSpeakService.getDeviceList(1, 10, groupVo.getFloorId(), subFunction.getSubId());
+                    R deviceList = remoteSpeakService.getDeviceList(1, 100, groupVo.getFloorId(), subFunction.getSubId());
                     if (deviceList.getCode() == 200) {
                         List<Map<String, Object>> mapList = (List<Map<String, Object>>) deviceList.getData();
                         List<PlayVo> playVoList = new ArrayList<>();