From 6fa8408c8133e8c9aee2bbcdec37bf95c20951c0 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 07 二月 2025 15:39:16 +0800
Subject: [PATCH] 涉嫌偷水功能增加查询条件用水时长，修改sql语句
---
pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml | 101 ++++++++++++++++++++++++++++++--------------------
1 files changed, 61 insertions(+), 40 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
index a0ce5e1..4be4239 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -80,10 +80,10 @@
global:
dev: false #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
dsName: ym #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
- sql:
- print: true #鏄惁鎵撳嵃SQL璇彞锛宼rue鎴杅alse
nginx:
+ root: E:/apps/pipIrr/nginx-1.27.0
webPort: 54321
+ webFilePort: 64321
mw:
webPort: 8070 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢�
actutorPort: 9070 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢�
@@ -194,112 +194,112 @@
supportedFileTypes: docx,xlsx,doc,xls,pdf #鏀寔鐨勬枃妗ｏ紙闈炲獟浣撴枃浠讹紝濡傜収鐗囥�佸綍闊炽�佸綍鍍忥級鏂囦欢绫诲瀷
sv1:
id: dyFile1
- absolutePath: E:/java/nginx-1.24.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://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
- webDownloadPath: http://127.0.0.1:${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:/java/nginx-1.24.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://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://127.0.0.1:${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:/java/nginx-1.24.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://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://127.0.0.1:${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:/java/nginx-1.24.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://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://127.0.0.1:${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:/java/nginx-1.24.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://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://127.0.0.1:${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:/java/nginx-1.24.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://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://127.0.0.1:${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:/java/nginx-1.24.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://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://127.0.0.1:${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:/java/nginx-1.24.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://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://127.0.0.1:${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:/java/nginx-1.24.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://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://127.0.0.1:${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:/java/nginx-1.24.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://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://127.0.0.1:${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:/java/nginx-1.24.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://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://127.0.0.1:${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:/java/nginx-1.24.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://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://127.0.0.1:${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:
@@ -323,6 +323,12 @@
ym:
url: "http://127.0.0.1:8070"
comSendUrl: "http://127.0.0.1:8070/rtuMw/com/send"
+ 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"
@@ -349,12 +355,28 @@
#鑷姩缁熻閰嶇疆锛岃嚜鍔ㄧ粺璁″畾鏃朵换鍔′細姣忓ぉ瀹氭椂杩涜
auto-statistics:
- startHour: 0 #寮�濮嬪皬鏃� 0
+ startHour: 0 #寮�濮嬪皬鏃讹紝蹇呴』鏄�0鐐规垨涔嬪悗锛屽彇鍊艰寖鍥存槸0~5锛屽惁StatisticsListener涓嚜鍔ㄨ缃垚0
startMinute: 5 #寮�濮嬪垎閽� 5
#閽夐拤娑堟伅鎺ㄩ��
dingtalk:
ym:
+ enable: true #鏄惁鍚敤
+ robot:
+ url: https://oapi.dingtalk.com/robot/send
+ access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
+ secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
+ at-all: true
+ mobile: 18602657034
+ mj:
+ enable: true #鏄惁鍚敤
+ robot:
+ url: https://oapi.dingtalk.com/robot/send
+ access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
+ secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
+ at-all: true
+ mobile: 18602657034
+ mq:
enable: true #鏄惁鍚敤
robot:
url: https://oapi.dingtalk.com/robot/send
@@ -381,7 +403,6 @@
#闃�鎺у櫒鍙傛暟
rtu:
- batteryVolt: 17
signalIntensity:
weak: 10
ordinary: 20
--
Gitblit v1.8.0