From c3d51f9ba3300b60261d13a5b0b4f7402bba0ee0 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 02 四月 2025 08:30:00 +0800
Subject: [PATCH] 修改轮灌组接口、分页获取轮灌组接口、获取全部轮灌组接口、获取轮灌组详情接口
---
pipIrr-platform/pipIrr-global/src/main/resources/application-global(166web文件花生壳).yml | 115 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 71 insertions(+), 44 deletions(-)
diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050166web\346\226\207\344\273\266\350\212\261\347\224\237\345\243\263\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050166web\346\226\207\344\273\266\350\212\261\347\224\237\345\243\263\051.yml"
index b0e9a6f..bc9864b 100644
--- "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050166web\346\226\207\344\273\266\350\212\261\347\224\237\345\243\263\051.yml"
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050166web\346\226\207\344\273\266\350\212\261\347\224\237\345\243\263\051.yml"
@@ -1,9 +1,16 @@
spring:
+ main:
+ allow-bean-definition-overriding: true #璁剧疆涓簍rue鏃讹紝鍚庡畾涔夌殑bean浼氳鐩栦箣鍓嶅畾涔夌殑鐩稿悓鍚嶇О鐨刡ean
servlet:
multipart:
# 鍓嶇涓婁紶鏂囦欢锛岄檺鍒跺崟涓枃浠剁殑澶у皬鍜岄檺鍒舵墍鏈夋枃浠剁殑澶у皬
max-file-size: 500MB
max-request-size: 5000MB
+ http:
+ client:
+ # spring restTemplate 瀵瑰http璁块棶鏃�
+ connect-timeout: 3000 # 杩炴帴瓒呮椂鏃堕棿
+ read-timeout: 3000 # 璇诲彇瓒呮椂鏃堕棿
logging:
charset:
console: UTF-8
@@ -81,7 +88,9 @@
dev: false #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
dsName: ym #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
nginx:
- webPort: 19913
+ root: E:/apps/pipIrr/nginx-1.27.0
+ webPort: 54321
+ webFilePort: 19913
mw:
webPort: 8070 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢�
actutorPort: 9070 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢�
@@ -192,112 +201,112 @@
supportedFileTypes: docx,xlsx,doc,xls,pdf #鏀寔鐨勬枃妗ｏ紙闈炲獟浣撴枃浠讹紝濡傜収鐗囥�佸綍闊炽�佸綍鍍忥級鏂囦欢绫诲瀷
sv1:
id: dyFile1
- absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/html/webfiles/
relativePath: webFile1
hashStart: 0
hashEnd: 5461
restUrl: http://127.0.0.1:${pipIrr.file1.webPort}/file #file鏄笂涓嬫枃,ip涓哄眬鍩熺綉ip鎴栨湰鍦癐P
- webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
- webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file1.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+ webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+ webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
sv2:
id: dyFile2
- absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/html/webfiles/
relativePath: webFile2
hashStart: 5462
hashEnd: 10923
restUrl: http://127.0.0.1:${pipIrr.file2.webPort}/file
- webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file2.webPort}/file/download/down?id=
+ webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+ webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
sv3:
id: dyFile3
- absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/html/webfiles/
relativePath: webFile3
hashStart: 10924
hashEnd: 16385
restUrl: http://127.0.0.1:${pipIrr.file3.webPort}/file
- webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file3.webPort}/file/download/down?id=
+ webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+ webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
sv4:
id: dyFile4
- absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/html/webfiles/
relativePath: webFile4
hashStart: 16386
hashEnd: 21847
restUrl: http://127.0.0.1:${pipIrr.file4.webPort}/file
- webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file4.webPort}/file/download/down?id=
+ webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+ webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
sv5:
id: dyFile5
- absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/html/webfiles/
relativePath: webFile5
hashStart: 21848
hashEnd: 27309
restUrl: http://127.0.0.1:${pipIrr.file5.webPort}/file
- webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file5.webPort}/file/download/down?id=
+ webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+ webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
sv6:
id: dyFile6
- absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/html/webfiles/
relativePath: webFile6
hashStart: 27310
hashEnd: 32767
restUrl: http://127.0.0.1:${pipIrr.file6.webPort}/file
- webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file6.webPort}/file/download/down?id=
+ webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+ webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
sv7:
id: dyFile7
- absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/html/webfiles/
relativePath: webFile7
hashStart: 32768
hashEnd: 38229
restUrl: http://127.0.0.1:${pipIrr.file7.webPort}/file
- webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file7.webPort}/file/download/down?id=
+ webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+ webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
sv8:
id: dyFile8
- absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/html/webfiles/
relativePath: webFile8
hashStart: 38230
hashEnd: 43691
restUrl: http://127.0.0.1:${pipIrr.file8.webPort}/file
- webUrl: http://no253541tf71.vicp.fun${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file8.webPort}/file/download/down?id=
+ webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+ webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
sv9:
id: dyFile9
- absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/html/webfiles/
relativePath: webFile9
hashStart: 43692
hashEnd: 49153
restUrl: http://127.0.0.1:${pipIrr.file9.webPort}/file
- webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file9.webPort}/file/download/down?id=
+ webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+ webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
sv10:
id: dyFile10
- absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/html/webfiles/
relativePath: webFile10
hashStart: 49154
hashEnd: 54615
restUrl: http://127.0.0.1:${pipIrr.file10.webPort}/file
- webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file10.webPort}/file/download/down?id=
+ webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+ webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
sv11:
id: dyFile11
- absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/html/webfiles/
relativePath: webFile11
hashStart: 54616
hashEnd: 60077
restUrl: http://127.0.0.1:${pipIrr.file11.webPort}/file
- webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file11.webPort}/file/download/down?id=
+ webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+ webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
sv12:
id: dyFile12
- absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/html/webfiles/
relativePath: webFile12
hashStart: 60078
hashEnd: 65535
restUrl: http://127.0.0.1:${pipIrr.file12.webPort}/file
- webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file12.webPort}/file/download/down?id=
+ webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+ webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
#椤圭洰缂栧彿
#projectCode:
@@ -324,20 +333,37 @@
mj:
url: "http://127.0.0.1:8071"
comSendUrl: "http://127.0.0.1:8071/rtuMw/com/send"
- mq:
- url: "http://127.0.0.1:8100"
- comSendUrl: "http://127.0.0.1:8100/rtuMw/com/send"
sp:
url: "http://127.0.0.1:8073"
comSendUrl: "http://127.0.0.1:8073/rtuMw/com/send"
test:
url: "http://127.0.0.1:8072"
comSendUrl: "http://127.0.0.1:8072/rtuMw/com/send"
- #鐩戞祴鎺у埗妯″潡鍥炶皟鍦板潃
+ mq:
+ url: "http://127.0.0.1:8100"
+ comSendUrl: "http://127.0.0.1:8100/rtuMw/com/send"
+ yq:
+ url: "http://127.0.0.1:8101"
+ comSendUrl: "http://127.0.0.1:8101/rtuMw/com/send"
+ hlj:
+ url: "http://127.0.0.1:8102"
+ comSendUrl: "http://127.0.0.1:8102/rtuMw/com/send"
+ gz:
+ url: "http://127.0.0.1:8103"
+ comSendUrl: "http://127.0.0.1:8103/rtuMw/com/send"
+ lz:
+ url: "http://127.0.0.1:8104"
+ comSendUrl: "http://127.0.0.1:8104/rtuMw/com/send"
+ jc:
+ url: "http://127.0.0.1:8105"
+ comSendUrl: "http://127.0.0.1:8105/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"
#涓嶈繘琛寀serToken杩囨护鐨刄RL锛孈ConfigurationProperties瑕佹眰tokennofilter涓墍鏈夊瓧姣嶉兘灏忓啓
@@ -345,7 +371,9 @@
urls:
- /sso/sso
- /remote/comRes/receive
+ - /remote/msCenter/receive
- /remote/rtuUpgradeStateReceiver/receive
+ - /remote/websocket
- /wx/comRes/receive
- /app/captcha/get
- /file/file #web鍒嗗竷寮忔枃浠剁郴缁�
@@ -401,7 +429,6 @@
#闃�鎺у櫒鍙傛暟
rtu:
- batteryVolt: 17
signalIntensity:
weak: 10
ordinary: 20
--
Gitblit v1.8.0