每日录像可用指标添加日志，修改大屏为查看当前月平均

zxl

11 小时以前 3b0516a2959e25576e4f3fda697a3b025d06c8c9

 ycl-server/src/main/java/com/ycl/api/YS/YSApi.java

@@ -3,29 +3,26 @@

import com.sun.jna.Pointer;
import com.sun.jna.ptr.IntByReference;
import com.ycl.api.DH.lib.ToolKits;
import com.ycl.api.DH.utils.DHApi;
import com.ycl.api.YS.lib.NetDEVSDKLib;
import com.ycl.api.YS.login.Login;
import com.ycl.api.YS.util.Common;
import com.ycl.platform.domain.entity.TMonitor;
import com.ycl.platform.domain.result.OSDResult;
import com.ycl.utils.StringUtils;
import enumeration.DeviceType;
import lombok.extern.slf4j.Slf4j;

import javax.swing.*;
import javax.swing.table.DefaultTableModel;
import java.nio.charset.StandardCharsets;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Vector;
import java.util.Date;
import java.util.regex.Pattern;

import static com.ycl.api.YS.lib.NetDEVSDKLib.NETDEV_LOGIN_PROTO_E.NETDEV_LOGIN_PROTO_ONVIF;

@Slf4j
public class YSApi {

    public static OSDResult getOsd(String ip, String userName, String password) {
        log.info("ip:{},用户:{}，密码:{}", ip, userName, password);
    public static OSDResult getOsd(TMonitor monitor, String ip, String userName, String password) {
        //登录
        NetDEVSDKLib.NETDEV_DEVICE_LOGIN_INFO_S stDevLoginInfo = new NetDEVSDKLib.NETDEV_DEVICE_LOGIN_INFO_S();
        NetDEVSDKLib.NETDEV_SELOG_INFO_S stSELogInfo = new NetDEVSDKLib.NETDEV_SELOG_INFO_S();
@@ -44,15 +41,17 @@
            NetDEVSDKLib.NETDEV_VIDEO_CHL_DETAIL_INFO_EX_S[] stVideoChlList = (NetDEVSDKLib.NETDEV_VIDEO_CHL_DETAIL_INFO_EX_S[]) new NetDEVSDKLib.NETDEV_VIDEO_CHL_DETAIL_INFO_EX_S().toArray(nMaxChlCount);
            boolean bRe = YSInit.netdevsdk.NETDEV_QueryVideoChlDetailListEx(lpUserID, dwChlCount, stVideoChlList);
            if (!bRe) {
                log.error("error code" + YSInit.netdevsdk.NETDEV_GetLastError());
//                log.error("error code" + YSInit.netdevsdk.NETDEV_GetLastError());
                return null;
            }
            //获取时间
            NetDEVSDKLib.NETDEV_TIME_CFG_S stTimeCfg = new NetDEVSDKLib.NETDEV_TIME_CFG_S();
            stTimeCfg.write();
            boolean bRetime = NetDemo.netdevsdk.NETDEV_GetSystemTimeCfg(lpUserID, stTimeCfg);
            Date checkTime = new Date();
            osdResult.setCheckTime(checkTime);
            if (!bRetime) {
                log.error("error code" + YSInit.netdevsdk.NETDEV_GetLastError());
//                log.error("error code" + YSInit.netdevsdk.NETDEV_GetLastError());
                return null;
            } else {
                stTimeCfg.read();
@@ -82,7 +81,7 @@
                try {
                    osdResult.setOsdTime(format.parse(strTime));
                } catch (Exception e) {
                    log.error(ip + "时间解析有误");
//                    log.error(ip + "时间解析有误");
                }
            }
            //获取osd
@@ -92,36 +91,93 @@

            boolean bRet = YSInit.netdevsdk.NETDEV_GetDevConfig(lpUserID, stVideoChlList[0].dwChannelID, NetDEVSDKLib.NETDEV_CONFIG_COMMAND_E.NETDEV_GET_OSDCFG, stOSDInfo.getPointer(), 616, dwBytesReturned);
            if (!bRet) {
                log.error("error code" + YSInit.netdevsdk.NETDEV_GetLastError());
//                log.error("error code" + YSInit.netdevsdk.NETDEV_GetLastError());
                return null;
            }
            stOSDInfo.read();
            //省份
            String name = new String(stOSDInfo.stNameOSD.szOSDText, StandardCharsets.UTF_8);
            osdResult.setOSD1(name);
            int num = 0;
            for (NetDEVSDKLib.NETDEV_OSD_TEXT_OVERLAY_S osd : stOSDInfo.astTextOverlay) {
                String text = new String(osd.szOSDText, StandardCharsets.UTF_8).trim();
                if (num == 0) {
                    osdResult.setOSD2(text);
                } else if (num == 1) {
                    osdResult.setOSD3(text);
                } else if (num == 2) {
                    osdResult.setName(text);
                } else if (num == 3) {
                    osdResult.setOSD4(text);


            String name = new String(stOSDInfo.stNameOSD.szOSDText, StandardCharsets.UTF_8).trim();
            //正则名字 如果出现特殊字符 则调用dh的接口
            log.error("YSname:{}" , name);

            // 正则表达式（匹配包含 � 字符的字符串）
            String regex = ".*\\uFFFD.*"; // 核心逻辑：匹配任意位置出现 � 的字符串
            // 编译正则表达式
            Pattern pattern = Pattern.compile(regex);
            boolean isMatch  = pattern.matcher(name).matches();
            if(isMatch){
                log.error("出现正则名字中有特殊字符:{}" , name);
                //大华
                OSDResult osd = DHApi.getOsd(monitor.getName(),monitor.getSerialNumber(),monitor.getIp(), monitor.getUsername(),monitor.getPassword());
                OSDResult osdResult2 = checkSuccess(monitor, osd);
                log.error("osdResult2");
                if (osdResult2!=null) {
                    return osd;
                }else {
                    return null;
                }
                num++;
            }

            if (StringUtils.isNotEmpty(name) && name.contains("|")){
                String[] osdNames = name.split("\\|");
                for (int i = 0; i < osdNames.length; i++) {
                    if (i == 0) {
                        osdResult.setOSD1(osdNames[i]);
                    }
                    if (i == 1) {
                        osdResult.setOSD2(osdNames[i]);
                    }
                    if (i == 2) {
                        osdResult.setOSD3(osdNames[i]);
                    }
                    if (i == 3) {
                        osdResult.setName(osdNames[i]);
                    }
                }
            }else {
                //省份
                osdResult.setOSD1(name);
//                log.info("YSname"+name);
                int num = 0;
                for (NetDEVSDKLib.NETDEV_OSD_TEXT_OVERLAY_S osd : stOSDInfo.astTextOverlay) {
                    String text = new String(osd.szOSDText, StandardCharsets.UTF_8).trim();
                    log.info("YSnum:"+num+",YStexr:"+text);
                    if (num == 0) {
                        osdResult.setOSD2(text);
                    } else if (num == 1) {
                        osdResult.setOSD3(text);
                    } else if (num == 2) {
                        osdResult.setName(text);
                    } else if (num == 3) {
                        osdResult.setOSD4(text);
                    }
                    num++;
                }
            }


            //登出
            YSInit.netdevsdk.NETDEV_Logout(lpUserID);
            osdResult.setDeviceBrand(DeviceType.YS.getType());
            return osdResult;
        } else {
            log.error("error code" + YSInit.netdevsdk.NETDEV_GetLastError());
//            log.error("ip:"+ip+",error code" + YSInit.netdevsdk.NETDEV_GetLastError());
            return null;
        }
        return null;
    }

    //OSDCheckThread方法
    private static OSDResult checkSuccess(TMonitor monitor, OSDResult osd) {
        if (osd != null) {
            osd.setSerialNumber(monitor.getSerialNumber());
            return osd;
        } else {
            return null;
        }
    }


    public static void demo() {
        Login.loginIn();
    }