1.修改名称(天宇 ——》六合)。

Xiajijian

2025-10-11 c07aeace15bd4265bd34fd4d0afbd1d13603032d

1.修改名称(天宇 ——》六合)。

 README.md

@@ -5,7 +5,7 @@

## 平台简介

这是一套基于天宇协议的无人机平台。
这是一套基于六合协议的无人机平台。

* 前端采用Vue、Element UI。
* 后端采用Spring Boot、Spring Security、Redis & Jwt。

 ard-admin/src/main/java/com/ard/web/controller/work/UavBaseController.java

@@ -32,14 +32,14 @@
    @Resource
    private ITyService tyService;

    @ApiOperation("获取天宇token信息")
    @ApiOperation("获取六合token信息")
    @ApiOperationSupport(order = 1)
    @GetMapping("/getToken")
    public AjaxResult getToken() {
        return AjaxResult.success(tyService.getAccessToken());
    }

    @ApiOperation("获取天宇盒子列表")
    @ApiOperation("获取六合盒子列表")
    @ApiOperationSupport(order = 2)
    @GetMapping("/getBoxList")
    public AjaxResult getBoxList() {

 ard-admin/src/main/resources/application-dev.yml

@@ -32,14 +32,14 @@
  # 加载全局的配置文件
  configLocation: classpath:mybatis/mybatis-config.xml

# 天宇服务器配置
# 六合服务器配置
tianyu:
 # 天宇http服务器地址
 # 六合http服务器地址
 # endpoint: 192.168.1.97:8060  # 哈尔滨环境
 endpoint: 112.98.104.134:8060  # 哈尔滨环境
 accesskeyid: wuwuwu
 accesskeysecret: 9c9f139f63b343b0a9ef42e05ed29b0b
 # 天宇tcp服务器地址
 # 六合tcp服务器地址
 tcpserver: 192.168.1.97
 tcpport: 8126


 ard-admin/src/main/resources/application-prod.yml

@@ -32,14 +32,14 @@
  # 加载全局的配置文件
  configLocation: classpath:mybatis/mybatis-config.xml

# 天宇服务器配置
# 六合服务器配置
tianyu:
  # 天宇http服务器地址
  # 六合http服务器地址
  # endpoint: 192.168.1.97:8060  # 哈尔滨环境
  endpoint: 112.98.104.134:8060  # 大庆环境
  accesskeyid: wuwuwu
  accesskeysecret: 9c9f139f63b343b0a9ef42e05ed29b0b
  # 天宇tcp服务器地址
  # 六合tcp服务器地址
  # tcpserver: 192.168.1.97 # 哈尔滨环境
  tcpserver: 112.98.104.134 # 大庆环境
  tcpport: 8126

 ard-work/src/main/java/com/ard/work/component/netty/NettyTcpClient.java

@@ -92,7 +92,7 @@
                TcpClientSession.builder().ClientId(clientId).channelFuture(future).isReConnect(!clientId.isEmpty()).build());
    }

    //创建天宇连接
    //创建六合连接
    @PostConstruct
    public void createTyConnect() {
        try {

 ard-work/src/main/java/com/ard/work/component/netty/handler/ClientHandler.java

@@ -70,14 +70,14 @@
        InetSocketAddress ipSocket = (InetSocketAddress) ctx.channel().remoteAddress();
        int port = ipSocket.getPort();
        String host = ipSocket.getHostString();
        log.error("与天宇服务{}:{}连接断开!", host, port);
        log.error("与六合服务{}:{}连接断开!", host, port);
        TyTcpServerCache.putTcpServerCache(host + ":" + port, false);
        ctx.channel().eventLoop().schedule(() -> {
            log.error("天宇服务端链接不上，开始重连操作...");
            log.error("六合服务端链接不上，开始重连操作...");
            try {
                nettyTcpClient.initConnection(host, port);
            } catch (Exception e) {
                log.error("天宇服务端连接异常: {}", e.getMessage());
                log.error("六合服务端连接异常: {}", e.getMessage());
            }
        }, 5, TimeUnit.SECONDS);


 ard-work/src/main/java/com/ard/work/domain/cache/TyTcpServerCache.java

@@ -3,7 +3,7 @@
import java.util.concurrent.ConcurrentHashMap;

/**
 * 天宇tcp服务器缓存
 * 六合tcp服务器缓存
 *
 * @author liusuyi
 * @date 2024年11月01日13:53

 ard-work/src/main/java/com/ard/work/domain/receiver/TyHttpCommonReceiver.java

@@ -8,7 +8,7 @@
@JsonIgnoreProperties(ignoreUnknown = true)
public class TyHttpCommonReceiver<T> {
    /**
     * 天宇http请求返回信息
     * 六合http请求返回信息
     */
    @JsonProperty("state")
    private Integer state;

 ard-work/src/main/java/com/ard/work/service/ITyService.java

@@ -31,7 +31,7 @@
public interface ITyService {

    /**
     * 获取天宇token信息
     * 获取六合token信息
     * @return
     */
    AccessTokenReceiver getAccessToken();

 ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java

@@ -77,7 +77,7 @@


    /**
     * 获取天宇token信息
     * 获取六合token信息
     *
     * @return AccessTokenReceiver
     */
@@ -177,7 +177,7 @@
    }

    /**
     * 注册天宇平台
     * 注册六合平台
     */
    @Override
    public Boolean registerMessage() {
@@ -186,7 +186,7 @@
            RegisterCmd registerMessage = new RegisterCmd(tyToken.getCompanyId(), tyToken.getAccessToken().getBytes());
            this.sendMessage(tyConfiguration.getIpPort(), registerMessage);
        } catch (Exception e) {
            log.error("注册天宇平台失败:{}", e.getMessage());
            log.error("注册六合平台失败:{}", e.getMessage());
        }
        return true;
    }
@@ -611,7 +611,7 @@
    }

    /**
     * 处理天宇服务器返回的消息
     * 处理六合服务器返回的消息
     */
    @Override
    public void processReplyMessage(String key, BaseCmd tyCommand) {
@@ -817,7 +817,7 @@
            return;
        }
        long timestamp = System.currentTimeMillis();
        log.debug("定时向天宇发送⼼跳,时间戳{}", timestamp);
        log.debug("定时向六合发送⼼跳,时间戳{}", timestamp);
        HeartbeatCmd heartbeatMessage = new HeartbeatCmd(timestamp);
        this.sendMessage(tyConfiguration.getIpPort(), heartbeatMessage);
    }
@@ -834,9 +834,9 @@
                String host = ipSocket.getHostString();
                int port = ipSocket.getPort();
                channel.writeAndFlush(msg); // 发送编码后的数据
                log.debug("向天宇服务器【{}:{}】发送数据，命令码：{}", host, port, String.format("0x%02X", msg.getCmdCode() & 0xFF));
                log.debug("向六合服务器【{}:{}】发送数据，命令码：{}", host, port, String.format("0x%02X", msg.getCmdCode() & 0xFF));
            } else {
                log.error("与天宇服务器链接断开，无法发送数据！");
                log.error("与六合服务器链接断开，无法发送数据！");
            }
        } catch (Exception e) {
            log.error("发送消息异常：{}", e.getMessage());

 lib/dh/linux-arm64/libImageAlg.so

Binary files differ

 lib/dh/linux-arm64/libInfra.so

Binary files differ

 lib/dh/linux-arm64/libStreamConvertor.so

Binary files differ

 lib/dh/linux-arm64/libStreamPackage.so

Binary files differ

 lib/dh/linux-arm64/libStreamParser.so

Binary files differ

 lib/dh/linux-arm64/libavnetsdk.so

Binary files differ

 lib/dh/linux-arm64/libcrypto.so

Binary files differ

 lib/dh/linux-arm64/libdhconfigsdk.so

Binary files differ

 lib/dh/linux-arm64/libdhnetsdk.so

Binary files differ

 lib/dh/linux-arm64/libdhplay.so

Binary files differ

 lib/dh/linux-arm64/libheatmap.so

Binary files differ

 lib/dh/linux-arm64/libjninetsdk.so

Binary files differ

 lib/dh/linux-arm64/libssl.so

Binary files differ

 lib/dh/linux64/libImageAlg.so

Binary files differ

 lib/dh/linux64/libInfra.so

Binary files differ

 lib/dh/linux64/libStreamConvertor.so

Binary files differ

 lib/dh/linux64/libStreamPackage.so

Binary files differ

 lib/dh/linux64/libStreamParser.so

Binary files differ

 lib/dh/linux64/libavnetsdk.so

Binary files differ

 lib/dh/linux64/libcrypto.so

Binary files differ

 lib/dh/linux64/libdhconfigsdk.so

Binary files differ

 lib/dh/linux64/libdhnetsdk.so

Binary files differ

 lib/dh/linux64/libdhplay.so

Binary files differ

 lib/dh/linux64/libheatmap.so

Binary files differ

 lib/dh/linux64/libjninetsdk.so

Binary files differ

 lib/dh/linux64/libssl.so

Binary files differ

 lib/dh/win64/ImageAlg.dll

Binary files differ

 lib/dh/win64/Infra.dll

Binary files differ

 lib/dh/win64/IvsDrawer.dll

Binary files differ

 lib/dh/win64/RenderEngine.dll

Binary files differ

 lib/dh/win64/StreamConvertor.dll

Binary files differ

 lib/dh/win64/avnetsdk.dll

Binary files differ

 lib/dh/win64/dhconfigsdk.dll

Binary files differ

 lib/dh/win64/dhnetsdk.dll

Binary files differ

 lib/dh/win64/dhplay.dll

Binary files differ

 lib/hik/linux-arm64/HCNetSDKCom/libAudioIntercom.so

Binary files differ

 lib/hik/linux-arm64/HCNetSDKCom/libHCAlarm.so

Binary files differ

 lib/hik/linux-arm64/HCNetSDKCom/libHCCoreDevCfg.so

Binary files differ

 lib/hik/linux-arm64/HCNetSDKCom/libHCDisplay.so

Binary files differ

 lib/hik/linux-arm64/HCNetSDKCom/libHCGeneralCfgMgr.so

Binary files differ

 lib/hik/linux-arm64/HCNetSDKCom/libHCIndustry.so

Binary files differ

 lib/hik/linux-arm64/HCNetSDKCom/libHCPlayBack.so

Binary files differ

 lib/hik/linux-arm64/HCNetSDKCom/libHCPreview.so

Binary files differ

 lib/hik/linux-arm64/HCNetSDKCom/libHCVoiceTalk.so

Binary files differ

 lib/hik/linux-arm64/HCNetSDKCom/libStreamTransClient.so

Binary files differ

 lib/hik/linux-arm64/HCNetSDKCom/libSystemTransform.so

Binary files differ

 lib/hik/linux-arm64/HCNetSDKCom/libanalyzedata.so

Binary files differ

 lib/hik/linux-arm64/HCNetSDKCom/libiconv.so.2

Binary files differ

 lib/hik/linux-arm64/HCNetSDK_Log_Switch.xml

New file
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="GB2312"?>
<SdkLocal>
    <SdkLog>
        <logLevel>3</logLevel><!--req, 1-ERROR, 2-DEBUG, 3-INFO-->
        <logDirectory>./SDKLOG/</logDirectory><!--the end of the string must be '/'-->
        <autoDelete>true</autoDelete><!--true: There are less than 10 files in the directory, it will be auto deleted by sdk when the files are more than 10; false: No upper limit to the number of log files-->
    </SdkLog>
    <HeartbeatCfg>
        <Interval>120</Interval> <!-- ÐÄÌøʱ¼ä¼ä¸ô£¬µ¥Î»Ã룬µÈÓÚ0£¬Ê¹ÓÃĬÈÏÖµ120s£¬È¡Öµ·¶Î§Îª[30, 120] Ð¡ÓÚ30s£¬¼ä¸ôΪ30s£¬´óÓÚ120s£¬¼ä¸ôΪ120s-->
        <Count>1</Count>     <!-- ´¥·¢Òì³£»Øµ÷ÐèÒªÐÄÌø½»»¥Òì³£µÄ´ÎÊý£¬µÈÓÚ0£¬Ê¹ÓÃĬÈÏÖµ1´Î-->
    </HeartbeatCfg>
</SdkLocal>

 lib/hik/linux-arm64/examples.jar

Binary files differ

 lib/hik/linux-arm64/jna-4.5.2_1.jar

Binary files differ

 lib/hik/linux-arm64/libAudioRender.so

Binary files differ

 lib/hik/linux-arm64/libHCCore.so

Binary files differ

 lib/hik/linux-arm64/libPlayCtrl.so

Binary files differ

 lib/hik/linux-arm64/libSuperRender.so

Binary files differ

 lib/hik/linux-arm64/libcrypto.so

Binary files differ

 lib/hik/linux-arm64/libcrypto.so.1.1

Binary files differ

 lib/hik/linux-arm64/libhcnetsdk.so

Binary files differ

 lib/hik/linux-arm64/libhpr.so

Binary files differ

 lib/hik/linux-arm64/libssl.so

Binary files differ

 lib/hik/linux-arm64/libssl.so.1.1

Binary files differ

 lib/hik/linux-arm64/libz.so

Binary files differ

 lib/hik/linux64/HCNetSDKCom/libAudioIntercom.so

Binary files differ

 lib/hik/linux64/HCNetSDKCom/libHCAlarm.so

Binary files differ

 lib/hik/linux64/HCNetSDKCom/libHCCoreDevCfg.so

Binary files differ

 lib/hik/linux64/HCNetSDKCom/libHCDisplay.so

Binary files differ

 lib/hik/linux64/HCNetSDKCom/libHCGeneralCfgMgr.so

Binary files differ

 lib/hik/linux64/HCNetSDKCom/libHCIndustry.so

Binary files differ

 lib/hik/linux64/HCNetSDKCom/libHCPlayBack.so

Binary files differ

 lib/hik/linux64/HCNetSDKCom/libHCPreview.so

Binary files differ

 lib/hik/linux64/HCNetSDKCom/libHCVoiceTalk.so

Binary files differ

 lib/hik/linux64/HCNetSDKCom/libStreamTransClient.so

Binary files differ

 lib/hik/linux64/HCNetSDKCom/libSystemTransform.so

Binary files differ

 lib/hik/linux64/HCNetSDKCom/libanalyzedata.so

Binary files differ

 lib/hik/linux64/HCNetSDKCom/libiconv2.so

Binary files differ

 lib/hik/linux64/HCNetSDK_Log_Switch.xml

New file
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="GB2312"?>
<SdkLocal>
    <SdkLog>
        <logLevel>3</logLevel><!--req, 1-ERROR, 2-DEBUG, 3-INFO-->
        <logDirectory>./SDKLOG/</logDirectory><!--the end of the string must be '/'-->
        <autoDelete>true</autoDelete><!--true: There are less than 10 files in the directory, it will be auto deleted by sdk when the files are more than 10; false: No upper limit to the number of log files-->
    </SdkLog>
    <HeartbeatCfg>
        <Interval>120</Interval> <!-- ÐÄÌøʱ¼ä¼ä¸ô£¬µ¥Î»Ã룬µÈÓÚ0£¬Ê¹ÓÃĬÈÏÖµ120s£¬È¡Öµ·¶Î§Îª[30, 120] Ð¡ÓÚ30s£¬¼ä¸ôΪ30s£¬´óÓÚ120s£¬¼ä¸ôΪ120s-->
        <Count>1</Count>     <!-- ´¥·¢Òì³£»Øµ÷ÐèÒªÐÄÌø½»»¥Òì³£µÄ´ÎÊý£¬µÈÓÚ0£¬Ê¹ÓÃĬÈÏÖµ1´Î-->
    </HeartbeatCfg>
</SdkLocal>

 lib/hik/linux64/libAudioRender.so

Binary files differ

 lib/hik/linux64/libHCCore.so

Binary files differ

 lib/hik/linux64/libNPQos.so

Binary files differ

 lib/hik/linux64/libPlayCtrl.so

Binary files differ

 lib/hik/linux64/libSuperRender.so

Binary files differ

 lib/hik/linux64/libcrypto.so.1.1

Binary files differ

 lib/hik/linux64/libhcnetsdk.so

Binary files differ

 lib/hik/linux64/libhpr.so

Binary files differ

 lib/hik/linux64/libopenal.so.1

Binary files differ

 lib/hik/linux64/libssl.so.1.1

Binary files differ

 lib/hik/linux64/libz.so

Binary files differ

 lib/hik/win64/AudioRender.dll

Binary files differ

 lib/hik/win64/GdiPlus.dll

Binary files differ

 lib/hik/win64/HCCore.dll

Binary files differ

 lib/hik/win64/HCNetSDK.dll

Binary files differ

 lib/hik/win64/HCNetSDKCom/AnalyzeData.dll

Binary files differ

 lib/hik/win64/HCNetSDKCom/AudioIntercom.dll

Binary files differ

 lib/hik/win64/HCNetSDKCom/AudioRender.dll

Binary files differ

 lib/hik/win64/HCNetSDKCom/HCAlarm.dll

Binary files differ

 lib/hik/win64/HCNetSDKCom/HCAlarm.lib

Binary files differ

 lib/hik/win64/HCNetSDKCom/HCCoreDevCfg.dll

Binary files differ

 lib/hik/win64/HCNetSDKCom/HCDisplay.dll

Binary files differ

 lib/hik/win64/HCNetSDKCom/HCGeneralCfgMgr.dll

Binary files differ

 lib/hik/win64/HCNetSDKCom/HCGeneralCfgMgr.lib

Binary files differ

 lib/hik/win64/HCNetSDKCom/HCIndustry.dll

Binary files differ

 lib/hik/win64/HCNetSDKCom/HCPlayBack.dll

Binary files differ

 lib/hik/win64/HCNetSDKCom/HCPreview.dll

Binary files differ

 lib/hik/win64/HCNetSDKCom/HCPreview.lib

Binary files differ

 lib/hik/win64/HCNetSDKCom/HCVoiceTalk.dll

Binary files differ

 lib/hik/win64/HCNetSDKCom/OpenAL32.dll

Binary files differ

 lib/hik/win64/HCNetSDKCom/StreamTransClient.dll

Binary files differ

 lib/hik/win64/HCNetSDKCom/SystemTransform.dll

Binary files differ

 lib/hik/win64/HCNetSDKCom/libiconv2.dll

Binary files differ

 lib/hik/win64/HXVA.dll

Binary files differ

 lib/hik/win64/HmMerge.dll

Binary files differ

 lib/hik/win64/MP_Render.dll

Binary files differ

 lib/hik/win64/NPQos.dll

Binary files differ

 lib/hik/win64/OpenAL32.dll

Binary files differ

 lib/hik/win64/PlayCtrl.dll

Binary files differ

 lib/hik/win64/SDK库文件拷贝到该目录下.txt

 lib/hik/win64/SuperRender.dll

Binary files differ

 lib/hik/win64/YUVProcess.dll

Binary files differ

 lib/hik/win64/examples.jar

Binary files differ

 lib/hik/win64/hlog.dll

Binary files differ

 lib/hik/win64/hpr.dll

Binary files differ

 lib/hik/win64/jna.jar

Binary files differ

 lib/hik/win64/libcrypto-1_1-x64.dll

Binary files differ

 lib/hik/win64/libmmd.dll

Binary files differ

 lib/hik/win64/libssl-1_1-x64.dll

Binary files differ

 lib/hik/win64/zlib1.dll

Binary files differ

 lib/template/报警工单模板.xlsx

Binary files differ

 lib/template/考核单明细模板.xlsx

Binary files differ

 lib/template/考核单模板.xlsx

Binary files differ