导出新增 连个列，以及同步数据库时点位名修改未成功问题

zxl

2025-03-28 d384786ab5868cd4d856691372eee5359e7d9b2c

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

@@ -6,6 +6,7 @@
import com.ycl.api.YS.lib.NetDEVSDKLib;
import com.ycl.api.YS.login.Login;
import com.ycl.platform.domain.result.OSDResult;
import com.ycl.utils.StringUtils;
import enumeration.DeviceType;
import lombok.extern.slf4j.Slf4j;

@@ -91,25 +92,48 @@
                return null;
            }
            stOSDInfo.read();
            //省份


            String name = new String(stOSDInfo.stNameOSD.szOSDText, StandardCharsets.UTF_8).trim();
            osdResult.setOSD1(name);
//            log.info("name"+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("num:"+num+",texr:"+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);
            log.error("YSname:{}" , name);
            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]);
                    }
                }
                num++;
            }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());