修改下发缓存命令的等待逻辑，RTU上行数据后，使尽快发送下行命令。

liurunyu

2025-02-25 5e31f7c1f3eaf5cfd3be0e5fc942aa78f3a4133c

 pipIrr-platform/pipIrr-global/src/main/resources/application-global(spɳÅÌϵͳ).yml

@@ -4,6 +4,11 @@
            # å‰ç«¯ä¸Šä¼ æ–‡ä»¶ï¼Œé™åˆ¶å•ä¸ªæ–‡ä»¶çš„大小和限制所有文件的大小
            max-file-size: 500MB
            max-request-size: 5000MB
    http:
        client:
            # spring restTemplate å¯¹å¤–http访问时
            connect-timeout: 3000 # è¿žæŽ¥è¶…时时间
            read-timeout: 3000 # è¯»å–超时时间
logging:
    charset:
        console: UTF-8
@@ -199,8 +204,8 @@
            hashStart: 0
            hashEnd: 5461
            restUrl: http://127.0.0.1:${pipIrr.file1.webPort}/file #file是上下文,ip为局域网ip或本地IP
            webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/ #nginx服务路径,安装部署时IP改成外网IP或域名
            webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=  #安装部署时IP改成外网IP或域名
            webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx服务路径,安装部署时IP改成外网IP或域名
            webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id=  #安装部署时IP改成外网IP或域名
        sv2:
            id: dyFile2
            absolutePath: ${pipIrr.nginx.root}/html/webfiles/
@@ -208,8 +213,8 @@
            hashStart: 5462
            hashEnd: 10923
            restUrl: http://127.0.0.1:${pipIrr.file2.webPort}/file
            webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/ #nginx服务路径,安装部署时IP改成外网IP或域名
            webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=  #安装部署时IP改成外网IP或域名
            webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx服务路径,安装部署时IP改成外网IP或域名
            webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id=  #安装部署时IP改成外网IP或域名
        sv3:
            id: dyFile3
            absolutePath: ${pipIrr.nginx.root}/html/webfiles/
@@ -217,8 +222,8 @@
            hashStart: 10924
            hashEnd: 16385
            restUrl: http://127.0.0.1:${pipIrr.file3.webPort}/file
            webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/ #nginx服务路径,安装部署时IP改成外网IP或域名
            webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=  #安装部署时IP改成外网IP或域名
            webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx服务路径,安装部署时IP改成外网IP或域名
            webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id=  #安装部署时IP改成外网IP或域名
        sv4:
            id: dyFile4
            absolutePath: ${pipIrr.nginx.root}/html/webfiles/
@@ -226,8 +231,8 @@
            hashStart: 16386
            hashEnd: 21847
            restUrl: http://127.0.0.1:${pipIrr.file4.webPort}/file
            webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/ #nginx服务路径,安装部署时IP改成外网IP或域名
            webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=  #安装部署时IP改成外网IP或域名
            webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx服务路径,安装部署时IP改成外网IP或域名
            webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id=  #安装部署时IP改成外网IP或域名
        sv5:
            id: dyFile5
            absolutePath: ${pipIrr.nginx.root}/html/webfiles/
@@ -235,8 +240,8 @@
            hashStart: 21848
            hashEnd: 27309
            restUrl: http://127.0.0.1:${pipIrr.file5.webPort}/file
            webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/ #nginx服务路径,安装部署时IP改成外网IP或域名
            webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=  #安装部署时IP改成外网IP或域名
            webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx服务路径,安装部署时IP改成外网IP或域名
            webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id=  #安装部署时IP改成外网IP或域名
        sv6:
            id: dyFile6
            absolutePath: ${pipIrr.nginx.root}/html/webfiles/
@@ -244,8 +249,8 @@
            hashStart: 27310
            hashEnd: 32767
            restUrl: http://127.0.0.1:${pipIrr.file6.webPort}/file
            webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/ #nginx服务路径,安装部署时IP改成外网IP或域名
            webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=  #安装部署时IP改成外网IP或域名
            webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx服务路径,安装部署时IP改成外网IP或域名
            webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id=  #安装部署时IP改成外网IP或域名
        sv7:
            id: dyFile7
            absolutePath: ${pipIrr.nginx.root}/html/webfiles/
@@ -253,8 +258,8 @@
            hashStart: 32768
            hashEnd: 38229
            restUrl: http://127.0.0.1:${pipIrr.file7.webPort}/file
            webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/ #nginx服务路径,安装部署时IP改成外网IP或域名
            webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=  #安装部署时IP改成外网IP或域名
            webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx服务路径,安装部署时IP改成外网IP或域名
            webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id=  #安装部署时IP改成外网IP或域名
        sv8:
            id: dyFile8
            absolutePath: ${pipIrr.nginx.root}/html/webfiles/
@@ -262,8 +267,8 @@
            hashStart: 38230
            hashEnd: 43691
            restUrl: http://127.0.0.1:${pipIrr.file8.webPort}/file
            webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/ #nginx服务路径,安装部署时IP改成外网IP或域名
            webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=  #安装部署时IP改成外网IP或域名
            webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx服务路径,安装部署时IP改成外网IP或域名
            webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id=  #安装部署时IP改成外网IP或域名
        sv9:
            id: dyFile9
            absolutePath: ${pipIrr.nginx.root}/html/webfiles/
@@ -271,8 +276,8 @@
            hashStart: 43692
            hashEnd: 49153
            restUrl: http://127.0.0.1:${pipIrr.file9.webPort}/file
            webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/ #nginx服务路径,安装部署时IP改成外网IP或域名
            webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=  #安装部署时IP改成外网IP或域名
            webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx服务路径,安装部署时IP改成外网IP或域名
            webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id=  #安装部署时IP改成外网IP或域名
        sv10:
            id: dyFile10
            absolutePath: ${pipIrr.nginx.root}/html/webfiles/
@@ -280,8 +285,8 @@
            hashStart: 49154
            hashEnd: 54615
            restUrl: http://127.0.0.1:${pipIrr.file10.webPort}/file
            webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/ #nginx服务路径,安装部署时IP改成外网IP或域名
            webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=  #安装部署时IP改成外网IP或域名
            webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx服务路径,安装部署时IP改成外网IP或域名
            webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id=  #安装部署时IP改成外网IP或域名
        sv11:
            id: dyFile11
            absolutePath: ${pipIrr.nginx.root}/html/webfiles/
@@ -289,8 +294,8 @@
            hashStart: 54616
            hashEnd: 60077
            restUrl: http://127.0.0.1:${pipIrr.file11.webPort}/file
            webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/ #nginx服务路径,安装部署时IP改成外网IP或域名
            webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=  #安装部署时IP改成外网IP或域名
            webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx服务路径,安装部署时IP改成外网IP或域名
            webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id=  #安装部署时IP改成外网IP或域名
        sv12:
            id: dyFile12
            absolutePath: ${pipIrr.nginx.root}/html/webfiles/
@@ -298,8 +303,8 @@
            hashStart: 60078
            hashEnd: 65535
            restUrl: http://127.0.0.1:${pipIrr.file12.webPort}/file
            webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/ #nginx服务路径,安装部署时IP改成外网IP或域名
            webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=  #安装部署时IP改成外网IP或域名
            webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx服务路径,安装部署时IP改成外网IP或域名
            webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id=  #安装部署时IP改成外网IP或域名

#项目编号
#projectCode:
@@ -335,11 +340,13 @@
    test:
        url: "http://127.0.0.1:8072"
        comSendUrl: "http://127.0.0.1:8072/rtuMw/com/send"
    #监测控制模块回调地址
    #Rtu远程命令结果回调地址
    rtuCallbackUrl_rm: "http://127.0.0.1:8081/remote/comRes/receive"
    #rtu远程升级模块回调地址
    #接收通信中间件消息中心消息的地址
    mwMsCenterReceiveUrl_rm: "http://127.0.0.1:8081/remote/msCenter/receive"
    #rtu远程升级状态信息回调地址
    ugCallbackUrl_rm: "http://127.0.0.1:8081/remote/rtuUpgradeStateReceiver/receive"
    #微信小程序回调地址
    #微信小程序应用中Rtu远程命令结果回调地址
    rtuCallbackUrl_wx: "http://127.0.0.1:8087/wx/comRes/receive"

#不进行userToken过滤的URL，@ConfigurationProperties要求tokennofilter中所有字母都小写
@@ -347,7 +354,9 @@
    urls:
        - /sso/sso
        - /remote/comRes/receive
        - /remote/msCenter/receive
        - /remote/rtuUpgradeStateReceiver/receive
        - /remote/websocket
        - /wx/comRes/receive
        - /app/captcha/get
        - /file/file #web分布式文件系统