From fd17cc4990f991bdd69ad4f7f0b6e288b1d1fc47 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 28 十二月 2024 13:47:05 +0800
Subject: [PATCH] 1、农户用水量日统计中增加属性“次数”； 2、临时任务中增加“转存农户日取水量，由纵型改为横型”
---
pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 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 c67fa0f..827cf7f 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -65,7 +65,8 @@
#type-aliases-package: com.dy.pipIrrGlobal.daoBa
configuration:
#log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #鏃惰�岃緭鍑烘棩蹇楋紝鏃惰�屼笉杈撳嚭鏃ュ織
- log-impl: org.apache.ibatis.logging.log4j2.Log4j2Impl
+ #log-impl: org.apache.ibatis.logging.log4j2.Log4j2Impl 涓嶅啀搴旂敤锛屾敼涓篜rintSqlInterceptor鎷︽埅鍣ㄨ緭鍑簊ql鏃ュ織锛屼笅闈rint-sql椤归厤缃�
+ print-sql: false # 杈撳嚭sql鏃ュ織寮�鍏筹紝鎺у埗PrintSqlInterceptor鎷︽埅鍣ㄦ槸鍚﹀姞杞�
#寮�鍚┘宄皍Name鑷姩鏄犲皠鍒皍_name
#2023-10-24缁忓疄楠岋紝涓嬮潰閰嶇疆true鎴杅alse锛岄兘鑳戒粠u_name鏄犲皠鍒皍Name
#map-underscore-to-camel-case: true
@@ -136,7 +137,13 @@
webPort: 8089
actutorPort: 9089
idSuffix: 11
+ # 2023-10-24鏂板锛岀敤浜庢墽琛屼复鏃朵换鍔★紝渚嬪鍒犻櫎鏁版嵁搴撲腑涓婁簺鍑洪敊鐨勬暟鎹�
+ temp:
+ webPort: 8099
+ actutorPort: 9099
+ idSuffix: 98
+ # 鍒嗗竷寮弚eb鏂囦欢绯荤粺
file:
idSuffix: 99
file1:
@@ -310,10 +317,16 @@
#閫氳涓棿浠剁浉鍏抽厤缃�
#protocol: DYJS_2023,DYJS_2024
mw:
- #鍛戒护鍙戦�佸湴鍧�(涓紑鏄満鏋則ag锛屽叾涔熸槸鏁版嵁婧愬悗缂�鍚嶇О)
+ #鍛戒护鍙戦�侀�氫俊涓棿浠跺湴鍧�
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"
@@ -340,12 +353,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
@@ -369,6 +398,7 @@
secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
at-all: true
mobile: 18602657034
+
#闃�鎺у櫒鍙傛暟
rtu:
batteryVolt: 17
--
Gitblit v1.8.0