From af61e5f6de17791b5f8a07d3324c272a62eca5bf Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期五, 26 七月 2024 10:24:32 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_99_Down.java | 15 +
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/log4j2.yml | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java | 10
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StClientAmountMonth.java | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CommonV1_0_1.java | 74 +++--------
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/PipIrrStatisticsApplication.java | 6
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml | 6 +
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V1_0_0/CommandP206V1_0_0Ctrl.java | 36 +++++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StLossMonth.java | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_A0_Down.java | 17 ++
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayMapper.xml | 6 +
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml | 6 +
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateQueryVo.java | 3
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd83OpenVo.java | 7
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_10_Down.java | 80 +++++++-----
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayLastMapper.xml | 6 +
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/clientAmountDay/ClientAmountDayQueryVo.java | 5
pipIrr-platform/文档/增加一个应用机构.docx | 0
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/lossDay/LossDayQueryVo.java | 3
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StClientAmountYear.java | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/downVos/Com10Vo.java | 10 +
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateHistoryMapper.xml | 6 +
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd83CloseVo.java | 6
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StIntakeAmountMonth.java | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StLossYear.java | 2
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml | 6 +
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StIntakeAmountYear.java | 2
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/intakeAmountDay/IntakeAmountDayQueryVo.java | 3
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml | 6 +
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml | 6 +
pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml | 4
31 files changed, 221 insertions(+), 120 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CommonV1_0_1.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CommonV1_0_1.java
index 3e347ff..95e1da3 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CommonV1_0_1.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CommonV1_0_1.java
@@ -99,7 +99,7 @@
public String parseRtuAddr(byte[] bs, int index)throws Exception{
String rtuAddrBCD = "" + ByteUtil.BCD2Long_BE(bs, index, index + 2) ;//鍦板潃鏄ぇ绔ā寮�
String rtuAddrStr = "" + ByteUtilUnsigned.bytes2Short_LE(bs, index + 3) ;
- while(rtuAddrStr.length() < 5){
+ while(rtuAddrStr.length() <= 5){
rtuAddrStr = "0" + rtuAddrStr ;
}
return rtuAddrBCD + rtuAddrStr ;
@@ -165,7 +165,22 @@
/**
* 寰楀埌鍏冲紑闃�绫诲瀷鍚嶇О
- * 寮�鍏抽榾绫诲瀷(1:鍒峰崱寮�闃�锛�2:鍒峰崱鍏抽榾锛�3:涓績绔欏紑闃�锛�4:涓績绔欏叧闃�锛�5:娆犺垂鍏抽榾锛�6:娴侀噺璁℃晠闅滃叧闃�锛�7:绱ф�ュ叧闂紱8:鐢ㄦ埛杩滅▼寮�闃�锛�9:鐢ㄦ埛杩滅▼鍏抽榾锛�10:寮�鍏抽榾鍗″叧闃�锛�11:寮�鍏抽榾鍗″埛鍗″崱寮�闃�锛�)
+ * 寮�鍏抽榾绫诲瀷(
+ * 1:鍒峰崱寮�闃�锛�
+ * 2:鍒峰崱鍏抽榾锛�
+ * 3:涓績绔欏紑闃�锛�
+ * 4:涓績绔欏叧闃�锛�
+ * 5:娆犺垂鍏抽榾锛�
+ * 6:娴侀噺璁℃晠闅滃叧闃�锛�
+ * 7:绱ф�ュ叧闂紱
+ * 8:鐢ㄦ埛杩滅▼寮�闃�锛�
+ * 9:鐢ㄦ埛杩滅▼鍏抽榾锛�
+ * 10:寮�鍏抽榾鍗″叧闃�锛�
+ * 11:寮�鍏抽榾鍗″埛鍗″崱寮�闃�锛�
+ * 12:榛戝悕鍗曞懡浠ゅ叧闃�锛�
+ * 13:鐢ㄦ埛杩滅▼瀹氭椂鍏抽榾锛�
+ * 14:鐢ㄦ埛杩滅▼瀹氶噺鍏抽榾锛�
+ * )
* @param type 瀛楄妭
* @return 鍚嶇О
*/
@@ -182,64 +197,19 @@
case 9 -> "鐢ㄦ埛杩滅▼鍏抽榾";
case 10 -> "寮�鍏抽榾鍗″叧闃�";
case 11 -> "寮�鍏抽榾鍗″紑闃�";
+ case 12 -> "榛戝悕鍗曞懡浠ゅ叧闃�";
+ case 13 -> "鐢ㄦ埛杩滅▼瀹氭椂鍏抽榾";
+ case 14 -> "鐢ㄦ埛杩滅▼瀹氶噺鍏抽榾";
default -> "鏈煡";
};
}
public static Boolean isCloseValveType(byte type){
return switch (type) {
- case 1 -> false ;
- case 2 -> true ;
- case 3 -> false ;
- case 4 -> true ;
- case 5 -> true ;
- case 6 -> true ;
- case 7 -> true ;
- case 8 -> false ;
- case 9 -> true ;
- case 10 -> true ;
- case 11 -> false ;
+ case 1, 3, 8, 11 -> false ;
+ case 2, 4, 5, 6, 7, 9, 10, 12, 13, 14 -> true ;
default -> null ;
};
}
-// /**
-// * 澶勭悊IC鍗＄紪鍙凤紝闈虫�诲埗瀹氱殑鍗忚瑕佹眰10浣岻C鍗＄紪鍙�
-// * @param icCardNo
-// * @return
-// */
-// public static String[] dealIcCardNo(String icCardNo){
-// if(icCardNo.length() > 10){
-// String tail = icCardNo.substring(icCardNo.length() - 10) ;
-// String head = icCardNo.substring(0, icCardNo.length() - 10) ;
-// return new String[]{head , tail} ;
-// }else if(icCardNo.length() < 10){
-// while(icCardNo.length() != 10){
-// icCardNo = "0" + icCardNo ;
-// }
-// return new String[]{null , icCardNo} ;
-// }else{
-// return new String[]{null , icCardNo} ;
-// }
-// }
-
- /*
- * 鍒嗘瀽鐗堟湰鍙�
- * @param bs 涓婅瀛楄妭鏁扮粍
- * @return 鐗堟湰鍙�
- * @throws Exception 寮傚父
- public String parseVersion(byte[] bs)throws Exception{
- short ver = ByteUtilUnsigned.byte2Byte(bs, ProtocolConstantV206V1_0_0.versionIndex) ;
- char[] cs = ("" + ver).toCharArray() ;
- StringBuilder vs = new StringBuilder() ;
- for(byte i = 0 ; i < cs.length; i++){
- if(i == 0){
- vs.append(cs[i]) ;
- }else{
- vs.append(".").append(cs[i]) ;
- }
- }
- return vs.toString() ;
- }
- */
}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/downVos/Com10Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/downVos/Com10Vo.java
new file mode 100644
index 0000000..ee265ff
--- /dev/null
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/downVos/Com10Vo.java
@@ -0,0 +1,10 @@
+package com.dy.common.mw.protocol.p206V1_0_0.downVos;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2024/7/25 15:27
+ * @Description
+ */
+public class Com10Vo {
+ public String rtuAddr ;
+}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_10_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_10_Down.java
index 356d492..f550915 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_10_Down.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_10_Down.java
@@ -1,10 +1,14 @@
package com.dy.common.mw.protocol.p206V1_0_0.parse;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1_0_0.CodeV1_0_1;
import com.dy.common.mw.protocol.p206V1_0_0.CommonV1_0_1;
import com.dy.common.mw.protocol.p206V1_0_0.ParseParamsForDownV1_0_1;
import com.dy.common.mw.protocol.p206V1_0_0.ProtocolConstantV206V1_0_0;
+import com.dy.common.mw.protocol.p206V1_0_0.downVos.Com10Vo;
+import com.dy.common.mw.protocol.p206V1_0_0.downVos.Com3AVo;
import com.dy.common.mw.protocol.p206V1_0_0.parse.global.GlCreate;
import com.dy.common.util.ByteUtil;
@@ -51,48 +55,58 @@
* @throws Exception 寮傚父
*/
public byte[] doParse(ParseParamsForDownV1_0_1 para) throws Exception {
- CommonV1_0_1 commonV1_0_1 = new CommonV1_0_1() ;
- byte[] bytes ;
- byte[] bsHead = new byte[ProtocolConstantV206V1_0_0.lenHead2Code] ;
- byte index = 0 ;
- bsHead[index] = ProtocolConstantV206V1_0_0.P_Head_Byte ;
+ if(para.param == null) {
+ throw new Exception("鍛戒护鍙傛暟涓簄ull") ;
+ }else {
+ JSONObject obj = (JSONObject) para.param;
+ String json = obj.toJSONString();
+ Com10Vo cvo = JSON.parseObject(json, Com10Vo.class);
+ if (cvo == null) {
+ throw new Exception("json杞珻om10Vo涓簄ull");
+ }
+ if (cvo.rtuAddr == null) {
+ throw new Exception("娴嬭瘯鏂板湴鍧�涓嶈兘涓虹┖");
+ }
- index++ ;
- bsHead[index] = 0 ;//甯ч暱搴�
+ CommonV1_0_1 commonV1_0_1 = new CommonV1_0_1();
+ byte[] bytes;
+ byte[] bsHead = new byte[ProtocolConstantV206V1_0_0.lenHead2Code];
+ byte index = 0;
+ bsHead[index] = ProtocolConstantV206V1_0_0.P_Head_Byte;
- index++ ;
- bsHead[index] = ProtocolConstantV206V1_0_0.P_Head_Byte ;
+ index++;
+ bsHead[index] = 0;//甯ч暱搴�
- index++ ;
- bsHead[index] = commonV1_0_1.createCtrl((byte)0, (byte)0) ;
+ index++;
+ bsHead[index] = ProtocolConstantV206V1_0_0.P_Head_Byte;
- index++ ;
- GlCreate.createRtuAddr(para.rtuAddr, bsHead, index);
- index += 5 ;
+ index++;
+ bsHead[index] = commonV1_0_1.createCtrl((byte) 0, (byte) 0);
- ByteUtil.hex2Bytes(para.commandCode, bsHead, index) ;
+ index++;
+ GlCreate.createRtuAddr(para.rtuAddr, bsHead, index);
+ index += 5;
- if(para.param == null){
- throw new Exception("鏈彁渚涘懡浠ゅ弬鏁版暟鎹紝涓嶈兘鏋勯�犲姛鑳界爜涓�" + para.commandCode + "鐨勪笅琛屽懡浠�") ;
- }else{
- index = 0 ;
- byte[] bs = new byte[13] ;
- String newRtuAddr = (String)para.param ;
- GlCreate.createRtuAddr(newRtuAddr, bs, index);
- index += 5 ;
+ ByteUtil.hex2Bytes(para.commandCode, bsHead, index);
+
+ index = 0;
+ byte[] bs = new byte[13];
+
+ GlCreate.createRtuAddr(cvo.rtuAddr, bs, index);
+ index += 5;
GlCreate.createPw(bs, index);
- index += 2 ;
+ index += 2;
GlCreate.createTp(bs, index);
- bytes = ByteUtil.bytesMerge(bsHead, bs) ;
+ bytes = ByteUtil.bytesMerge(bsHead, bs);
+
+ GlCreate.createLen(bytes);//闀垮害鏀惧瓧鑺傛暟缁勪腑
+
+ byte[] bsTail = GlCreate.createCrcTail(bytes);//CRC鍜屽熬鍙犲姞瀛楄妭鏁扮粍涓�
+
+ bytes = ByteUtil.bytesMerge(bytes, bsTail);
+
+ return bytes;
}
-
- GlCreate.createLen(bytes);//闀垮害鏀惧瓧鑺傛暟缁勪腑
-
- byte[] bsTail = GlCreate.createCrcTail(bytes) ;//CRC鍜屽熬鍙犲姞瀛楄妭鏁扮粍涓�
-
- bytes = ByteUtil.bytesMerge(bytes, bsTail) ;
-
- return bytes ;
}
}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_99_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_99_Down.java
index f017296..3891c18 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_99_Down.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_99_Down.java
@@ -79,7 +79,7 @@
String json = obj.toJSONString();
Com99Vo cvo = JSON.parseObject(json, Com99Vo.class) ;
if(cvo == null){
- throw new Exception("json杞珻om97Vo涓簄ull") ;
+ throw new Exception("json杞珻om99Vo涓簄ull") ;
}
if(cvo.icCardNo == null){
throw new Exception("铏氭嫙IC鍗＄紪鍙蜂笉鑳戒负绌�") ;
@@ -106,9 +106,11 @@
//ByteUtil.string2BCD_LE(bs, icCardNoGrp[1], index) ;
byte[] bs = new byte[8] ;
GlCreate.createIcCardNo(cvo.icCardNo, bs, 0);
+ bytes = ByteUtil.bytesMerge(bsHead, bs) ;
- index += 5 ;
+ bs = new byte[4] ;
+ index = 0 ;
Integer money = Double.valueOf(cvo.moneyRemain * 100.0D).intValue() ;
byte[] bTemp = ByteUtil.int2BCD_LE(money) ;
int bTempLen = bTemp.length ;
@@ -123,7 +125,10 @@
for(; count < 4; count++){
bs[index++] = 0 ;
}
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+ bs = new byte[2] ;
+ index = 0 ;
Integer price = Double.valueOf(cvo.waterPrice * 100.0D).intValue() ;
bTemp = ByteUtil.int2BCD_LE(price) ;
bTempLen = bTemp.length ;
@@ -138,8 +143,11 @@
for(; count < 2; count++){
bs[index++] = 0 ;
}
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+ bs = new byte[2] ;
+ index = 0 ;
bTemp = ByteUtil.int2BCD_LE(cvo.minutes) ;
bTempLen = bTemp.length ;
count = 0 ;
@@ -153,8 +161,7 @@
for(; count < 2; count++){
bs[index++] = 0 ;
}
-
- bytes = ByteUtil.bytesMerge(bsHead, bs) ;
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
GlCreate.createLen(bytes);//闀垮害鏀惧瓧鑺傛暟缁勪腑
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_A0_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_A0_Down.java
index 29efc43..fd0e57f 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_A0_Down.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_A0_Down.java
@@ -79,7 +79,7 @@
String json = obj.toJSONString();
ComA0Vo cvo = JSON.parseObject(json, ComA0Vo.class) ;
if(cvo == null){
- throw new Exception("json杞珻om97Vo涓簄ull") ;
+ throw new Exception("json杞珻omA0Vo涓簄ull") ;
}
if(cvo.icCardNo == null){
throw new Exception("铏氭嫙IC鍗＄紪鍙蜂笉鑳戒负绌�") ;
@@ -101,12 +101,14 @@
//if(icCardNoGrp[0] != null){
// midRs.param = icCardNoGrp[0] ;
//}
+ //ByteUtil.string2BCD_LE(bs, icCardNoGrp[1], index) ;
byte[] bs = new byte[16] ;
index = 0 ;
- //ByteUtil.string2BCD_LE(bs, icCardNoGrp[1], index) ;
GlCreate.createIcCardNo(cvo.icCardNo, bs, 0);
+ bytes = ByteUtil.bytesMerge(bsHead, bs) ;
- index += 5 ;
+ bs = new byte[4] ;
+ index = 0 ;
Integer money = Double.valueOf(cvo.moneyRemain * 100.0D).intValue() ;
byte[] bTemp = ByteUtil.int2BCD_LE(money) ;
int bTempLen = bTemp.length ;
@@ -121,7 +123,10 @@
for(; count < 4; count++){
bs[index++] = 0 ;
}
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+ bs = new byte[2] ;
+ index = 0 ;
Integer price = Double.valueOf(cvo.waterPrice * 100.0D).intValue() ;
bTemp = ByteUtil.int2BCD_LE(price) ;
bTempLen = bTemp.length ;
@@ -136,8 +141,11 @@
for(; count < 2; count++){
bs[index++] = 0 ;
}
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+ bs = new byte[2] ;
+ index = 0 ;
bTemp = ByteUtil.int2BCD_LE(cvo.waterAmount) ;
bTempLen = bTemp.length ;
count = 0 ;
@@ -151,8 +159,7 @@
for(; count < 2; count++){
bs[index++] = 0 ;
}
-
- bytes = ByteUtil.bytesMerge(bsHead, bs) ;
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
GlCreate.createLen(bytes);//闀垮害鏀惧瓧鑺傛暟缁勪腑
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java
index 028f991..2484a8f 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java
@@ -48,12 +48,12 @@
* @throws Exception 寮傚父
*/
public static String parseIcCardNo(byte[] bs, int index)throws Exception{
- String rtuAddrStr = "" + ByteUtilUnsigned.bytes2Short_LE(bs, index) ;
- String rtuAddrBCD = "" + ByteUtil.BCD2Long_LE(bs, index + 2, index + 7) ;
- while(rtuAddrStr.length() < 5){
- rtuAddrStr = "0" + rtuAddrStr ;
+ String icNoStr = "" + ByteUtilUnsigned.bytes2Short_LE(bs, index) ;
+ String icNoBCD = "" + ByteUtil.BCD2Long_LE(bs, index + 2, index + 7) ;
+ while(icNoStr.length() < 5){
+ icNoStr = "0" + icNoStr ;
}
- return rtuAddrBCD + rtuAddrStr ;
+ return icNoBCD + icNoStr ;
}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd83CloseVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd83CloseVo.java
index a83db48..568ab29 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd83CloseVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd83CloseVo.java
@@ -5,9 +5,7 @@
@Data
public class DataCd83CloseVo {
- // 寮�鍏抽榾绫诲瀷锛�
- // 1銆佸埛鍗″紑闃�锛�2鍒峰崱鍏抽榾锛�3銆佷腑蹇冪珯寮�闃�锛�4銆佷腑蹇冪珯鍏抽榾锛�5銆佹瑺璐瑰叧闃�锛�
- // 6銆佹祦閲忚鏁呴殰鍏抽榾锛�7銆佺揣鎬ュ叧闃�锛�8銆佺敤鎴疯繙绋嬪紑闃�锛�9銆佺敤鎴疯繙绋嬪叧闃�锛�
+ // 寮�鍏抽榾绫诲瀷锛氳CommonV1_0_1.openCloseValveType()
public Byte type ;
public Double totalAmount; //绱娴侀噺锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999999锛屽崟浣嶄负m3銆�
public String icCardNo;//IC鍗＄紪鍙�
@@ -35,7 +33,7 @@
sb.append(" IC鍗＄紪鍙凤細");
sb.append(icCardNo);
sb.append("\n");
- sb.append(" ic鍗″湴鍧�锛�");
+ sb.append(" IC鍗″湴鍧�锛�");
sb.append(icCardAddr);
sb.append("\n");
sb.append(" 鍓╀綑閲戦锛堝厓锛夛細");
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd83OpenVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd83OpenVo.java
index 93e0114..ad0194f 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd83OpenVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd83OpenVo.java
@@ -6,10 +6,7 @@
@Data
public class DataCd83OpenVo {
- // 寮�鍏抽榾绫诲瀷锛�
- // 1銆佸埛鍗″紑闃�锛�2鍒峰崱鍏抽榾锛�3銆佷腑蹇冪珯寮�闃�锛�4銆佷腑蹇冪珯鍏抽榾锛�5銆佹瑺璐瑰叧闃�锛�
- // 6銆佹祦閲忚鏁呴殰鍏抽榾锛�7銆佺揣鎬ュ叧闃�锛�8銆佺敤鎴疯繙绋嬪紑闃�锛�9銆佺敤鎴疯繙绋嬪叧闃�锛�
- // 16锛岀敤鎴峰紑闃�鍚庣閬撳唴娌℃湁姘达紝鑷姩鍏抽榾銆傜閬撲笉鍑烘按鑷姩鍏抽榾
+ // 寮�鍏抽榾绫诲瀷锛氳CommonV1_0_1.openCloseValveType()
public Byte type ;
public Double totalAmount; //绱娴侀噺锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999999锛屽崟浣嶄负m3銆�
public String icCardNo;//IC鍗＄紪鍙�
@@ -30,7 +27,7 @@
sb.append(" IC鍗＄紪鍙凤細");
sb.append(icCardNo);
sb.append("\n");
- sb.append(" ic鍗″湴鍧�锛�");
+ sb.append(" IC鍗″湴鍧�锛�");
sb.append(icCardAddr);
sb.append("\n");
sb.append(" 鍓╀綑閲戦锛堝厓锛夛細");
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StClientAmountMonth.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StClientAmountMonth.java
index 7a6b8db..5004c9d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StClientAmountMonth.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StClientAmountMonth.java
@@ -15,7 +15,7 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
-@TableName(value="rm_client_amount_month", autoResultMap = true)
+@TableName(value="st_client_amount_month", autoResultMap = true)
@Data
@Builder
@ToString
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StClientAmountYear.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StClientAmountYear.java
index ca94c39..d285096 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StClientAmountYear.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StClientAmountYear.java
@@ -15,7 +15,7 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
-@TableName(value="rm_client_amount_year", autoResultMap = true)
+@TableName(value="st_client_amount_year", autoResultMap = true)
@Data
@Builder
@ToString
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StIntakeAmountMonth.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StIntakeAmountMonth.java
index 69ab585..5dfff18 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StIntakeAmountMonth.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StIntakeAmountMonth.java
@@ -15,7 +15,7 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
-@TableName(value="rm_intake_amount_month", autoResultMap = true)
+@TableName(value="st_intake_amount_month", autoResultMap = true)
@Data
@Builder
@ToString
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StIntakeAmountYear.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StIntakeAmountYear.java
index 9b56873..f06bed8 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StIntakeAmountYear.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StIntakeAmountYear.java
@@ -15,7 +15,7 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
-@TableName(value="rm_intake_amount_year", autoResultMap = true)
+@TableName(value="st_intake_amount_year", autoResultMap = true)
@Data
@Builder
@ToString
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StLossMonth.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StLossMonth.java
index 4356bc1..8b9aefa 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StLossMonth.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StLossMonth.java
@@ -15,7 +15,7 @@
* @Description 鍙栨按鍙ｆ紡鎹熸湀缁熻
*/
-@TableName(value="rm_loss_month", autoResultMap = true)
+@TableName(value="st_loss_month", autoResultMap = true)
@Data
@Builder
@ToString
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StLossYear.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StLossYear.java
index 7ce65e3..fe35062 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StLossYear.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StLossYear.java
@@ -15,7 +15,7 @@
* @Description 鍙栨按鍙ｆ紡鎹熷勾缁熻
*/
-@TableName(value="rm_loss_year", autoResultMap = true)
+@TableName(value="st_loss_year", autoResultMap = true)
@Data
@Builder
@ToString
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 cf03082..923e8eb 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -161,5 +161,5 @@
- /wx/comRes/receive
#鑷姩缁熻閰嶇疆锛岃嚜鍔ㄧ粺璁″畾鏃朵换鍔′細姣忓ぉ瀹氭椂杩涜
auto-statistics:
- startHour: 9 #寮�濮嬪皬鏃� 0
- startMinute: 51 #寮�濮嬪垎閽� 5
+ startHour: 17 #寮�濮嬪皬鏃� 0
+ startMinute: 19 #寮�濮嬪垎閽� 5
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateHistoryMapper.xml
index 55279e8..d0fa274 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateHistoryMapper.xml
@@ -396,6 +396,9 @@
<if test="valveState != null">
and rash.valve_state = #{valveState,jdbcType=TINYINT}
</if>
+ <if test="intakeId != null">
+ and rash.intake_id = #{intakeId}
+ </if>
<if test="intakeName != null">
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
</if>
@@ -477,6 +480,9 @@
<if test="valveState != null">
and rash.valve_state = #{valveState,jdbcType=TINYINT}
</if>
+ <if test="intakeId != null">
+ and rash.intake_id = #{intakeId}
+ </if>
<if test="intakeName != null">
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
</if>
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml
index 98990c4..187f1e9 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml
@@ -378,6 +378,9 @@
<if test="valveState != null">
and rasl.valve_state = #{valveState,jdbcType=TINYINT}
</if>
+ <if test="intakeId != null">
+ and rasl.intake_id = #{intakeId}
+ </if>
<if test="intakeName != null">
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
</if>
@@ -459,6 +462,9 @@
<if test="valveState != null">
and rasl.valve_state = #{valveState,jdbcType=TINYINT}
</if>
+ <if test="intakeId != null">
+ and rasl.intake_id = #{intakeId}
+ </if>
<if test="intakeName != null">
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
</if>
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml
index f674e37..997fdf5 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml
@@ -197,6 +197,9 @@
<if test="clientName != null">
and sc.name like CONCAT('%',#{clientName,jdbcType=VARCHAR},'%')
</if>
+ <if test="clientId != null">
+ and rcadl.client_id = #{clientId}
+ </if>
<if test="startDt != null">
and rcadl.dt >= #{startDt,jdbcType=DATE}
</if>
@@ -225,6 +228,9 @@
<if test="clientName != null">
and sc.name like CONCAT('%',#{clientName,jdbcType=VARCHAR},'%')
</if>
+ <if test="clientId != null">
+ and rcadl.client_id = #{clientId}
+ </if>
<if test="startDt != null">
and rcadl.dt >= #{startDt,jdbcType=DATE}
</if>
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml
index e2cbdd6..7275f77 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml
@@ -187,6 +187,9 @@
<if test="clientName != null">
and sc.name like CONCAT('%',#{clientName,jdbcType=VARCHAR},'%')
</if>
+ <if test="clientId != null">
+ and rcad.client_id = #{clientId}
+ </if>
<if test="startDt != null">
and rcad.dt >= #{startDt,jdbcType=DATE}
</if>
@@ -215,6 +218,9 @@
<if test="clientName != null">
and sc.name like CONCAT('%',#{clientName,jdbcType=VARCHAR},'%')
</if>
+ <if test="clientId != null">
+ and rcad.client_id = #{clientId}
+ </if>
<if test="startDt != null">
and rcad.dt >= #{startDt,jdbcType=DATE}
</if>
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayLastMapper.xml
index ea0db3b..0c1693a 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayLastMapper.xml
@@ -176,6 +176,9 @@
<if test="intakeName != null">
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
</if>
+ <if test="intakeId != null">
+ and riadl.intake_id = #{intakeId}
+ </if>
<if test="startDt != null">
and riadl.dt >= #{startDt,jdbcType=DATE}
</if>
@@ -202,6 +205,9 @@
<if test="intakeName != null">
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
</if>
+ <if test="intakeId != null">
+ and riadl.intake_id = #{intakeId}
+ </if>
<if test="startDt != null">
and riadl.dt >= #{startDt,jdbcType=DATE}
</if>
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayMapper.xml
index ac46b99..4def2f1 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayMapper.xml
@@ -164,6 +164,9 @@
<if test="intakeName != null">
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
</if>
+ <if test="intakeId != null">
+ and riad.intake_id = #{intakeId}
+ </if>
<if test="startDt != null">
and riad.dt >= #{startDt,jdbcType=DATE}
</if>
@@ -190,6 +193,9 @@
<if test="intakeName != null">
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
</if>
+ <if test="intakeId != null">
+ and riad.intake_id = #{intakeId}
+ </if>
<if test="startDt != null">
and riad.dt >= #{startDt,jdbcType=DATE}
</if>
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml
index cf6a6ca..c0b3971 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml
@@ -168,6 +168,9 @@
<if test="intakeName != null">
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
</if>
+ <if test="intakeId != null">
+ and rldl.intake_id = #{intakeId}
+ </if>
<if test="startDt != null">
and rldl.dt >= #{startDt,jdbcType=DATE}
</if>
@@ -193,6 +196,9 @@
<if test="intakeName != null">
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
</if>
+ <if test="intakeId != null">
+ and rldl.intake_id = #{intakeId}
+ </if>
<if test="startDt != null">
and rldl.dt >= #{startDt,jdbcType=DATE}
</if>
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml
index cbd6149..ddea63e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml
@@ -158,6 +158,9 @@
<if test="intakeName != null">
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
</if>
+ <if test="intakeId != null">
+ and rld.intake_id = #{intakeId}
+ </if>
<if test="startDt != null">
and rld.dt >= #{startDt,jdbcType=DATE}
</if>
@@ -183,6 +186,9 @@
<if test="intakeName != null">
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
</if>
+ <if test="intakeId != null">
+ and rld.intake_id = #{intakeId}
+ </if>
<if test="startDt != null">
and rld.dt >= #{startDt,jdbcType=DATE}
</if>
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V1_0_0/CommandP206V1_0_0Ctrl.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V1_0_0/CommandP206V1_0_0Ctrl.java
index f784196..8a475f0 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V1_0_0/CommandP206V1_0_0Ctrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V1_0_0/CommandP206V1_0_0Ctrl.java
@@ -29,7 +29,9 @@
if(com == null){
rt = this.connect() ;//杩炴帴閫氫俊涓棿浠舵祴璇�
}else{
- if(com.equals("21")){
+ if(com.equals("10")){
+ rt = this.cd10() ;
+ }else if(com.equals("21")){
rt = this.cd21() ;
}else if(com.equals("37")){
rt = this.cd37() ;
@@ -65,6 +67,10 @@
rt = this.cd97() ;
}else if(com.equals("98")){
rt = this.cd98() ;
+ }else if(com.equals("99")){
+ rt = this.cd99() ;
+ }else if(com.equals("A0")){
+ rt = this.cdA0() ;
}else if(com.equals("B0")){
rt = this.cdB0() ;
}
@@ -79,6 +85,12 @@
*/
private BaseResponse connect(){
return this.sendTest() ;
+ }
+
+ private BaseResponse cd10(){
+ Com10Vo comVo = new Com10Vo() ;
+ comVo.rtuAddr = "532328059995" ;//鍓�6浣嶆槸琛屾斂鍖哄垝鐮侊紝鍚�6浣嶆槸搴忓垪鍙锋渶澶ф槸065535
+ return this.sendCom2Mw(this.command(CodeV1_0_1.cd_10, comVo, null)) ;
}
private BaseResponse cd21(){
@@ -140,7 +152,7 @@
private BaseResponse cd3C(){
Com3CVo comVo = new Com3CVo() ;
- comVo.minute = 60 ;
+ comVo.minute = 5 ;
return this.sendCom2Mw(this.command(CodeV1_0_1.cd_3C, comVo, null)) ;
}
@@ -175,6 +187,26 @@
return this.sendCom2Mw(this.command(CodeV1_0_1.cd_98, comVo, null)) ;
}
+ //瀹氭椂鍏抽榾寮�闃�
+ private BaseResponse cd99(){
+ Com99Vo comVo = new Com99Vo() ;
+ comVo.icCardNo = CommandP206V1_0_0Ctrl.vsIcCardNo;
+ comVo.moneyRemain = 234.56 ;
+ comVo.waterPrice = 1.2 ;
+ comVo.minutes = 5 ;
+ return this.sendCom2Mw(this.command(CodeV1_0_1.cd_99, comVo, null)) ;
+ }
+
+ //瀹氶噺鍏抽榾寮�闃�
+ private BaseResponse cdA0(){
+ ComA0Vo comVo = new ComA0Vo() ;
+ comVo.icCardNo = CommandP206V1_0_0Ctrl.vsIcCardNo;
+ comVo.moneyRemain = 234.56 ;
+ comVo.waterPrice = 1.2 ;
+ comVo.waterAmount = 10 ;
+ return this.sendCom2Mw(this.command(CodeV1_0_1.cd_98, comVo, null)) ;
+ }
+
private BaseResponse cdB0(){
return this.sendCom2Mw(this.command(CodeV1_0_1.cd_B0, null, null)) ;
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/clientAmountDay/ClientAmountDayQueryVo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/clientAmountDay/ClientAmountDayQueryVo.java
index e26c93c..2f7a749 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/clientAmountDay/ClientAmountDayQueryVo.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/clientAmountDay/ClientAmountDayQueryVo.java
@@ -1,6 +1,8 @@
package com.dy.pipIrrRemote.records.clientAmountDay;
import com.dy.common.webUtil.QueryConditionVo;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
@@ -21,6 +23,9 @@
@Schema(name = "鍐滄埛鏃ョ敤姘撮噺缁熻鏌ヨ鏉′欢")
public class ClientAmountDayQueryVo extends QueryConditionVo {
+ @Schema(description = "鍐滄埛ID", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ private String clientId;
+
@Schema(description = "鍐滄埛濮撳悕", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private String clientName;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateQueryVo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateQueryVo.java
index bc3d339..993b064 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateQueryVo.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateQueryVo.java
@@ -26,6 +26,9 @@
@Schema(description = "鍙栨按鍙ｅ悕绉�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private String intakeName;
+ @Schema(description = "鍙栨按鍙D")
+ private String intakeId;
+
@Schema(description = "闃�闂ㄧ姸鎬�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)//锛�0鎵撳紑銆�1鍏抽棴锛�
private Byte valveState;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/intakeAmountDay/IntakeAmountDayQueryVo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/intakeAmountDay/IntakeAmountDayQueryVo.java
index 5bb8dd0..9e7b078 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/intakeAmountDay/IntakeAmountDayQueryVo.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/intakeAmountDay/IntakeAmountDayQueryVo.java
@@ -24,6 +24,9 @@
@Schema(description = "鍙栨按鍙ｅ悕绉�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private String intakeName;
+ @Schema(description = "鍙栨按鍙D")
+ private String intakeId;
+
@Schema(description = "缁熻寮�濮嬫棩鏈�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Date startDt;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/lossDay/LossDayQueryVo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/lossDay/LossDayQueryVo.java
index 66f92f0..cba8680 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/lossDay/LossDayQueryVo.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/lossDay/LossDayQueryVo.java
@@ -25,6 +25,9 @@
@Schema(description = "鍙栨按鍙ｅ悕绉�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private String intakeName;
+ @Schema(description = "鍙栨按鍙D")
+ private String intakeId;
+
@Schema(description = "缁熻寮�濮嬫棩鏈�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Date startDt;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/log4j2.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/log4j2.yml
index b42623a..6ad9837 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/log4j2.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/log4j2.yml
@@ -65,7 +65,7 @@
# 涓哄寘閰嶇疆鐗规畩鐨凩og绾у埆锛屾柟渚胯皟璇曪紝
# 涓嶅彈Loggers.Root.level闄愬埗
Logger:
- - name: com.dy.pipIrrGlobal.daoBa
+ - name: com.dy.pipIrrGlobal.daoRm
additivity: false #鍘婚櫎閲嶅鐨刲og
level: debug #杈撳嚭鏃ュ織绾у埆
AppenderRef:
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/PipIrrStatisticsApplication.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/PipIrrStatisticsApplication.java
index e658f54..e6abf3c 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/PipIrrStatisticsApplication.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/PipIrrStatisticsApplication.java
@@ -18,7 +18,11 @@
})
}
)
-@MapperScan(basePackages={"com.dy.pipIrrGlobal.daoRm", "com.dy.pipIrrGlobal.daoPr", "com.dy.pipIrrGlobal.daoSe", "com.dy.pipIrrGlobal.daoBa"})
+@MapperScan(basePackages={"com.dy.pipIrrGlobal.daoRm",
+ "com.dy.pipIrrGlobal.daoPr",
+ "com.dy.pipIrrGlobal.daoSe",
+ "com.dy.pipIrrGlobal.daoBa",
+ "com.dy.pipIrrGlobal.daoSt"})
public class PipIrrStatisticsApplication {
public static void main(String[] args) {
diff --git "a/pipIrr-platform/\346\226\207\346\241\243/\345\242\236\345\212\240\344\270\200\344\270\252\345\272\224\347\224\250\346\234\272\346\236\204.docx" "b/pipIrr-platform/\346\226\207\346\241\243/\345\242\236\345\212\240\344\270\200\344\270\252\345\272\224\347\224\250\346\234\272\346\236\204.docx"
index 7b69488..a187735 100644
--- "a/pipIrr-platform/\346\226\207\346\241\243/\345\242\236\345\212\240\344\270\200\344\270\252\345\272\224\347\224\250\346\234\272\346\236\204.docx"
+++ "b/pipIrr-platform/\346\226\207\346\241\243/\345\242\236\345\212\240\344\270\200\344\270\252\345\272\224\347\224\250\346\234\272\346\236\204.docx"
Binary files differ
--
Gitblit v1.8.0