异常情况打印信息优化

648540858

2022-09-23 4c6c77be7a8395a82da4ddb85169e62e130e8713

异常情况打印信息优化

 src/main/java/com/genersoft/iot/vmp/conf/SystemInfoTimerTask.java

@@ -1,7 +1,10 @@
package com.genersoft.iot.vmp.conf;

import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.query.cmd.AlarmQueryMessageHandler;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.utils.SystemInfoUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -13,6 +16,8 @@
 */
@Component
public class SystemInfoTimerTask {

    private Logger logger = LoggerFactory.getLogger(SystemInfoTimerTask.class);

    @Autowired
    private IRedisCatchStorage redisCatchStorage;
@@ -27,7 +32,7 @@
            Map<String, String> networkInterfaces = SystemInfoUtils.getNetworkInterfaces();
            redisCatchStorage.addNetInfo(networkInterfaces);
        } catch (InterruptedException e) {
            e.printStackTrace();
            logger.error("[获取系统信息失败] {}", e.getMessage());
        }

    }

 src/main/java/com/genersoft/iot/vmp/conf/VersionInfo.java

@@ -2,35 +2,23 @@

import com.genersoft.iot.vmp.common.VersionPo;
import com.genersoft.iot.vmp.utils.GitUtil;
import com.genersoft.iot.vmp.utils.JarFileUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.util.Map;

@Component
public class VersionInfo {

    @Autowired
    VersionConfig config;
    @Autowired
    GitUtil gitUtil;
    @Autowired
    JarFileUtils jarFileUtils;

    public VersionPo getVersion() {
        VersionPo versionPo = new VersionPo();
        Map<String,String> map=jarFileUtils.readJarFile();
        versionPo.setGIT_Revision(gitUtil.getGitCommitId());
        versionPo.setCreate_By(map.get("Created-By"));
        versionPo.setGIT_BRANCH(gitUtil.getBranch());
        versionPo.setGIT_URL(gitUtil.getGitUrl());
        versionPo.setBUILD_DATE(gitUtil.getBuildDate());
        versionPo.setArtifactId(config.getArtifactId());
        versionPo.setGIT_Revision_SHORT(gitUtil.getCommitIdShort());
        versionPo.setVersion(config.getVersion());
        versionPo.setProject(config.getDescription());
        versionPo.setBuild_Jdk(map.get("Build-Jdk"));
        versionPo.setVersion(gitUtil.getBuildVersion());

        return versionPo;
    }

 src/main/java/com/genersoft/iot/vmp/gb28181/auth/RegisterLogicHandler.java

File was deleted

 src/main/java/com/genersoft/iot/vmp/gb28181/event/alarm/AlarmEventListener.java

@@ -51,7 +51,6 @@
                }
                // 移除已关闭的连接
                it.remove();
                // e.printStackTrace();
            }
        }
    }

 src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java

@@ -3,23 +3,15 @@
import java.util.ArrayList;

import java.util.List;



import javax.sip.ClientTransaction;

import javax.sip.Dialog;



import com.genersoft.iot.vmp.common.VideoManagerConstants;

import com.genersoft.iot.vmp.conf.UserSetting;

import com.genersoft.iot.vmp.gb28181.bean.SipMsgInfo;

import com.genersoft.iot.vmp.gb28181.bean.SipTransactionInfo;

import com.genersoft.iot.vmp.gb28181.bean.SsrcTransaction;

import com.genersoft.iot.vmp.utils.SerializeUtils;

import com.genersoft.iot.vmp.utils.redis.RedisUtil;

import gov.nist.javax.sip.message.SIPRequest;

import gov.nist.javax.sip.message.SIPResponse;

import gov.nist.javax.sip.stack.SIPDialog;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Component;

import org.springframework.util.ObjectUtils;

import org.springframework.util.StringUtils;



/**    

 * @description:视频流session管理器，管理视频预览、预览回放的通信句柄 


 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java

@@ -13,11 +13,7 @@
import com.genersoft.iot.vmp.service.IMediaServerService;
import com.genersoft.iot.vmp.service.bean.GPSMsgInfo;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.utils.GitUtil;
import com.genersoft.iot.vmp.utils.SerializeUtils;
import gov.nist.javax.sip.SIPConstants;
import gov.nist.javax.sip.SipProviderImpl;
import gov.nist.javax.sip.SipStackImpl;
import gov.nist.javax.sip.message.MessageFactoryImpl;
import gov.nist.javax.sip.message.SIPRequest;
import org.slf4j.Logger;
@@ -27,7 +23,6 @@
import org.springframework.context.annotation.DependsOn;
import org.springframework.context.annotation.Lazy;
import org.springframework.lang.Nullable;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils;


 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java

@@ -661,12 +661,8 @@
                    mediaListManager.removedChannelOnlineEventLister(gbStream.getApp(), gbStream.getStream());
                    try {
                        responseAck(serverTransaction, Response.TEMPORARILY_UNAVAILABLE, response.getMsg());
                    } catch (SipException e) {
                        throw new RuntimeException(e);
                    } catch (InvalidArgumentException e) {
                        throw new RuntimeException(e);
                    } catch (ParseException e) {
                        throw new RuntimeException(e);
                    } catch (SipException | InvalidArgumentException | ParseException e) {
                        logger.error("[命令发送失败] 国标级联 点播回复: {}", e.getMessage());
                    }
                }
            });
@@ -733,12 +729,8 @@
                                        mediaTransmissionTCP, channelId, addressStr, ssrc, requesterId);
                            }
                        }
                    } catch (InvalidArgumentException e) {
                        throw new RuntimeException(e);
                    } catch (ParseException e) {
                        throw new RuntimeException(e);
                    } catch (SipException e) {
                        throw new RuntimeException(e);
                    } catch (InvalidArgumentException | ParseException | SipException e) {
                        logger.error("[命令发送失败] 国标级联 点播回复: {}", e.getMessage());
                    }



 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/info/InfoRequestProcessor.java

@@ -115,23 +115,15 @@
                        // 失败的回复

                        try {

                            responseAck(serverTransaction, eventResult.statusCode, eventResult.msg);

                        } catch (SipException e) {

                            e.printStackTrace();

                        } catch (InvalidArgumentException e) {

                            e.printStackTrace();

                        } catch (ParseException e) {

                            e.printStackTrace();

                        } catch (SipException | InvalidArgumentException | ParseException e) {

                            logger.error("[命令发送失败] 国标级联 录像控制: {}", e.getMessage());

                        }

                    }, eventResult -> {

                        // 成功的回复

                        try {

                            responseAck(serverTransaction, eventResult.statusCode);

                        } catch (SipException e) {

                            e.printStackTrace();

                        } catch (InvalidArgumentException e) {

                            e.printStackTrace();

                        } catch (ParseException e) {

                            e.printStackTrace();

                        } catch (SipException | InvalidArgumentException | ParseException e) {

                            logger.error("[命令发送失败] 国标级联 录像控制: {}", e.getMessage());

                        }

                    });

                }


 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/AlarmNotifyMessageHandler.java

@@ -217,12 +217,8 @@
        // 回复200 OK
        try {
            responseAck(getServerTransaction(evt), Response.OK);
        } catch (SipException e) {
            throw new RuntimeException(e);
        } catch (InvalidArgumentException e) {
            throw new RuntimeException(e);
        } catch (ParseException e) {
            throw new RuntimeException(e);
        } catch (SipException | InvalidArgumentException | ParseException e) {
            logger.error("[命令发送失败] 国标级联 报警通知回复: {}", e.getMessage());
        }
        Element deviceIdElement = rootElement.element("DeviceID");
        String channelId = deviceIdElement.getText().toString();

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java

@@ -78,12 +78,8 @@
                    deviceService.online(device);
                }
            }
        } catch (SipException e) {
            e.printStackTrace();
        } catch (InvalidArgumentException e) {
            e.printStackTrace();
        } catch (ParseException e) {
            e.printStackTrace();
        } catch (SipException | InvalidArgumentException | ParseException e) {
            logger.error("[命令发送失败] 国标级联 心跳回复: {}", e.getMessage());
        }
    }


 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/MediaStatusNotifyMessageHandler.java

@@ -68,12 +68,8 @@
        // 回复200 OK
        try {
            responseAck(getServerTransaction(evt), Response.OK);
        } catch (SipException e) {
            e.printStackTrace();
        } catch (InvalidArgumentException e) {
            e.printStackTrace();
        } catch (ParseException e) {
            e.printStackTrace();
        } catch (SipException | InvalidArgumentException | ParseException e) {
            logger.error("[命令发送失败] 国标级联 录像流推送完毕，回复200OK: {}", e.getMessage());
        }
        CallIdHeader callIdHeader = (CallIdHeader)evt.getRequest().getHeader(CallIdHeader.NAME);
        String NotifyType =getText(rootElement, "NotifyType");

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/AlarmQueryMessageHandler.java

@@ -59,12 +59,8 @@
        logger.info("不支持alarm查询");
        try {
            responseAck(getServerTransaction(evt), Response.NOT_FOUND, "not support alarm query");
        } catch (SipException e) {
            e.printStackTrace();
        } catch (InvalidArgumentException e) {
            e.printStackTrace();
        } catch (ParseException e) {
            e.printStackTrace();
        } catch (SipException | InvalidArgumentException | ParseException e) {
            logger.error("[命令发送失败] 国标级联 alarm查询回复200OK: {}", e.getMessage());
        }

    }

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/CatalogQueryMessageHandler.java

@@ -100,12 +100,8 @@
                // 回复无通道
                cmderFroPlatform.catalogQuery(null, parentPlatform, sn, fromHeader.getTag(), 0);
            }
        } catch (SipException e) {
            e.printStackTrace();
        } catch (InvalidArgumentException e) {
            e.printStackTrace();
        } catch (ParseException e) {
            e.printStackTrace();
        } catch (SipException | InvalidArgumentException | ParseException e) {
            logger.error("[命令发送失败] 国标级联 目录查询: {}", e.getMessage());
        }

    }

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/BroadcastResponseMessageHandler.java

@@ -63,7 +63,7 @@


        } catch (ParseException | SipException | InvalidArgumentException e) {
            e.printStackTrace();
            logger.error("[命令发送失败] 国标级联 语音喊话: {}", e.getMessage());
        }
    }


 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/ConfigDownloadResponseMessageHandler.java

@@ -63,12 +63,8 @@
            msg.setKey(key);
            msg.setData(json);
            deferredResultHolder.invokeAllResult(msg);
        } catch (SipException e) {
            e.printStackTrace();
        } catch (InvalidArgumentException e) {
            e.printStackTrace();
        } catch (ParseException e) {
            e.printStackTrace();
        } catch (SipException | InvalidArgumentException | ParseException e) {
            logger.error("[命令发送失败] 国标级联 设备配置查询: {}", e.getMessage());
        }

    }

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceControlResponseMessageHandler.java

@@ -58,12 +58,8 @@
            msg.setKey(key);
            msg.setData(json);
            deferredResultHolder.invokeAllResult(msg);
        } catch (SipException e) {
            e.printStackTrace();
        } catch (InvalidArgumentException e) {
            e.printStackTrace();
        } catch (ParseException e) {
            e.printStackTrace();
        } catch (SipException | InvalidArgumentException | ParseException e) {
            logger.error("[命令发送失败] 国标级联 设备控制: {}", e.getMessage());
        }
    }


 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceStatusResponseMessageHandler.java

@@ -60,12 +60,8 @@
        // 回复200 OK
        try {
            responseAck(getServerTransaction(evt), Response.OK);
        } catch (SipException e) {
            e.printStackTrace();
        } catch (InvalidArgumentException e) {
            e.printStackTrace();
        } catch (ParseException e) {
            e.printStackTrace();
        } catch (SipException | InvalidArgumentException | ParseException e) {
            logger.error("[命令发送失败] 国标级联 设备状态应答回复200OK: {}", e.getMessage());
        }
        Element deviceIdElement = element.element("DeviceID");
        Element onlineElement = element.element("Online");

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/RecordInfoResponseMessageHandler.java

@@ -147,7 +147,7 @@
                                }
                            }
                        } catch (DocumentException e) {
                            throw new RuntimeException(e);
                            logger.error("xml解析异常： ", e);
                        } finally {
                            taskQueueHandlerRun = false;
                        }
@@ -155,13 +155,9 @@
                });
            }

        } catch (SipException e) {
            e.printStackTrace();
        } catch (InvalidArgumentException e) {
            e.printStackTrace();
        } catch (ParseException e) {
            e.printStackTrace();
        }finally {
        } catch (SipException | InvalidArgumentException | ParseException e) {
            logger.error("[命令发送失败] 国标级联 国标录像: {}", e.getMessage());
        } finally {
            taskQueueHandlerRun = false;
        }
    }

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/timeout/impl/TimeoutProcessorImpl.java

@@ -1,8 +1,11 @@
package com.genersoft.iot.vmp.gb28181.transmit.event.timeout.impl;

import com.genersoft.iot.vmp.conf.SystemInfoTimerTask;
import com.genersoft.iot.vmp.gb28181.event.SipSubscribe;
import com.genersoft.iot.vmp.gb28181.transmit.SIPProcessorObserver;
import com.genersoft.iot.vmp.gb28181.transmit.event.timeout.ITimeoutProcessor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -12,6 +15,8 @@

@Component
public class TimeoutProcessorImpl implements InitializingBean, ITimeoutProcessor {

    private Logger logger = LoggerFactory.getLogger(TimeoutProcessorImpl.class);

    @Autowired
    private SIPProcessorObserver processorObserver;
@@ -36,7 +41,7 @@
            sipSubscribe.removeErrorSubscribe(callId);
            sipSubscribe.removeOkSubscribe(callId);
        } catch (Exception e) {
            e.printStackTrace();
            logger.error("[超时事件失败]: {}", e.getMessage());
        }
    }
}

 src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushUploadFileHandler.java

@@ -93,7 +93,6 @@
            try {
                gBMap.put(streamPushExcelDto.getApp() + streamPushExcelDto.getStream(), streamPushExcelDto.getGbId());
            }catch (IllegalArgumentException e) {
                e.printStackTrace();
                errorGBList.add(streamPushExcelDto.getGbId() + "(不同的app+stream使用了相同的国标ID)");
                return;
            }

 src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisGbPlayMsgListener.java

@@ -156,7 +156,7 @@
                                            try {
                                                playMsgCallback.handler(responseSendItemMsg);
                                            } catch (ParseException e) {
                                                throw new RuntimeException(e);
                                                logger.error("[REDIS消息处理异常] ", e);
                                            }
                                        }
                                        break;

 src/main/java/com/genersoft/iot/vmp/utils/GpsUtil.java

@@ -17,49 +17,6 @@
    public static BaiduPoint Wgs84ToBd09(String xx, String yy) {


//        try {
//            Socket s = new Socket("api.map.baidu.com", 80);
//            BufferedReader br = new BufferedReader(new InputStreamReader(s.getInputStream(), "UTF-8"));
//            OutputStream out = s.getOutputStream();
//            StringBuffer sb = new StringBuffer("GET /ag/coord/convert?from=0&to=4");
//            sb.append("&x=" + xx + "&y=" + yy);
//            sb.append("&callback=BMap.Convertor.cbk_3976 HTTP/1.1\r\n");
//            sb.append("User-Agent: Java/1.6.0_20\r\n");
//            sb.append("Host: api.map.baidu.com:80\r\n");
//            sb.append("Accept: text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2\r\n");
//            sb.append("Connection: Close\r\n");
//            sb.append("\r\n");
//            out.write(sb.toString().getBytes());
//            String json = "";
//            String tmp = "";
//            while ((tmp = br.readLine()) != null) {
//                // logger.info(tmp);
//                json += tmp;
//            }
//
//            s.close();
//            int start = json.indexOf("cbk_3976");
//            int end = json.lastIndexOf("}");
//            if (start != -1 && end != -1 && json.contains("\"x\":\"")) {
//                json = json.substring(start, end);
//                String[] point = json.split(",");
//                String x = point[1].split(":")[1].replace("\"", "");
//                String y = point[2].split(":")[1].replace("\"", "");
//                BaiduPoint bdPoint= new BaiduPoint();
//                bdPoint.setBdLng(new String(decode(x)));
//                bdPoint.setBdLat(new String(decode(y)));
//                return bdPoint;
//                //return (new String(decode(x)) + "," + new String(decode(y)));
//            } else {
//                logger.info("gps坐标无效！！");
//            }
//            out.close();
//            br.close();
//        } catch (Exception e) {
//            e.printStackTrace();
//        }


        double lng = Double.parseDouble(xx);
        double lat = Double.parseDouble(yy);
        Double[] gcj02 = Coordtransform.WGS84ToGCJ02(lng, lat);

 src/main/java/com/genersoft/iot/vmp/utils/IpUtil.java

File was deleted

 src/main/java/com/genersoft/iot/vmp/utils/JarFileUtils.java

File was deleted

 src/main/java/com/genersoft/iot/vmp/utils/SerializeUtils.java

File was deleted

 src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/media/MediaController.java

@@ -96,7 +96,7 @@
            try {
                Thread.sleep(1000);
            } catch (InterruptedException e) {
                e.printStackTrace();
                logger.error("[线程休眠失败]， {}", e.getMessage());
            }
            if (useSourceIpAsStreamIp != null && useSourceIpAsStreamIp) {
                String host = request.getHeader("Host");