From 783636b8af8b5309ad1e6f1598aed7df10bebb63 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 23 八月 2024 15:17:25 +0800
Subject: [PATCH] 修改用户分页查询接口一个用户两个角色会出现两条数据的bug
---
pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 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 fc10859..83b82ab 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: true #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
dsName: ym #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
mw:
webPort: 8070
@@ -150,7 +149,7 @@
#鍛戒护鍙戦�佸湴鍧�(涓紑鏄満鏋則ag锛屽叾涔熸槸鏁版嵁婧愬悗缂�鍚嶇О)
ym:
comSendUrl: "http://127.0.0.1:8070/rtuMw/com/send"
- sp:
+ pj:
comSendUrl: "http://127.0.0.1:8071/rtuMw/com/send"
#鐩戞祴鎺у埗妯″潡鍥炶皟鍦板潃
rtuCallbackUrl_rm: "http://127.0.0.1:8081/remote/comRes/receive"
@@ -165,8 +164,8 @@
- /wx/comRes/receive
#鑷姩缁熻閰嶇疆锛岃嚜鍔ㄧ粺璁″畾鏃朵换鍔′細姣忓ぉ瀹氭椂杩涜
auto-statistics:
- startHour: 17 #寮�濮嬪皬鏃� 0
- startMinute: 19 #寮�濮嬪垎閽� 5
+ startHour: 0 #寮�濮嬪皬鏃� 0
+ startMinute: 5 #寮�濮嬪垎閽� 5
#閽夐拤娑堟伅鎺ㄩ��
dingtalk:
@@ -175,4 +174,17 @@
access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
at-all: true
- mobile: 18602657034
\ No newline at end of file
+ mobile: 18602657034
+
+#闃�鎺у櫒鍙傛暟
+rtu:
+ batteryVolt: 17
+ signalIntensity:
+ weak: 10
+ ordinary: 20
+# strong: 20
+
+#铏氭嫙鍗￠厤缃弬鏁�
+vc:
+ #铏氭嫙鍗℃渶浣庝綑棰濇姤璀﹀��
+ alarmValue: 10
\ No newline at end of file
--
Gitblit v1.8.0