报错日志添加

zxl

2025-06-05 29d3c47cc6c903c09b386649fabaebc81cbeca27

 ycl-server/src/main/java/com/ycl/api/HK/HKApi.java

@@ -33,12 +33,50 @@

@Slf4j
public class HKApi {
    public static OSDResult getOsdByIP(String ip, String userName, String password) {
    public static OSDResult getOsdByIP(String serialNumber, String ip, String userName, String password) {
        OSDResult osdResult = new OSDResult();
        String hostUrl = "http://" + ip;
        try {
            //获取OSD
            String OSDString = getHttpResponse(hostUrl + ApiConstants.HK_OSD_PATH, userName, password);
            /**
             * 通过国标倒数第七位判断通道 0/全景 1/细节
             * 对于海康来说： 国标倒7 0/全景/通道2 1/细节/通道1
             * 对于大华来说： 国标倒7 0/全景/通道1 1/细节/通道2
             * 宇视单通道不考虑
             */
            String OSDString = null;
            if(StringUtils.isEmpty(serialNumber)) return null;
            if(serialNumber.charAt(ApiConstants.SerialNumber_Channel) == ApiConstants.SerialNumber_All ) {
                OSDString = getHttpResponse(hostUrl + ApiConstants.HK_OSD_PATH_2, userName, password);
            }else if(serialNumber.charAt(ApiConstants.SerialNumber_Channel) == ApiConstants.SerialNumber_Detail){
                OSDString = getHttpResponse(hostUrl + ApiConstants.HK_OSD_PATH_1, userName, password);
            }
            //通过设备类型判断（弃用）
//            if(serialNumber.charAt(ApiConstants.SerialNumber_Category) == 1 ){
//                //枪机
//                if(serialNumber.charAt(ApiConstants.SerialNumber_Channel) == 1){
//                    OSDString = getHttpResponse(hostUrl + ApiConstants.HK_OSD_PATH_1, userName, password);
//                }else if(serialNumber.charAt(ApiConstants.SerialNumber_Channel) == 0){
//                    OSDString = getHttpResponse(hostUrl + ApiConstants.HK_OSD_PATH_2, userName, password);
//                }
//            }else if(serialNumber.charAt(ApiConstants.SerialNumber_Category) == 2){
//                //球机
//                if(serialNumber.charAt(ApiConstants.SerialNumber_Channel) == 0){
//                    OSDString = getHttpResponse(hostUrl + ApiConstants.HK_OSD_PATH_1, userName, password);
//                }else if(serialNumber.charAt(ApiConstants.SerialNumber_Channel) == 1){
//                    OSDString = getHttpResponse(hostUrl + ApiConstants.HK_OSD_PATH_2, userName, password);
//                }
//            }else if(serialNumber.charAt(ApiConstants.SerialNumber_Category) == 3){
//                //卡口 单通道
//                OSDString = getHttpResponse(hostUrl + ApiConstants.HK_OSD_PATH_1, userName, password);
//            }else if(serialNumber.charAt(ApiConstants.SerialNumber_Category) == 4){
//                //高空
//                if(serialNumber.charAt(ApiConstants.SerialNumber_Channel) == 0){
//                    OSDString = getHttpResponse(hostUrl + ApiConstants.HK_OSD_PATH_1, userName, password);
//                }else if(serialNumber.charAt(ApiConstants.SerialNumber_Channel) == 1){
//                    OSDString = getHttpResponse(hostUrl + ApiConstants.HK_OSD_PATH_2, userName, password);
//                }
//            }
            if (OSDString == null) return null;

            //解析xml
@@ -70,7 +108,7 @@
                if (node.getNodeType() == Node.ELEMENT_NODE && "TextOverlay".equals(tagName1)) {
                    Element element = (Element) node;
                    String textContent = element.getElementsByTagName(tagName2).item(0).getTextContent();
                    //                log.info("TEXT : " + textContent);
                    log.info("HKTEXT : " + textContent);
                    if (i == 0) {
                        osdResult.setOSD1(textContent);
                    } else if (i == 1) {