From a0f875081e27e737b7802bdb2a5b4e1bd6e58c47 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 29 十月 2024 13:37:44 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/resources/application.yml | 2
pipIrr-platform/pipIrr-global/src/main/resources/application-database(开发测试---单数据库).yml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/WaterConsumption.java | 2
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application.yml | 2
pipIrr-platform/pipIrr-global/src/main/resources/application-database-sp.yml | 12 +-
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application.yml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/qo/QoCommand.java | 11 ++
pipIrr-platform/pipIrr-global/src/main/resources/application-global(test测试系统).yml | 6
pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application.yml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Alarm.java | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoCommand.java | 8 +
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandSv.java | 11 --
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/CommandGet.java | 2
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Recharge.java | 2
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/ValveOpen.java | 2
pipIrr-platform/pipIrr-global/src/main/resources/application-global(ym元谋系统).yml | 6
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/CollectPeriod.java | 2
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Card.java | 2
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Domain.java | 2
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Usability.java | 2
pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/resources/application.yml | 2
pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml | 8 +-
pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/resources/application.yml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardCtrl.java | 1
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml | 2
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml | 12 +-
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/AutomaticClose.java | 2
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/DrivenWell.java | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Constant.java | 57 -------------
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/qo/OnLineIntakesQO.java | 2
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application.yml | 4
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application.yml | 2
/dev/null | 8 --
pipIrr-platform/pipIrr-global/src/main/resources/application-database.yml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/QueryVo.java | 2
pipIrr-platform/pipIrr-global/src/main/resources/application-global(开发测试---166PC机).yml | 6
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application.yml | 2
pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml | 6
pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/resources/application.yml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Addr.java | 2
pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/resources/application.yml | 2
41 files changed, 90 insertions(+), 120 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/bak/application-database-pj.yml b/pipIrr-platform/pipIrr-global/bak/application-database-pj.yml
deleted file mode 100644
index 6142a2b..0000000
--- a/pipIrr-platform/pipIrr-global/bak/application-database-pj.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-# 鏁版嵁婧愰厤缃�
-spring:
- datasource: #閰嶇疆鏁版嵁婧�
- pj:
- #name: pj
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://192.168.40.166:3306/pipIrr_pj?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
-# url: jdbc:mysql://8.130.130.233:3306/pipIrr_pj?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
-# url: jdbc:mysql://127.0.0.1:3306/pipIrr_pj?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
-# url: jdbc:mysql://8.140.179.55:3306/pipIrr_pj?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
- username: root
- password: dysql,;.abc!@#
- druid:
- # 鏁版嵁婧愬悕绉帮細褰撳瓨鍦ㄥ涓暟鎹簮鏃讹紝璁剧疆鍚嶅瓧鍙互寰堟柟渚跨殑鏉ヨ繘琛屽尯鍒�,榛樿鑷姩鐢熸垚鍚嶇О锛屾牸寮忔槸锛�"DataSource-" + System.identityHashCode(this)
- name: druid-mysql-pj
- #閰嶇疆鍒濆鍖栧ぇ灏忋�佹渶灏忋�佹渶澶�
- initialSize: 10
- minIdle: 10
- maxActive: 100
- # 鑾峰彇杩炴帴鏃舵渶澶х瓑寰呮椂闂�,鍗曚綅姣銆傞厤缃簡maxWait涔嬪悗,缂虹渷鍚敤鍏钩閿�,骞跺彂鏁堢巼浼氭湁鎵�涓嬮檷,濡傛灉闇�瑕佸彲浠ラ�氳繃閰嶇疆useUnfairLock灞炴�т负true浣跨敤闈炲叕骞抽攣
- maxWait: 6000
- #閰嶇疆闂撮殧澶氫箙杩涜涓�娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆绉掋�� 榛樿鏄�60s锛屽お闀垮彲鑳戒細瀵艰嚧鏃犳硶鍙婃椂妫�娴嬪埌杩炴帴涓柇
- timeBetweenEvictionRunsMillis: 60000
- #閰嶇疆涓�涓繛鎺ュ湪杩炴帴姹犱腑鐨勬渶灏忕敓瀛樻椂闂淬�佹渶澶х敓瀛樻椂闂达紝瓒呰繃鏈�澶х敓瀛樻椂闂翠細琚Щ闄わ紝鍗曚綅姣銆�
- minEvictableIdleTimeMillis: 300000
- maxEvictableIdleTimeMillis: 900000
- #鎺㈡椿銆侀獙璇侀摼鎺ユ湁鏁堟�х殑鏌ヨ锛屾柊鐗堟湰榛樿浣跨敤mysqlPing浠ｆ浛
- #validation-query: select 1 #娉ㄩ噴鎺夛紝閲囩敤榛樿鐨刴ysqlPing
- #閰嶇疆浠庤繛鎺ユ睜鑾峰彇杩炴帴鏃讹紝褰撹繛鎺ョ┖闂叉椂闂村ぇ浜巘imeBetweenEvictionRunsMillis鏃舵槸鍚︽鏌ヨ繛鎺ユ湁鏁堟�э紝true姣忔閮芥鏌ワ紱false涓嶆鏌ャ��
- testWhileIdle: true
- #閰嶇疆浠庤繛鎺ユ睜鑾峰彇杩炴帴鏃跺拰鍚戣繛鎺ユ睜褰掕繕杩炴帴鏃讹紝鏄惁妫�鏌ヨ繛鎺ユ湁鏁堟��
- #姣忔鑾峰彇鎴栧綊杩樿繛鎺ラ兘妫�娴嬪お棰戠箒锛岄櫎闈炵壒鍒噸瑕佹垨缃戠粶鐗瑰埆涓嶅彲闈犵瓑鎯呭喌锛屽缓璁敤testWhileIdle + timeBetweenEvictionRunsMillis浠ｆ浛銆�-->
- testOnBorrow: false
- testOnReturn: false
- #閰嶇疆鏄惁瀹氭湡鎺㈡椿銆佹帰娲婚棿闅�, 榛樿120s
- keepAlive: true
- #keepAliveBetweenTimeMillis must be greater than timeBetweenEvictionRunsMillis
- keepAliveBetweenTimeMillis: 1200000
- #閰嶇疆涓�涓繛鎺ユ渶澶т娇鐢ㄦ鏁帮紝閬垮厤闀挎椂闂翠娇鐢ㄧ浉鍚岃繛鎺ラ�犳垚鏈嶅姟鍣ㄧ璐熻浇涓嶅潎琛°��
- phyMaxUseCount: 1000
- #鏄惁缂撳瓨preparedStatement锛屼篃灏辨槸PSCache銆侾SCache瀵规敮鎸佹父鏍囩殑鏁版嵁搴撴�ц兘鎻愬崌宸ㄥぇ锛屾瘮濡傝oracle銆傚湪mysql涓嬪缓璁叧闂��
- poolPreparedStatements: false
- #瑕佸惎鐢≒SCache锛屽繀椤婚厤缃ぇ浜�0锛屽綋澶т簬0鏃讹紝poolPreparedStatements鑷姩瑙﹀彂淇敼涓簍rue銆傚湪Druid涓紝涓嶄細瀛樺湪Oracle涓婸SCache鍗犵敤鍐呭瓨杩囧鐨勯棶棰橈紝鍙互鎶婅繖涓暟鍊奸厤缃ぇ涓�浜涳紝姣斿璇�100
- maxOpenPreparedStatements: -1
- #鎸囧畾姣忎釜杩炴帴涓奝SCache鐨勫ぇ灏�
- maxPoolPreparedStatementPerConnectionSize: 20
- #灞炴�х被鍨嬫槸瀛楃涓诧紝閫氳繃鍒悕鐨勬柟寮忛厤缃墿灞曟彃浠讹紝甯哥敤鐨勬彃浠舵湁锛�
- #鐩戞帶缁熻鐢ㄧ殑filter:stat锛屾棩蹇楃敤鐨刦ilter:log4j锛岄槻寰ql娉ㄥ叆鐨刦ilter:wall
- #寮冪敤filter:stat锛岃https://blog.csdn.net/K_520_W/article/details/132382812
- filters: stat,wall,config
- webStatFilter:
- # 娣诲姞杩囨护瑙勫垯
- urlPattern: /*
- # 蹇界暐杩囨护鏍煎紡
- exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
- statViewServlet:
- # 璁剧疆ip鐧藉悕鍗�
- # allow: 127.0.0.1
- # 璁剧疆ip榛戝悕鍗曪紝浼樺厛绾ч珮浜庣櫧鍚嶅崟
- deny:
- # 璁剧疆鎺у埗鍙扮鐞嗙敤鎴�
- # loginUsername: root
- # loginPassword: root
- # 鏄惁鍙互閲嶇疆鏁版嵁
- resetEnable: false
- # 寮�鍚痙ruid鐩戞帶椤甸潰
- enabled: true
diff --git a/pipIrr-platform/pipIrr-global/bak/application-database-sp.yml b/pipIrr-platform/pipIrr-global/bak/application-database-sp.yml
deleted file mode 100644
index 7709fba..0000000
--- a/pipIrr-platform/pipIrr-global/bak/application-database-sp.yml
+++ /dev/null
@@ -1,67 +0,0 @@
-# 鏁版嵁婧愰厤缃�
-spring:
- datasource: #閰嶇疆鏁版嵁婧�
- sp:
- #name: sp
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://192.168.40.166:3306/pipIrr_sp?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
-# url: jdbc:mysql://8.130.130.233:3306/pipIrr_sp?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
-# url: jdbc:mysql://127.0.0.1:3306/pipIrr_sp?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
-# url: jdbc:mysql://8.140.179.55:3306/pipIrr_sp?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
- username: root
- password: dysql,;.abc!@#
- druid:
- # 鏁版嵁婧愬悕绉帮細褰撳瓨鍦ㄥ涓暟鎹簮鏃讹紝璁剧疆鍚嶅瓧鍙互寰堟柟渚跨殑鏉ヨ繘琛屽尯鍒�,榛樿鑷姩鐢熸垚鍚嶇О锛屾牸寮忔槸锛�"DataSource-" + System.identityHashCode(this)
- name: druid-mysql-sp
- #閰嶇疆鍒濆鍖栧ぇ灏忋�佹渶灏忋�佹渶澶�
- initialSize: 10
- minIdle: 10
- maxActive: 100
- # 鑾峰彇杩炴帴鏃舵渶澶х瓑寰呮椂闂�,鍗曚綅姣銆傞厤缃簡maxWait涔嬪悗,缂虹渷鍚敤鍏钩閿�,骞跺彂鏁堢巼浼氭湁鎵�涓嬮檷,濡傛灉闇�瑕佸彲浠ラ�氳繃閰嶇疆useUnfairLock灞炴�т负true浣跨敤闈炲叕骞抽攣
- maxWait: 60000
- #閰嶇疆闂撮殧澶氫箙杩涜涓�娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆绉掋�� 榛樿鏄�60s锛屽お闀垮彲鑳戒細瀵艰嚧鏃犳硶鍙婃椂妫�娴嬪埌杩炴帴涓柇
- timeBetweenEvictionRunsMillis: 60000
- #閰嶇疆涓�涓繛鎺ュ湪杩炴帴姹犱腑鐨勬渶灏忕敓瀛樻椂闂淬�佹渶澶х敓瀛樻椂闂达紝瓒呰繃鏈�澶х敓瀛樻椂闂翠細琚Щ闄わ紝鍗曚綅姣銆�
- minEvictableIdleTimeMillis: 300000
- maxEvictableIdleTimeMillis: 900000
- #鎺㈡椿銆侀獙璇侀摼鎺ユ湁鏁堟�х殑鏌ヨ锛屾柊鐗堟湰榛樿浣跨敤mysqlPing浠ｆ浛
- #validation-query: select 1 #娉ㄩ噴鎺夛紝閲囩敤榛樿鐨刴ysqlPing
- #閰嶇疆浠庤繛鎺ユ睜鑾峰彇杩炴帴鏃讹紝褰撹繛鎺ョ┖闂叉椂闂村ぇ浜巘imeBetweenEvictionRunsMillis鏃舵槸鍚︽鏌ヨ繛鎺ユ湁鏁堟�э紝true姣忔閮芥鏌ワ紱false涓嶆鏌ャ��
- testWhileIdle: true
- #閰嶇疆浠庤繛鎺ユ睜鑾峰彇杩炴帴鏃跺拰鍚戣繛鎺ユ睜褰掕繕杩炴帴鏃讹紝鏄惁妫�鏌ヨ繛鎺ユ湁鏁堟��
- #姣忔鑾峰彇鎴栧綊杩樿繛鎺ラ兘妫�娴嬪お棰戠箒锛岄櫎闈炵壒鍒噸瑕佹垨缃戠粶鐗瑰埆涓嶅彲闈犵瓑鎯呭喌锛屽缓璁敤testWhileIdle + timeBetweenEvictionRunsMillis浠ｆ浛銆�-->
- testOnBorrow: false
- testOnReturn: false
- #閰嶇疆鏄惁瀹氭湡鎺㈡椿銆佹帰娲婚棿闅�, 榛樿120s
- keepAlive: true
- #keepAliveBetweenTimeMillis must be greater than timeBetweenEvictionRunsMillis
- keepAliveBetweenTimeMillis: 1200000
- #閰嶇疆涓�涓繛鎺ユ渶澶т娇鐢ㄦ鏁帮紝閬垮厤闀挎椂闂翠娇鐢ㄧ浉鍚岃繛鎺ラ�犳垚鏈嶅姟鍣ㄧ璐熻浇涓嶅潎琛°��
- phyMaxUseCount: 1000
- #鏄惁缂撳瓨preparedStatement锛屼篃灏辨槸PSCache銆侾SCache瀵规敮鎸佹父鏍囩殑鏁版嵁搴撴�ц兘鎻愬崌宸ㄥぇ锛屾瘮濡傝oracle銆傚湪mysql涓嬪缓璁叧闂��
- poolPreparedStatements: false
- #瑕佸惎鐢≒SCache锛屽繀椤婚厤缃ぇ浜�0锛屽綋澶т簬0鏃讹紝poolPreparedStatements鑷姩瑙﹀彂淇敼涓簍rue銆傚湪Druid涓紝涓嶄細瀛樺湪Oracle涓婸SCache鍗犵敤鍐呭瓨杩囧鐨勯棶棰橈紝鍙互鎶婅繖涓暟鍊奸厤缃ぇ涓�浜涳紝姣斿璇�100
- maxOpenPreparedStatements: -1
- #鎸囧畾姣忎釜杩炴帴涓奝SCache鐨勫ぇ灏�
- maxPoolPreparedStatementPerConnectionSize: 20
- #灞炴�х被鍨嬫槸瀛楃涓诧紝閫氳繃鍒悕鐨勬柟寮忛厤缃墿灞曟彃浠讹紝甯哥敤鐨勬彃浠舵湁锛�
- #鐩戞帶缁熻鐢ㄧ殑filter:stat锛屾棩蹇楃敤鐨刦ilter:log4j锛岄槻寰ql娉ㄥ叆鐨刦ilter:wall
- filters: stat,wall,config
- webStatFilter:
- # 娣诲姞杩囨护瑙勫垯
- urlPattern: /*
- # 蹇界暐杩囨护鏍煎紡
- exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
- statViewServlet:
- # 璁剧疆ip鐧藉悕鍗�
- # allow: 127.0.0.1
- # 璁剧疆ip榛戝悕鍗曪紝浼樺厛绾ч珮浜庣櫧鍚嶅崟
- deny:
- # 璁剧疆鎺у埗鍙扮鐞嗙敤鎴�
- # loginUsername: root
- # loginPassword: root
- # 鏄惁鍙互閲嶇疆鏁版嵁
- resetEnable: false
- # 寮�鍚痙ruid鐩戞帶椤甸潰
- enabled: true
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/bak/application-database-ym.yml b/pipIrr-platform/pipIrr-global/bak/application-database-ym.yml
deleted file mode 100644
index 5c2f2d8..0000000
--- a/pipIrr-platform/pipIrr-global/bak/application-database-ym.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-# 鏁版嵁婧愰厤缃�
-spring:
- datasource: #閰嶇疆鏁版嵁婧�
- ym:
- #name: ym
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://192.168.40.166:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
-# url: jdbc:mysql://8.130.130.233:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
-# url: jdbc:mysql://127.0.0.1:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
-# url: jdbc:mysql://8.140.179.55:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
- username: root
- password: dysql,;.abc!@#
- druid:
- # 鏁版嵁婧愬悕绉帮細褰撳瓨鍦ㄥ涓暟鎹簮鏃讹紝璁剧疆鍚嶅瓧鍙互寰堟柟渚跨殑鏉ヨ繘琛屽尯鍒�,榛樿鑷姩鐢熸垚鍚嶇О锛屾牸寮忔槸锛�"DataSource-" + System.identityHashCode(this)
- name: druid-mysql-ym
- #閰嶇疆鍒濆鍖栧ぇ灏忋�佹渶灏忋�佹渶澶�
- initialSize: 10
- minIdle: 10
- maxActive: 100
- # 鑾峰彇杩炴帴鏃舵渶澶х瓑寰呮椂闂�,鍗曚綅姣銆傞厤缃簡maxWait涔嬪悗,缂虹渷鍚敤鍏钩閿�,骞跺彂鏁堢巼浼氭湁鎵�涓嬮檷,濡傛灉闇�瑕佸彲浠ラ�氳繃閰嶇疆useUnfairLock灞炴�т负true浣跨敤闈炲叕骞抽攣
- maxWait: 60000
- #閰嶇疆闂撮殧澶氫箙杩涜涓�娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆绉掋�� 榛樿鏄�60s锛屽お闀垮彲鑳戒細瀵艰嚧鏃犳硶鍙婃椂妫�娴嬪埌杩炴帴涓柇
- timeBetweenEvictionRunsMillis: 60000
- #閰嶇疆涓�涓繛鎺ュ湪杩炴帴姹犱腑鐨勬渶灏忕敓瀛樻椂闂淬�佹渶澶х敓瀛樻椂闂达紝瓒呰繃鏈�澶х敓瀛樻椂闂翠細琚Щ闄わ紝鍗曚綅姣銆�
- minEvictableIdleTimeMillis: 300000
- maxEvictableIdleTimeMillis: 900000
- #鎺㈡椿銆侀獙璇侀摼鎺ユ湁鏁堟�х殑鏌ヨ锛屾柊鐗堟湰榛樿浣跨敤mysqlPing浠ｆ浛
- #validation-query: select 1 #娉ㄩ噴鎺夛紝閲囩敤榛樿鐨刴ysqlPing
- #閰嶇疆浠庤繛鎺ユ睜鑾峰彇杩炴帴鏃讹紝褰撹繛鎺ョ┖闂叉椂闂村ぇ浜巘imeBetweenEvictionRunsMillis鏃舵槸鍚︽鏌ヨ繛鎺ユ湁鏁堟�э紝true姣忔閮芥鏌ワ紱false涓嶆鏌ャ��
- testWhileIdle: true
- #閰嶇疆浠庤繛鎺ユ睜鑾峰彇杩炴帴鏃跺拰鍚戣繛鎺ユ睜褰掕繕杩炴帴鏃讹紝鏄惁妫�鏌ヨ繛鎺ユ湁鏁堟��
- #姣忔鑾峰彇鎴栧綊杩樿繛鎺ラ兘妫�娴嬪お棰戠箒锛岄櫎闈炵壒鍒噸瑕佹垨缃戠粶鐗瑰埆涓嶅彲闈犵瓑鎯呭喌锛屽缓璁敤testWhileIdle + timeBetweenEvictionRunsMillis浠ｆ浛銆�-->
- testOnBorrow: false
- testOnReturn: false
- #閰嶇疆鏄惁瀹氭湡鎺㈡椿銆佹帰娲婚棿闅�, 榛樿120s
- keepAlive: true
- #keepAliveBetweenTimeMillis must be greater than timeBetweenEvictionRunsMillis
- keepAliveBetweenTimeMillis: 1200000
- #閰嶇疆涓�涓繛鎺ユ渶澶т娇鐢ㄦ鏁帮紝閬垮厤闀挎椂闂翠娇鐢ㄧ浉鍚岃繛鎺ラ�犳垚鏈嶅姟鍣ㄧ璐熻浇涓嶅潎琛°��
- phyMaxUseCount: 1000
- #鏄惁缂撳瓨preparedStatement锛屼篃灏辨槸PSCache銆侾SCache瀵规敮鎸佹父鏍囩殑鏁版嵁搴撴�ц兘鎻愬崌宸ㄥぇ锛屾瘮濡傝oracle銆傚湪mysql涓嬪缓璁叧闂��
- poolPreparedStatements: false
- #瑕佸惎鐢≒SCache锛屽繀椤婚厤缃ぇ浜�0锛屽綋澶т簬0鏃讹紝poolPreparedStatements鑷姩瑙﹀彂淇敼涓簍rue銆傚湪Druid涓紝涓嶄細瀛樺湪Oracle涓婸SCache鍗犵敤鍐呭瓨杩囧鐨勯棶棰橈紝鍙互鎶婅繖涓暟鍊奸厤缃ぇ涓�浜涳紝姣斿璇�100
- maxOpenPreparedStatements: -1
- #鎸囧畾姣忎釜杩炴帴涓奝SCache鐨勫ぇ灏�
- maxPoolPreparedStatementPerConnectionSize: 20
- #灞炴�х被鍨嬫槸瀛楃涓诧紝閫氳繃鍒悕鐨勬柟寮忛厤缃墿灞曟彃浠讹紝甯哥敤鐨勬彃浠舵湁锛�
- #鐩戞帶缁熻鐢ㄧ殑filter:stat锛屾棩蹇楃敤鐨刦ilter:log4j锛岄槻寰ql娉ㄥ叆鐨刦ilter:wall
- filters: stat,wall,config
- webStatFilter:
- # 娣诲姞杩囨护瑙勫垯
- urlPattern: /*
- # 蹇界暐杩囨护鏍煎紡
- exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
- statViewServlet:
- # 璁剧疆ip鐧藉悕鍗�
- # allow: 127.0.0.1
- # 璁剧疆ip榛戝悕鍗曪紝浼樺厛绾ч珮浜庣櫧鍚嶅崟
- deny:
- # 璁剧疆鎺у埗鍙扮鐞嗙敤鎴�
- # loginUsername: root
- # loginPassword: root
- # 鏄惁鍙互閲嶇疆鏁版嵁
- resetEnable: false
- # 寮�鍚痙ruid鐩戞帶椤甸潰
- enabled: true
-
diff --git a/pipIrr-platform/pipIrr-global/bak/application-database.yml b/pipIrr-platform/pipIrr-global/bak/application-database.yml
deleted file mode 100644
index 30206f2..0000000
--- a/pipIrr-platform/pipIrr-global/bak/application-database.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-# 鏁版嵁婧愰厤缃�
-spring:
- #澶氭暟鎹簮闇�瑕侀厤缃�
- main:
- allow-bean-definition-overriding: true #璁剧疆涓簍rue鏃讹紝鍚庡畾涔夌殑bean浼氳鐩栦箣鍓嶅畾涔夌殑鐩稿悓鍚嶇О鐨刡ean
- datasource: #閰嶇疆鏁版嵁婧�
- #澶氫釜鏁版嵁婧愬悕绉板湪姝ら厤缃紝瑕佹眰涓巗pring銆俤atasource銆俒ym][pj]涓殑涓�鑷�
- names: ym, pj, sp
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Constant.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Constant.java
index 34e972d..3dd0089 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Constant.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Constant.java
@@ -13,13 +13,9 @@
public static final Integer no = 0 ;
public static final String YES = "1" ;
public static final String NO = "0" ;
-
- // 椤圭洰缂栧彿
- public static final Integer projectCode_ym = 100;
- public static final Integer projectCode_pj = 101;
-
- // 鍗忚鍒楄〃
- public static final String[] protocol = {"DYJS_2023", "DYJS_2024"};
+//
+// // 鍗忚鍒楄〃
+// public static final String[] protocol = {"DYJS_2023", "DYJS_2024"};
public static List<String[]> yesNo(){
List<String[]> list = new ArrayList<>() ;
@@ -51,53 +47,6 @@
}
return null ;
}
-//
-// // 1銆佸埛鍗″紑闃�锛�2鍒峰崱鍏抽榾锛�3銆佷腑蹇冪珯寮�闃�锛�4銆佷腑蹇冪珯鍏抽榾锛�5銆佹瑺璐瑰叧闃�锛�
-// // 6銆佹祦閲忚鏁呴殰鍏抽榾锛�7銆佺揣鎬ュ叧闃�锛�8銆佺敤鎴疯繙绋嬪紑闃�锛�9銆佺敤鎴疯繙绋嬪叧闃�锛�
-// // 16锛岀敤鎴峰紑闃�鍚庣閬撳唴娌℃湁姘达紝鑷姩鍏抽榾銆傜閬撲笉鍑烘按鑷姩鍏抽榾
-// public static final Integer valveOpenByIC = 1 ;//鍒峰崱寮�闃�
-// public static final Integer valveCloseByIC = 2 ;//鍒峰崱鍏抽榾
-// public static final Integer valveOpenByCenter = 3 ;//涓績绔欏紑闃�
-// public static final Integer valveCloseByCenter = 4 ;//涓績绔欏叧闃�
-// public static final Integer valveCloseByFee = 5 ;//娆犺垂鍏抽榾
-// public static final Integer valveCloseByFlowMeterFault = 6 ;//娴侀噺璁℃晠闅滃叧闃�
-// public static final Integer valveCloseByEmergency = 7 ;//绱ф�ュ叧闃�
-// public static final Integer valveOpenByRemoteUser = 8 ;//鐢ㄦ埛杩滅▼寮�闃�
-// public static final Integer valveCloseByRemoteUser = 9 ;//鐢ㄦ埛杩滅▼鍏抽榾锛�
-// public static final Integer valveCloseByNoWater = 16 ;//绠￠亾鏃犳按鑷姩鍏抽榾锛�
-//
-// public static Map<Integer, String> openCloseValveTypes(){
-// Map<Integer, String> map = new HashMap<>() ;
-// map.put(valveOpenByIC, "鍒峰崱寮�闃�");
-// map.put(valveCloseByIC , "鍒峰崱鍏抽榾") ;
-// map.put(valveOpenByCenter , "涓績绔欏紑闃�") ;
-// map.put(valveCloseByCenter , "涓績绔欏叧闃�") ;
-// map.put(valveCloseByFee , "娆犺垂鍏抽榾") ;
-// map.put(valveCloseByFlowMeterFault , "娴侀噺璁℃晠闅滃叧闃�") ;
-// map.put(valveCloseByEmergency , "绱ф�ュ叧闃�") ;
-// map.put(valveOpenByRemoteUser , "鐢ㄦ埛杩滅▼寮�闃�") ;
-// map.put(valveCloseByRemoteUser , "鐢ㄦ埛杩滅▼鍏抽榾") ;
-// map.put(valveCloseByNoWater , "绠￠亾鏃犳按鑷姩鍏抽榾") ;
-// return map ;
-// }
-// public static String openCloseValveTypeName(Integer type){
-// if(type != null){
-// return switch (type.intValue()) {
-// case 1 -> "鍒峰崱寮�闃�";
-// case 2 -> "鍒峰崱鍏抽榾";
-// case 3 -> "涓績绔欏紑闃�";
-// case 4 -> "涓績绔欏叧闃�";
-// case 5 -> "娆犺垂鍏抽榾";
-// case 6 -> "娴侀噺璁℃晠闅滃叧闃�";
-// case 7 -> "绱ф�ュ叧闃�";
-// case 8 -> "鐢ㄦ埛杩滅▼寮�闃�";
-// case 9 -> "鐢ㄦ埛杩滅▼鍏抽榾";
-// case 16 -> "绠￠亾鏃犳按鑷姩鍏抽榾";
-// default -> "鏈煡";
-// };
-// }
-// return null ;
-// }
}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoCommand.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoCommand.java
index 4cc09a9..0ac5f2c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoCommand.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoCommand.java
@@ -21,7 +21,7 @@
@JSONField(serializeUsing= ObjectWriterImplToString.class)
private Long comId;
- private String commandName;
+ private String commandName; //鍛戒护鍚嶇О
private String intakeName;
@@ -35,7 +35,9 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date resultTime;
- private String result;
+ private String state;//鎵ц鐘舵��
- private String userName;
+ private String result;//鍛戒护缁撴灉
+
+ private String userName;//鎿嶄綔浜�
}
diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-database\050\345\274\200\345\217\221\346\265\213\350\257\225---\345\215\225\346\225\260\346\215\256\345\272\223\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-database\050\345\274\200\345\217\221\346\265\213\350\257\225---\345\215\225\346\225\260\346\215\256\345\272\223\051.yml"
index a291bd2..6debbc7 100644
--- "a/pipIrr-platform/pipIrr-global/src/main/resources/application-database\050\345\274\200\345\217\221\346\265\213\350\257\225---\345\215\225\346\225\260\346\215\256\345\272\223\051.yml"
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/application-database\050\345\274\200\345\217\221\346\265\213\350\257\225---\345\215\225\346\225\260\346\215\256\345\272\223\051.yml"
@@ -4,5 +4,5 @@
main:
allow-bean-definition-overriding: true #璁剧疆涓簍rue鏃讹紝鍚庡畾涔夌殑bean浼氳鐩栦箣鍓嶅畾涔夌殑鐩稿悓鍚嶇О鐨刡ean
datasource: #閰嶇疆鏁版嵁婧�
- #澶氫釜鏁版嵁婧愬悕绉板湪姝ら厤缃紝瑕佹眰涓巗pring銆俤atasource銆俒ym][pj]涓殑涓�鑷�
+ #澶氫釜鏁版嵁婧愬悕绉板湪姝ら厤缃紝瑕佹眰涓巗pring銆俤atasource銆俒ym][sp][test]涓殑涓�鑷�
names: ym
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-database-pj.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-database-sp.yml
similarity index 94%
rename from pipIrr-platform/pipIrr-global/src/main/resources/application-database-pj.yml
rename to pipIrr-platform/pipIrr-global/src/main/resources/application-database-sp.yml
index 7eb4d18..190348e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-database-pj.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-database-sp.yml
@@ -1,18 +1,18 @@
# 鏁版嵁婧愰厤缃�
spring:
datasource: #閰嶇疆鏁版嵁婧�
- pj:
- #name: pj
+ sp:
+ #name: sp
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
-# url: jdbc:mysql://192.168.40.166:3306/pipIrr_pj?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
-# url: jdbc:mysql://8.130.130.233:3306/pipIrr_pj?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
- url: jdbc:mysql://127.0.0.1:3306/pipIrr_pj?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+# url: jdbc:mysql://192.168.40.166:3306/pipIrr_sp?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+# url: jdbc:mysql://8.130.130.233:3306/pipIrr_sp?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+ url: jdbc:mysql://127.0.0.1:3306/pipIrr_sp?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
username: root
password: dysql,;.abc!@#
druid:
# 鏁版嵁婧愬悕绉帮細褰撳瓨鍦ㄥ涓暟鎹簮鏃讹紝璁剧疆鍚嶅瓧鍙互寰堟柟渚跨殑鏉ヨ繘琛屽尯鍒�,榛樿鑷姩鐢熸垚鍚嶇О锛屾牸寮忔槸锛�"DataSource-" + System.identityHashCode(this)
- name: druid-mysql-pj
+ name: druid-mysql-sp
#閰嶇疆鍒濆鍖栧ぇ灏忋�佹渶灏忋�佹渶澶�
initialSize: 10
minIdle: 10
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-database.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-database.yml
index b4dbdab..ca1c69c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-database.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-database.yml
@@ -4,5 +4,5 @@
main:
allow-bean-definition-overriding: true #璁剧疆涓簍rue鏃讹紝鍚庡畾涔夌殑bean浼氳鐩栦箣鍓嶅畾涔夌殑鐩稿悓鍚嶇О鐨刡ean
datasource: #閰嶇疆鏁版嵁婧�
- #澶氫釜鏁版嵁婧愬悕绉板湪姝ら厤缃紝瑕佹眰涓巗pring銆俤atasource銆俒ym][pj]涓殑涓�鑷�
+ #澶氫釜鏁版嵁婧愬悕绉板湪姝ら厤缃紝瑕佹眰涓巗pring銆俤atasource銆俒ym][sp]涓殑涓�鑷�
names: ym
diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050test\346\265\213\350\257\225\347\263\273\347\273\237\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050test\346\265\213\350\257\225\347\263\273\347\273\237\051.yml"
index bb275f8..38a1991 100644
--- "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050test\346\265\213\350\257\225\347\263\273\347\273\237\051.yml"
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050test\346\265\213\350\257\225\347\263\273\347\273\237\051.yml"
@@ -289,7 +289,7 @@
#椤圭洰缂栧彿
#projectCode:
# ym: 100
-# pj: 101
+# sp: 101
#椤圭洰閰嶇疆
project:
@@ -309,7 +309,7 @@
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:
+ sp:
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"
@@ -346,7 +346,7 @@
secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
at-all: true
mobile: 18602657034
- pj:
+ sp:
enable: true #鏄惁鍚敤
robot:
url: https://oapi.dingtalk.com/robot/send
diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050ym\345\205\203\350\260\213\347\263\273\347\273\237\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050ym\345\205\203\350\260\213\347\263\273\347\273\237\051.yml"
index 46e2aab..ad1c636 100644
--- "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050ym\345\205\203\350\260\213\347\263\273\347\273\237\051.yml"
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050ym\345\205\203\350\260\213\347\263\273\347\273\237\051.yml"
@@ -289,7 +289,7 @@
#椤圭洰缂栧彿
#projectCode:
# ym: 100
-# pj: 101
+# sp: 101
#椤圭洰閰嶇疆
project:
@@ -309,7 +309,7 @@
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:
+ sp:
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"
@@ -346,7 +346,7 @@
secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
at-all: true
mobile: 18602657034
- pj:
+ sp:
enable: true #鏄惁鍚敤
robot:
url: https://oapi.dingtalk.com/robot/send
diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050\345\274\200\345\217\221\346\265\213\350\257\225---166PC\346\234\272\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050\345\274\200\345\217\221\346\265\213\350\257\225---166PC\346\234\272\051.yml"
index 399f1c8..8576d98 100644
--- "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050\345\274\200\345\217\221\346\265\213\350\257\225---166PC\346\234\272\051.yml"
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050\345\274\200\345\217\221\346\265\213\350\257\225---166PC\346\234\272\051.yml"
@@ -291,7 +291,7 @@
#椤圭洰缂栧彿
#projectCode:
# ym: 100
-# pj: 101
+# sp: 101
#椤圭洰閰嶇疆
project:
@@ -311,7 +311,7 @@
comSendUrl: "http://192.168.40.166: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:
+ sp:
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"
@@ -348,7 +348,7 @@
secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
at-all: true
mobile: 18602657034
- pj:
+ sp:
enable: true #鏄惁鍚敤
robot:
url: https://oapi.dingtalk.com/robot/send
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 4f4e784..0401ce4 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -295,7 +295,7 @@
#椤圭洰缂栧彿
#projectCode:
# ym: 100
-# pj: 101
+# sp: 101
#椤圭洰閰嶇疆
project:
@@ -315,7 +315,7 @@
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:
+ sp:
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"
@@ -352,7 +352,7 @@
secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
at-all: true
mobile: 18602657034
- pj:
+ sp:
enable: true #鏄惁鍚敤
robot:
url: https://oapi.dingtalk.com/robot/send
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml b/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
index eecab7f..ad70c53 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
@@ -50,11 +50,11 @@
<item8 defaultValue = "80" unit = "3" sort = "4" type = "2"/>
</irrigateProfile>
</org1>
- <org2 tag="pj" name="鐗囪" enable="false">
+ <org2 tag="sp" name="娌欑洏" enable="true">
<districts>
- <province name="浜戝崡鐪�" num="53" level="0">
- <city name="涓芥睙甯�" num="23" level="1">
- <country name="姘歌儨鍘�" num="28" level="2" />
+ <province name="鐢樿們鐪�" num="53" level="0">
+ <city name="閰掓硥甯�" num="23" level="1">
+ <country name="澶х闆嗗洟" num="28" level="2" />
</city>
</province>
</districts>
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml
index 98054c7..8f00124 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml
@@ -275,8 +275,6 @@
SELECT COUNT(*) AS recordCount
FROM rm_command_history his
INNER JOIN pr_intake inta ON inta.id = his.intake_id
- LEFT JOIN se_client cli ON cli.id = his.operator
- LEFT JOIN ba_user user ON user.id = his.operator
<where>
<if test="intakeId != null">
AND his.intake_id = #{intakeId}
@@ -296,17 +294,17 @@
<!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鍛戒护鏃ュ織鍘嗗彶璁板綍-->
<select id="getCommandHistories" resultType="com.dy.pipIrrGlobal.voRm.VoCommand">
SELECT his.com_id AS comId,
- his.command_name AS commandName,
+ CONCAT(his.command_name, '(', his.command_code, ')') AS commandName,
inta.name AS intakeName,
his.rtu_addr AS rtuAddr,
- his.protocol,
+ his.protocol AS protocol,
his.send_time AS sendTime,
his.result_time AS resultTime,
(CASE
WHEN his.result = 1 THEN '鎴愬姛'
ELSE '澶辫触'
- END) AS result,
- his.result_text,
+ END) AS state,
+ his.result_text AS result,
IFNULL(cli.name, user.name) AS userName
FROM rm_command_history his
INNER JOIN pr_intake inta ON inta.id = his.intake_id
@@ -327,7 +325,7 @@
AND his.send_time BETWEEN #{timeStart} AND #{timeStop}
</if>
</where>
- ORDER BY his.send_time DESC
+ ORDER BY his.com_id DESC
<trim prefix="limit ">
<if test="start != null and count != null">
#{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application.yml
index 315b008..7a0fb67 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- include: global, database, database-ym, database-pj, database-test
+ include: global, database, database-ym, database-sp, database-test
#actutor鐨剋eb绔彛
management:
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml
index addc58c..fd4f5f3 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- include: global, database, database-ym, database-pj, database-test
+ include: global, database, database-ym, database-sp, database-test
user:
defaultTrueRandomFalsePassword: true #true:閲囩敤榛樿瀵嗙爜锛宖alse:绯荤粺浜х敓闅忔満瀵嗙爜
defaultPassword: "abc_123"
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/resources/application.yml
index 047c937..c3580c0 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/resources/application.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- include: global, database, database-ym, database-pj, database-test
+ include: global, database, database-ym, database-sp, database-test
#actutor鐨剋eb绔彛
management:
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application.yml
index 54c9d83..c691881 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- include: global, database, database-ym, database-pj, database-test
+ include: global, database, database-ym, database-sp, database-test
#actutor鐨剋eb绔彛
management:
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/resources/application.yml
index 719aa5a..212528b 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/resources/application.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- include: global, database, database-ym, database-pj, database-test
+ include: global, database, database-ym, database-sp, database-test
#actutor鐨剋eb绔彛
management:
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/resources/application.yml
index 2eec135..c7ff062 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/resources/application.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- include: global, database, database-ym, database-pj, database-test
+ include: global, database, database-ym, database-sp, database-test
#actutor鐨剋eb绔彛
management:
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/resources/application.yml
index a1e4627..be4c40b 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/resources/application.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- include: global, database, database-ym, database-pj, database-test
+ include: global, database, database-ym, database-sp, database-test
#actutor鐨剋eb绔彛
management:
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandSv.java
index da9d08a..9cbb39f 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandSv.java
@@ -228,16 +228,7 @@
*/
public QueryResultVo<List<VoCommand>> getCommandHistories(QoCommand query) {
// 瀹屽杽鏌ヨ璧锋鏃堕棿
- String timeStart = query.getTimeStart();
- String timeStop = query.getTimeStop();
- if(timeStart != null) {
- timeStart = timeStart + " 00:00:00";
- query.setTimeStart(timeStart);
- }
- if(timeStop != null) {
- timeStop = timeStop + " 23:59:59";
- query.setTimeStop(timeStop);
- }
+ query.completionTime();
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(query);
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Addr.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Addr.java
index 75e4a76..5a1574a 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Addr.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Addr.java
@@ -2,6 +2,7 @@
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
+import lombok.EqualsAndHashCode;
/**
* @author ZhuBaoMin
@@ -11,6 +12,7 @@
*/
@Data
+@EqualsAndHashCode(callSuper=true)
public class Addr extends DtoBase {
public static final long serialVersionUID = 202405221656001L;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Alarm.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Alarm.java
index 5356c50..60f6875 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Alarm.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Alarm.java
@@ -3,6 +3,7 @@
import jakarta.validation.constraints.DecimalMin;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
+import lombok.EqualsAndHashCode;
/**
* @author ZhuBaoMin
@@ -12,6 +13,7 @@
*/
@Data
+@EqualsAndHashCode(callSuper=true)
public class Alarm extends DtoBase {
public static final long serialVersionUID = 202407041337001L;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/AutomaticClose.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/AutomaticClose.java
index 3b38dbf..c70dfe5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/AutomaticClose.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/AutomaticClose.java
@@ -2,6 +2,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.util.Date;
@@ -13,6 +14,7 @@
*/
@Data
+@EqualsAndHashCode(callSuper=true)
public class AutomaticClose extends DtoBase {
public static final long serialVersionUID = 202407231039001L;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Card.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Card.java
index 4194193..b62e847 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Card.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Card.java
@@ -2,6 +2,7 @@
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
+import lombok.EqualsAndHashCode;
/**
* @author ZhuBaoMin
@@ -11,6 +12,7 @@
*/
@Data
+@EqualsAndHashCode(callSuper=true)
public class Card extends DtoBase {
public static final long serialVersionUID = 202406291102001L;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/CollectPeriod.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/CollectPeriod.java
index 361c787..1c3cee8 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/CollectPeriod.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/CollectPeriod.java
@@ -4,6 +4,7 @@
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
+import lombok.EqualsAndHashCode;
/**
* @author ZhuBaoMin
@@ -13,6 +14,7 @@
*/
@Data
+@EqualsAndHashCode(callSuper=true)
public class CollectPeriod extends DtoBase {
public static final long serialVersionUID = 202407201038001L;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/CommandGet.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/CommandGet.java
index e6e8933..2228407 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/CommandGet.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/CommandGet.java
@@ -2,6 +2,7 @@
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
+import lombok.EqualsAndHashCode;
/**
* @author ZhuBaoMin
@@ -11,6 +12,7 @@
*/
@Data
+@EqualsAndHashCode(callSuper=true)
public class CommandGet extends DtoBase {
public static final long serialVersionUID = 202407041401001L;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Domain.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Domain.java
index 0ba8021..7d3c318 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Domain.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Domain.java
@@ -2,6 +2,7 @@
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
+import lombok.EqualsAndHashCode;
/**
* @author ZhuBaoMin
@@ -11,6 +12,7 @@
*/
@Data
+@EqualsAndHashCode(callSuper=true)
public class Domain extends DtoBase {
public static final long serialVersionUID = 202407050857001L;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/DrivenWell.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/DrivenWell.java
index b696021..b4e4718 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/DrivenWell.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/DrivenWell.java
@@ -1,6 +1,7 @@
package com.dy.pipIrrRemote.common.dto;
import lombok.Data;
+import lombok.EqualsAndHashCode;
/**
* @author ZhuBaoMin
@@ -10,6 +11,7 @@
*/
@Data
+@EqualsAndHashCode(callSuper=true)
public class DrivenWell extends DtoBase {
public static final long serialVersionUID = 202407041644001L;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Recharge.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Recharge.java
index d636a31..2f5a75a 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Recharge.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Recharge.java
@@ -2,6 +2,7 @@
import jakarta.validation.constraints.NotNull;
import lombok.Data;
+import lombok.EqualsAndHashCode;
/**
* @author ZhuBaoMin
@@ -11,6 +12,7 @@
*/
@Data
+@EqualsAndHashCode(callSuper=true)
public class Recharge extends DtoBase {
public static final long serialVersionUID = 202406260745001L;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Usability.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Usability.java
index b94ede4..0d54bee 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Usability.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Usability.java
@@ -2,6 +2,7 @@
import jakarta.validation.constraints.NotNull;
import lombok.Data;
+import lombok.EqualsAndHashCode;
/**
* @author ZhuBaoMin
@@ -11,6 +12,7 @@
*/
@Data
+@EqualsAndHashCode(callSuper=true)
public class Usability extends DtoBase {
public static final long serialVersionUID = 202407021101001L;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/ValveOpen.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/ValveOpen.java
index 67c911b..a225c70 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/ValveOpen.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/ValveOpen.java
@@ -1,6 +1,7 @@
package com.dy.pipIrrRemote.common.dto;
import lombok.Data;
+import lombok.EqualsAndHashCode;
/**
* @author ZhuBaoMin
@@ -10,6 +11,7 @@
*/
@Data
+@EqualsAndHashCode(callSuper=true)
public class ValveOpen extends DtoBase{
public static final long serialVersionUID = 202405231531001L;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/WaterConsumption.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/WaterConsumption.java
index 2e82180..ba18440 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/WaterConsumption.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/WaterConsumption.java
@@ -1,6 +1,7 @@
package com.dy.pipIrrRemote.common.dto;
import lombok.Data;
+import lombok.EqualsAndHashCode;
/**
* @author ZhuBaoMin
@@ -10,6 +11,7 @@
*/
@Data
+@EqualsAndHashCode(callSuper=true)
public class WaterConsumption extends DtoBase {
public static final long serialVersionUID = 202407050835001L;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/qo/OnLineIntakesQO.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/qo/OnLineIntakesQO.java
index 9be4d6e..3f35ab1 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/qo/OnLineIntakesQO.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/qo/OnLineIntakesQO.java
@@ -4,6 +4,7 @@
import jakarta.validation.constraints.Max;
import jakarta.validation.constraints.Min;
import lombok.Data;
+import lombok.EqualsAndHashCode;
/**
* @author ZhuBaoMin
@@ -13,6 +14,7 @@
*/
@Data
+@EqualsAndHashCode(callSuper=true)
public class OnLineIntakesQO extends QueryConditionVo {
/**
* 涓棿浠惰繑鍥炵殑RTU鍦ㄧ嚎鎯呭喌瀵硅薄鏁扮粍
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/qo/QoCommand.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/qo/QoCommand.java
index b75755f..eb56cad 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/qo/QoCommand.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/qo/QoCommand.java
@@ -42,4 +42,15 @@
* 鏌ヨ鎴鏃堕棿
*/
private String timeStop;
+
+
+ public void completionTime(){
+ if(timeStart != null && !timeStart.trim().equals("")) {
+ timeStart = timeStart + " 00:00:00";
+ }
+ if(timeStop != null && !timeStop.trim().equals("")) {
+ timeStop = timeStop + " 23:59:59";
+ }
+
+ }
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/QueryVo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/QueryVo.java
index 8b846ef..ddca8ac 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/QueryVo.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/QueryVo.java
@@ -2,6 +2,7 @@
import com.dy.common.webUtil.QueryConditionVo;
import lombok.Data;
+import lombok.EqualsAndHashCode;
/**
* @author ZhuBaoMin
@@ -11,6 +12,7 @@
*/
@Data
+@EqualsAndHashCode(callSuper=true)
public class QueryVo extends QueryConditionVo {
/**
* 鍙栨按鍙ｇ紪鍙�
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application.yml
index 5cd4f0b..59774f0 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- include: global, database, database-ym, database-pj, database-test
+ include: global, database, database-ym, database-sp, database-test
#actutor鐨剋eb绔彛
management:
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardCtrl.java
index 5767579..2121d22 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardCtrl.java
@@ -238,7 +238,6 @@
Integer projectNo1 = Integer.valueOf(projectNo);
String projectNo3 = String.format("%02x", projectNo1);
map.put("projectNo", projectNo3);
- //map.put("projectCode", Constant.projectCode_ym);
map.put("cardNum", cardNum);
return BaseResponseUtils.buildSuccess(map) ;
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application.yml
index bc46e5a..6c23e28 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- include: global, database, database-ym, database-pj, database-test
+ include: global, database, database-ym, database-sp, database-test
#actutor鐨剋eb绔彛
management:
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/resources/application.yml
index 456aaa4..be56532 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/resources/application.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- include: global, database, database-ym, database-pj, database-test
+ include: global, database, database-ym, database-sp, database-test
#actutor鐨剋eb绔彛
management:
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application.yml
index 295521c..11d75a7 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- include: global, database, database-ym, database-pj, database-test
+ include: global, database, database-ym, database-sp, database-test
#actutor鐨剋eb绔彛
management:
@@ -13,4 +13,4 @@
context-path: /statistics #web璁块棶涓婁笅鏂囪矾寰�
context-parameters:
#GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
- IdSuffix: ${pipIrr.statistics.IdSuffix}
+ IdSuffix: ${pipIrr.statistics.idSuffix}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application.yml
index 8c10de6..4af6dd3 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- include: global, database, database-ym, database-pj, database-test
+ include: global, database, database-ym, database-sp, database-test
#actutor鐨剋eb绔彛
management:
--
Gitblit v1.8.0