From 7a30cb7329eb065d9a95213b327818412c2d5d0e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 03 三月 2025 14:22:22 +0800
Subject: [PATCH] 1、表阀一体机新协议解析优化； 2、取水口实体编辑更新逻辑修改，去除引起bug的代码。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlCreate.java | 15 +++++++
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd93_A3Vo.java | 8 ++--
pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/upData/UpOpenCloseValve.java | 4 +-
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java | 6 +-
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_93_A3_Down.java | 6 --
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_92_A2_Down.java | 6 --
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java | 16 ++++----
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_93_A3_Up.java | 2
pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/resources/config.xml | 2
pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml | 54 +++++++++++++-------------
10 files changed, 63 insertions(+), 56 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_92_A2_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_92_A2_Down.java
index 26eb4b6..c767292 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_92_A2_Down.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_92_A2_Down.java
@@ -94,11 +94,7 @@
bs[index] = cvo.projectNo.byteValue() ;
index ++ ;
- if(cvo.controllerType.equals("01")){
- bs[index] = (byte)0xF0 ;
- }else{
- bs[index] = (byte)0x00 ;
- }
+ GlCreate.createValveOrPump(cvo.controllerType, bs, index) ;
index ++ ;
GlCreate.createIcCardNo(cvo.icCardNo, bs, index);
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_93_A3_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_93_A3_Down.java
index dc8c81a..fa482cf 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_93_A3_Down.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_93_A3_Down.java
@@ -73,11 +73,7 @@
bs[index] = cvo.projectNo.byteValue() ;
index ++ ;
- if(cvo.controllerType.equals("01")){
- bs[index] = (byte)0xF0 ;
- }else{
- bs[index] = (byte)0x00 ;
- }
+ GlCreate.createValveOrPump(cvo.controllerType, bs, index) ;
index ++ ;
GlCreate.createIcCardNo(cvo.icCardNo, bs, index);
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_93_A3_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_93_A3_Up.java
index e5c444e..9d82d8e 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_93_A3_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_93_A3_Up.java
@@ -48,7 +48,7 @@
if(para.data != null && para.data.getSubData() != null){
DataCd93_A3Vo subData = (DataCd93_A3Vo)((DataV202404)para.data.getSubData()).subData ;
//opResult ;//鍏虫车/闃�缁撴灉: 0x00:鎴愬姛 0x81:澶辫触
- callback.notify(new ValveStateInfo(subData.opResult.byteValue()==0?false:true));
+ callback.notify(new ValveStateInfo(subData.clResult.byteValue()==0?false:true));
}
return new MidResult[]{midRs} ;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlCreate.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlCreate.java
index 60e7d69..49f7648 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlCreate.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlCreate.java
@@ -34,6 +34,21 @@
return bsHead ;
}
+
+ /**
+ * 0xf0闃�闂� 0x00姘存车
+ * @param controllerTypeByHex
+ * @param bs
+ * @param index
+ */
+ public static void createValveOrPump(String controllerTypeByHex, byte[] bs, int index){
+ if(controllerTypeByHex != null && controllerTypeByHex.equals("57")){
+ bs[index] = (byte)0x00 ;
+ }else{
+ bs[index] = (byte)0xF0 ;
+ }
+ }
+
/**
* 鐢熸垚鎺у埗鍣ㄥ湴鍧�
* 6瀛楄妭BCD鐮侊紙12浣嶈鏀垮尯鍒掞級 + 2瀛楄妭HEX
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java
index d03d85e..97dcc4e 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java
@@ -299,10 +299,10 @@
cdData.projectNo = (int)bs[index];
index ++ ;
- cdData.opResult = bs[index];
+ cdData.clResult = bs[index];
index ++ ;
- cdData.opType = bs[index];
+ cdData.clType = bs[index];
index++ ;
cdData.icCardAddr = ByteUtil.bytes2Hex(bs, false, index, 4) ;
@@ -316,7 +316,7 @@
index += 8 ;
cdData.startDt = GlParse.parseRtuDt(bs, index) ;
- if(cdData.opResult == (byte)0x81){
+ if(cdData.clResult == (byte)0x81){
//澶辫触浜嗭紝涓嬮潰灏辨病鏈夋暟鎹簡
return ;
}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd93_A3Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd93_A3Vo.java
index ece5865..80c266c 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd93_A3Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd93_A3Vo.java
@@ -11,8 +11,8 @@
public String controllerType;//鎺у埗鍣ㄧ被鍨�
public Integer projectNo ;//椤圭洰缂栧彿
- public Byte opResult ;//鍏虫车/闃�缁撴灉: 0x00:鎴愬姛 0x81:澶辫触
- public Byte opType ;//鍏虫车/闃�鏂瑰紡: 0x00:鍒峰崱闂� 0x01:骞冲彴鍏� 0x02:APP鍏� 0x03:闈炴硶鍗″叧 0x04:姘磋〃寮傚父鍏� 0x05:鐢佃〃寮傚父鍏� 0x06:鍓╀綑姘撮噺涓嶈冻鍏� 0x07:鍓╀綑閲戦涓嶈冻鍏� 0x08:寮�娉�/闃�鍚庣閬撴病鏈夋祦閲忓叧 0x09:鎺夌數鍐嶄笂鐢点��
+ public Byte clResult;//鍏虫车/闃�缁撴灉: 0x00:鎴愬姛 0x81:澶辫触
+ public Byte clType;//鍏虫车/闃�鏂瑰紡: 0x00:鍒峰崱闂� 0x01:骞冲彴鍏� 0x02:APP鍏� 0x03:闈炴硶鍗″叧 0x04:姘磋〃寮傚父鍏� 0x05:鐢佃〃寮傚父鍏� 0x06:鍓╀綑姘撮噺涓嶈冻鍏� 0x07:鍓╀綑閲戦涓嶈冻鍏� 0x08:寮�娉�/闃�鍚庣閬撴病鏈夋祦閲忓叧 0x09:鎺夌數鍐嶄笂鐢点��
public String icCardAddr ;//IC鍗″湴鍧�锛堣繙绋嬪叧闂椂涓�0锛�
public String icCardNo ;//IC鍗＄紪鍙凤紙17浣嶆暟瀛楋級
public String orderNo ;//璁㈠崟鍙凤紙16浣嶆暟瀛楋級
@@ -43,10 +43,10 @@
sb.append(projectNo == null?"鏈煡":projectNo) ;
sb.append("\n") ;
sb.append(" 鍏虫车/闃�绫诲瀷 : ") ;
- sb.append(opType == null?"鏈煡":(opType.byteValue() == 0x00 ? "鍒峰崱":(opType.byteValue() == 0x01 ? "骞冲彴":(opType.byteValue() == 0x02 ? "APP":(opType.byteValue() == 0x03 ? "闈炴硶鍗�":(opType.byteValue() == 0x04 ? "姘磋〃寮傚父":(opType.byteValue() == 0x05 ? "鐢佃〃寮傚父":(opType.byteValue() == 0x06 ? "鍓╀綑姘撮噺涓嶈冻":(opType.byteValue() == 0x07 ? "鍓╀綑閲戦涓嶈冻":(opType.byteValue() == 0x08 ? "鏃犳祦閲�":(opType.byteValue() == 0x09 ? "鎺夌數鍐嶄笂鐢�":"鏈煡"))))))))))) ;
+ sb.append(clType == null?"鏈煡":(clType.byteValue() == 0x00 ? "鍒峰崱":(clType.byteValue() == 0x01 ? "骞冲彴":(clType.byteValue() == 0x02 ? "APP":(clType.byteValue() == 0x03 ? "闈炴硶鍗�":(clType.byteValue() == 0x04 ? "姘磋〃寮傚父":(clType.byteValue() == 0x05 ? "鐢佃〃寮傚父":(clType.byteValue() == 0x06 ? "鍓╀綑姘撮噺涓嶈冻":(clType.byteValue() == 0x07 ? "鍓╀綑閲戦涓嶈冻":(clType.byteValue() == 0x08 ? "鏃犳祦閲�":(clType.byteValue() == 0x09 ? "鎺夌數鍐嶄笂鐢�":"鏈煡"))))))))))) ;
sb.append("\n") ;
sb.append(" 鍏冲惎娉�/闃�缁撴灉 : ") ;
- sb.append(opResult == null?"鏈煡":(opResult.byteValue() == 0x01 ? "鎴愬姛":"澶辫触")) ;
+ sb.append(clResult == null?"鏈煡":(clResult.byteValue() == 0x01 ? "鎴愬姛":"澶辫触")) ;
sb.append("\n") ;
sb.append(" IC鍗″湴鍧� : ") ;
sb.append(icCardAddr == null?"鏈煡":icCardAddr) ;
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 7767226..ae76e9e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -83,12 +83,12 @@
pipIrr:
global:
- dev: true #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
+ dev: false #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
dsName: ym #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
nginx:
- root: E:/apps/pipIrr/nginx-1.27.0
+ root: D:/apps/pipIrr/nginx-1.27.0
webPort: 54321
- webFilePort: 19913
+ webFilePort: 64321
mw:
webPort: 8070 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢�
actutorPort: 9070 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢�
@@ -204,8 +204,8 @@
hashStart: 0
hashEnd: 5461
restUrl: http://127.0.0.1:${pipIrr.file1.webPort}/file #file鏄笂涓嬫枃,ip涓哄眬鍩熺綉ip鎴栨湰鍦癐P
- 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鎴栧煙鍚�
+ webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+ webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
sv2:
id: dyFile2
absolutePath: ${pipIrr.nginx.root}/html/webfiles/
@@ -213,8 +213,8 @@
hashStart: 5462
hashEnd: 10923
restUrl: http://127.0.0.1:${pipIrr.file2.webPort}/file
- 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鎴栧煙鍚�
+ webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+ webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
sv3:
id: dyFile3
absolutePath: ${pipIrr.nginx.root}/html/webfiles/
@@ -222,8 +222,8 @@
hashStart: 10924
hashEnd: 16385
restUrl: http://127.0.0.1:${pipIrr.file3.webPort}/file
- 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鎴栧煙鍚�
+ webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+ webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
sv4:
id: dyFile4
absolutePath: ${pipIrr.nginx.root}/html/webfiles/
@@ -231,8 +231,8 @@
hashStart: 16386
hashEnd: 21847
restUrl: http://127.0.0.1:${pipIrr.file4.webPort}/file
- 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鎴栧煙鍚�
+ webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+ webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
sv5:
id: dyFile5
absolutePath: ${pipIrr.nginx.root}/html/webfiles/
@@ -240,8 +240,8 @@
hashStart: 21848
hashEnd: 27309
restUrl: http://127.0.0.1:${pipIrr.file5.webPort}/file
- 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鎴栧煙鍚�
+ webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+ webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
sv6:
id: dyFile6
absolutePath: ${pipIrr.nginx.root}/html/webfiles/
@@ -249,8 +249,8 @@
hashStart: 27310
hashEnd: 32767
restUrl: http://127.0.0.1:${pipIrr.file6.webPort}/file
- 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鎴栧煙鍚�
+ webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+ webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
sv7:
id: dyFile7
absolutePath: ${pipIrr.nginx.root}/html/webfiles/
@@ -258,8 +258,8 @@
hashStart: 32768
hashEnd: 38229
restUrl: http://127.0.0.1:${pipIrr.file7.webPort}/file
- 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鎴栧煙鍚�
+ webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+ webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
sv8:
id: dyFile8
absolutePath: ${pipIrr.nginx.root}/html/webfiles/
@@ -267,8 +267,8 @@
hashStart: 38230
hashEnd: 43691
restUrl: http://127.0.0.1:${pipIrr.file8.webPort}/file
- 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鎴栧煙鍚�
+ webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+ webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
sv9:
id: dyFile9
absolutePath: ${pipIrr.nginx.root}/html/webfiles/
@@ -276,8 +276,8 @@
hashStart: 43692
hashEnd: 49153
restUrl: http://127.0.0.1:${pipIrr.file9.webPort}/file
- 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鎴栧煙鍚�
+ webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+ webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
sv10:
id: dyFile10
absolutePath: ${pipIrr.nginx.root}/html/webfiles/
@@ -285,8 +285,8 @@
hashStart: 49154
hashEnd: 54615
restUrl: http://127.0.0.1:${pipIrr.file10.webPort}/file
- 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鎴栧煙鍚�
+ webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+ webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
sv11:
id: dyFile11
absolutePath: ${pipIrr.nginx.root}/html/webfiles/
@@ -294,8 +294,8 @@
hashStart: 54616
hashEnd: 60077
restUrl: http://127.0.0.1:${pipIrr.file11.webPort}/file
- 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鎴栧煙鍚�
+ webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+ webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
sv12:
id: dyFile12
absolutePath: ${pipIrr.nginx.root}/html/webfiles/
@@ -303,8 +303,8 @@
hashStart: 60078
hashEnd: 65535
restUrl: http://127.0.0.1:${pipIrr.file12.webPort}/file
- 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鎴栧煙鍚�
+ webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+ webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
#椤圭洰缂栧彿
#projectCode:
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/upData/UpOpenCloseValve.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/upData/UpOpenCloseValve.java
index 1a2827a..7960851 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/upData/UpOpenCloseValve.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/upData/UpOpenCloseValve.java
@@ -19,8 +19,8 @@
private static String orderNo = null ;
private static String openValveDt = null ;
- private static Double totalWaterAmount = 1234.56 ;//绱娴侀噺
- private static Double remainMoney = 65.4321 ;//鍓╀綑閲戦
+ private static Double totalWaterAmount = 12345.67 ;//绱娴侀噺
+ private static Double remainMoney = 8765.4321 ;//鍓╀綑閲戦
private static Double thisWaterAmount = 100.00 ;//鏈浣跨敤姘撮噺
private static Double thisMoney = 10.00 ;//鏈浣跨敤閲戦
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/resources/config.xml b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/resources/config.xml
index 0b9f3fe..588a213 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/resources/config.xml
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/resources/config.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<config>
- <server name="RTU妯℃嫙鍣紙鐜嬫睙娴凤級" showStartInfo="true" company="http://www.dyjs.com"/>
+ <server name="RTU妯℃嫙鍣紙琛ㄩ榾涓�浣撴満锛�" showStartInfo="true" company="http://www.dyjs.com"/>
</config>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java
index e13d639..caa9e6d 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java
@@ -119,14 +119,14 @@
*/
public int update(PrIntake po) {
- if (po.getTownId() == null || po.getTownId() == 0) {
- Long townId = getSupperByVillageId(po.getVillageId());
- po.setTownId(townId);
- }
- if (po.getCountyId() == null || po.getCountyId() == 0) {
- Long countyId = getSupperByVillageId(getSupperByVillageId(po.getVillageId()));
- po.setCountyId(countyId);
- }
+// if (po.getTownId() == null || po.getTownId() == 0) {
+// Long townId = getSupperByVillageId(po.getVillageId());
+// po.setTownId(townId);
+// }
+// if (po.getCountyId() == null || po.getCountyId() == 0) {
+// Long countyId = getSupperByVillageId(getSupperByVillageId(po.getVillageId()));
+// po.setCountyId(countyId);
+// }
return this.prIntakeMapper.updateByPrimaryKeySelective(po);
// return this.prIntakeMapper.updateByPrimaryKey(po);
}
--
Gitblit v1.8.0