From e3a585f2e592a96d2f5251db43af55abe6699970 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期二, 15 十月 2024 17:58:29 +0800
Subject: [PATCH] 优化代码 控制器查询 最近未报数的取水口分页优化 取水口管理与测控一体阀合并

---
 pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml |   51 +++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 41 insertions(+), 10 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 6bfe3ba..777fbf4 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -68,11 +68,10 @@
         lazy-load-trigger-methods: ""  # 闃绘尅涓嶇浉骞茬殑鎿嶄綔瑙﹀彂锛屽疄鐜版噿鍔犺浇
         cache-enabled: true  #鎵撳紑鍏ㄥ眬缂撳瓨寮�鍏筹紙浜岀骇鐜锛夛紝榛樿鍊兼槸true
         default-enum-type-handler: com.dy.common.mybatis.envm.EnumCodeTypeHandler
-    type-handlers-package: com.dy.pipIrrGlobal.pojoBa.MySqlJsonHandler
 
 pipIrr:
     global:
-        dev: false   #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
+        dev: false  #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
         dsName: ym  #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
     mw:
         webPort: 8070
@@ -144,14 +143,22 @@
     divisionCode: 120114403100
 
 
-#閫氳鍗忚
+#閫氳涓棿浠剁浉鍏抽厤缃�
 #protocol: DYJS_2023,DYJS_2024
 mw:
     #鍛戒护鍙戦�佸湴鍧�(涓紑鏄満鏋則ag锛屽叾涔熸槸鏁版嵁婧愬悗缂�鍚嶇О)
     ym:
         comSendUrl: "http://127.0.0.1:8070/rtuMw/com/send"
+        rtuLogFileUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogFile"
+        rtuLogTextUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogText"
     pj:
         comSendUrl: "http://127.0.0.1:8071/rtuMw/com/send"
+        rtuLogFileUrl: "http://127.0.0.1:8071/rtuMw/com/rtuLogFile"
+        rtuLogTextUrl: "http://127.0.0.1:8071/rtuMw/com/rtuLogText"
+    test:
+        comSendUrl: "http://127.0.0.1:8072/rtuMw/com/send"
+        rtuLogFileUrl: "http://127.0.0.1:8072/rtuMw/com/rtuLogFile"
+        rtuLogTextUrl: "http://127.0.0.1:8072/rtuMw/com/rtuLogText"
     #鐩戞祴鎺у埗妯″潡鍥炶皟鍦板潃
     rtuCallbackUrl_rm: "http://127.0.0.1:8081/remote/comRes/receive"
     #寰俊灏忕▼搴忓洖璋冨湴鍧�
@@ -163,6 +170,7 @@
         - /sso/sso
         - /remote/comRes/receive
         - /wx/comRes/receive
+        - /app/captcha/get
 #鑷姩缁熻閰嶇疆锛岃嚜鍔ㄧ粺璁″畾鏃朵换鍔′細姣忓ぉ瀹氭椂杩涜
 auto-statistics:
     startHour: 0 #寮�濮嬪皬鏃� 0
@@ -170,12 +178,30 @@
 
 #閽夐拤娑堟伅鎺ㄩ��
 dingtalk:
-    robot:
-        url: https://oapi.dingtalk.com/robot/send
-        access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
-        secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
-    at-all: true
-    mobile: 18602657034
+    ym:
+        enable: true #鏄惁鍚敤
+        robot:
+            url: https://oapi.dingtalk.com/robot/send
+            access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
+            secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
+        at-all: true
+        mobile: 18602657034
+    pj:
+        enable: true #鏄惁鍚敤
+        robot:
+            url: https://oapi.dingtalk.com/robot/send
+            access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
+            secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
+        at-all: true
+        mobile: 18602657034
+    test:
+        enable: true #鏄惁鍚敤
+        robot:
+            url: https://oapi.dingtalk.com/robot/send
+            access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
+            secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
+        at-all: true
+        mobile: 18602657034
 
 #闃�鎺у櫒鍙傛暟
 rtu:
@@ -183,4 +209,9 @@
     signalIntensity:
         weak: 10
         ordinary: 20
-#        strong: 20
\ No newline at end of file
+#        strong: 20
+
+#铏氭嫙鍗¢厤缃弬鏁�
+vc:
+    #铏氭嫙鍗℃渶浣庝綑棰濇姤璀﹀��
+    alarmValue: 10
\ No newline at end of file

--
Gitblit v1.8.0