From a4d36003a8b4a7e6691009c015d2396d8f13b32e Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 28 十月 2024 20:15:20 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeControllerMapper.xml | 24 ++-
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoOpenCloseValve.java | 21 ++
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml | 67 +++++++----
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml | 6
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CommonV1_0_1.java | 2
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml | 85 ++++++-------
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java | 12 ++
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java | 19 ++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Constant.java | 93 +++++++-------
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveLast.java | 10 +
10 files changed, 205 insertions(+), 134 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 02f388b..ed0f132 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
@@ -180,6 +180,7 @@
* 12:榛戝悕鍗曞懡浠ゅ叧闃�锛�
* 13:杩滅▼瀹氭椂鍏抽榾锛�
* 14:杩滅▼瀹氶噺鍏抽榾锛�
+ * 16:绠￠亾鏃犳按鑷姩鍏抽榾锛�(鐜嬫睙娴峰崗璁�)
* )
* @param type 瀛楄妭
* @return 鍚嶇О
@@ -200,6 +201,7 @@
case 12 -> "榛戝悕鍗曞懡浠ゅ叧闃�";
case 13 -> "杩滅▼瀹氭椂鍏抽榾";
case 14 -> "杩滅▼瀹氶噺鍏抽榾";
+ case 16 -> "绠￠亾鏃犳按鑷姩鍏抽榾";
default -> "鏈煡";
};
}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java
index 85e6741..c8510df 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java
@@ -197,6 +197,12 @@
public Integer clThisTime;
/**
+ * 鍏抽榾鎶ヤ腑姘翠环
+ */
+ @Schema(description = "鍏抽榾鎶ヤ腑姘翠环", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Double clPrice ;//姘翠环
+
+ /**
* 鍏抽榾鎶ヤ腑鐨勫紑闃�鏃舵帶鍒跺櫒鏃堕挓
*/
@Schema(description = "鍏抽榾鎶ヤ腑鐨勫紑闃�鏃舵帶鍒跺櫒鏃堕挓", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@@ -248,6 +254,7 @@
this.clThisAmount = null;
this.clThisMoney = null;
this.clThisTime = null;
+ this.clPrice = null;
this.clOpenDt = null;
this.closeDt = null;
@@ -267,6 +274,7 @@
this.clThisAmount = dataCd83CloseVo.thisAmount;
this.clThisMoney = dataCd83CloseVo.thisMoney;
this.clThisTime = dataCd83CloseVo.thisTime;
+ this.clPrice = dataCd83CloseVo.price;
this.clOpenDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.openDt);
this.closeDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.closeDt);
@@ -296,6 +304,7 @@
this.clThisAmount = null;
this.clThisMoney = null;
this.clThisTime = null;
+ this.clPrice = null;
this.clOpenDt = null;
this.closeDt = null;
@@ -316,6 +325,7 @@
this.clThisAmount = cdData.thisWater;
this.clThisMoney = cdData.thisMoney;
this.clThisTime = cdData.thisDuration;
+ this.clPrice = null;
this.clOrderNo = cdData.orderNo;
this.clEleTotalAmount = cdData.eleTotalAmount;
this.clWaterRemainUser = cdData.waterRemain;
@@ -340,6 +350,7 @@
this.clThisAmount = null;
this.clThisMoney = null;
this.clThisTime = null;
+ this.clPrice = null;
this.clOpenDt = null;
this.closeDt = null;
@@ -361,6 +372,7 @@
this.clThisAmount = dataCd83CloseVo.thisAmount;
this.clThisMoney = dataCd83CloseVo.thisMoney;
this.clThisTime = dataCd83CloseVo.thisTime;
+ this.clPrice = dataCd83CloseVo.price;
this.clOpenDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.openDt);
this.closeDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.closeDt) ;
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveLast.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveLast.java
index cc568d5..c388d1d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveLast.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveLast.java
@@ -201,6 +201,11 @@
public Integer clThisTime;
/**
+ * 鍏抽榾鎶ヤ腑姘翠环
+ */
+ @Schema(description = "鍏抽榾鎶ヤ腑姘翠环", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Double clPrice ;//姘翠环
+ /**
* 鍏抽榾鎶ヤ腑鐨勫紑闃�鏃舵帶鍒跺櫒鏃堕挓
*/
@Schema(description = "鍏抽榾鎶ヤ腑鐨勫紑闃�鏃舵帶鍒跺櫒鏃堕挓", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@@ -256,6 +261,7 @@
this.clThisAmount = dataCd83CloseVo.thisAmount;
this.clThisMoney = dataCd83CloseVo.thisMoney;
this.clThisTime = dataCd83CloseVo.thisTime;
+ this.clPrice = dataCd83CloseVo.price;
this.clOpenDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.openDt);
this.closeDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.closeDt);
@@ -285,6 +291,7 @@
this.clThisAmount = null;
this.clThisMoney = null;
this.clThisTime = null;
+ this.clPrice = null;
this.clOpenDt = null;
this.closeDt = null;
@@ -305,6 +312,7 @@
this.clThisAmount = cdData.thisWater;
this.clThisMoney = cdData.thisMoney;
this.clThisTime = cdData.thisDuration;
+ this.clPrice = null;
this.clOrderNo = cdData.orderNo;
this.clEleTotalAmount = cdData.eleTotalAmount;
this.clWaterRemainUser = cdData.waterRemain;
@@ -335,6 +343,7 @@
this.clThisAmount = dataCd83CloseVo.thisAmount;
this.clThisMoney = dataCd83CloseVo.thisMoney;
this.clThisTime = dataCd83CloseVo.thisTime;
+ this.clPrice = dataCd83CloseVo.price;
this.clOpenDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.openDt);
this.closeDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.closeDt) ;
@@ -353,6 +362,7 @@
this.clThisAmount = null;
this.clThisMoney = null;
this.clThisTime = null;
+ this.clPrice = null;
this.clOpenDt = null;
this.closeDt = null;
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 23e4cf8..34e972d 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
@@ -51,52 +51,53 @@
}
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 ;
+// }
- // 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/VoOpenCloseValve.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoOpenCloseValve.java
index 15af3f4..b846f7e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoOpenCloseValve.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoOpenCloseValve.java
@@ -58,7 +58,7 @@
/**
* 寮�闃�绫诲瀷
*/
- //private Byte openType;
+ private Byte openType_;
private String openType;
/**
@@ -69,21 +69,24 @@
/**
* 寮�闃�鏃剁疮璁℃祦閲�
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double openTotalAmount;
-
/**
* 寮�闃�鏃跺墿浣欓噾棰�
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double openRemainMoney;
/**
* 寮�闃�鏃剁敤鎴峰墿浣欏墿浣欐按閲�
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double openWaterRemain;
/**
* 寮�闃�鐢佃〃绱鐢甸噺
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double openEleTotalAmount;
/**
@@ -105,12 +108,13 @@
/**
* 鍏抽榾绫诲瀷
*/
- //private Byte closeType;
+ private Byte closeType_;
private String closeType;
/**
- * 鍏抽榾鎶ヤ腑鏈湴鐢ㄦ按閲�
+ * 鍏抽榾鎶ヤ腑鏈鐢ㄦ按閲�
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double closeThisAmount;
/**
@@ -119,17 +123,26 @@
private Integer thisTime;
/**
+ * 鍏抽榾鎶ヤ腑鏈湴鐢ㄦ按鏃堕暱锛堝垎閽燂級
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ private Double closePrice;
+
+ /**
* 鍏抽榾鎶ヤ腑鏈湴娑堣垂閲戦
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double thisMoney;
/**
* 鍏抽榾鏃跺墿浣欓噾棰�
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double closeRemainMoney;
/**
* 鍏抽榾鏃剁疮璁℃祦閲�
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double closeTotalAmount;
}
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml
index c9e5208..a40bbe2 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml
@@ -136,13 +136,13 @@
id = #{id,jdbcType=VARCHAR}
</if>
<if test="rtuAddr != null and rtuAddr != ''">
- AND rtuAddr = #{rtuAddr,jdbcType=VARCHAR}
+ AND rtuAddr = #{rtuAddr,jdbcType=VARCHAR}
</if>
<if test="protocol != null and protocol != ''">
- AND protocol = #{protocol,jdbcType=VARCHAR}
+ AND protocol = #{protocol,jdbcType=VARCHAR}
</if>
</where>
- order by rtuAddr desc
+ order by 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-global/src/main/resources/mapper/PrIntakeControllerMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeControllerMapper.xml
index 96d940c..f025aee 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeControllerMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeControllerMapper.xml
@@ -133,15 +133,15 @@
FROM pr_intake_controller
<where>
<if test = "intakeId != null and intakeId > 0">
- AND intakeId = ${intakeId}
+ AND intakeId = #{intakeId,jdbcType=BIGINT}
</if>
<if test = "controllerId != null and controllerId > 0">
- AND controllerId = ${controllerId}
+ AND controllerId = #{controllerId,jdbcType=BIGINT}
</if>
<if test = "operateType != null and operateType > 0">
- AND operateType = ${operateType}
+ AND operateType = #{operateType,jdbcType=BIGINT}
</if>
</where>
</select>
@@ -153,16 +153,16 @@
<!--con.code AS controllerCode,-->
con.rtuAddr,
(CASE
- WHEN ic.operateType = 1 THEN "缁戝畾"
- WHEN ic.operateType = 2 THEN "瑙ｇ粦"
+ WHEN ic.operateType = 1 THEN '缁戝畾'
+ WHEN ic.operateType = 2 THEN '瑙ｇ粦'
END) AS operateType,
ic.operateDt
FROM pr_intake inta
INNER JOIN pr_intake_controller ic ON inta.id= ic.intakeId
INNER JOIN ba_user user ON ic.operator = user.id
INNER JOIN pr_controller con ON ic.controllerId = con.id
- <if test = "intakeId != null and intakeId > 0">
- AND inta.id = ${intakeId}
+ <if test = "intakeId != null">
+ AND inta.id = #{intakeId,jdbcType=BIGINT}
</if>
ORDER BY ic.operateDt DESC
</select>
@@ -171,8 +171,8 @@
<select id="getBindsByControllerId" resultType="java.util.Map">
SELECT
(CASE
- WHEN ic.operateType = 1 THEN "缁戝畾"
- WHEN ic.operateType = 2 THEN "瑙ｇ粦"
+ WHEN ic.operateType = 1 THEN '缁戝畾'
+ WHEN ic.operateType = 2 THEN '瑙ｇ粦'
END) AS operateType,
inta.name AS intakeName,
user.name AS userName,
@@ -181,11 +181,13 @@
INNER JOIN pr_intake_controller ic ON ic.controllerId = con.id
INNER JOIN pr_intake inta ON ic.intakeId = inta.id
INNER JOIN ba_user user ON ic.operator = user.id
- <if test = "controllerId != null and controllerId > 0">
- AND con.id = ${controllerId}
+ <if test = "controllerId != null">
+ AND con.id = #{controllerId,jdbcType=BIGINT}
</if>
ORDER BY ic.operateDt DESC
</select>
+
+
<!--鏍规嵁鍙栨按鍙ｇ紪鍙蜂慨鏀圭粦瀹氳褰曞垪琛�-->
<update id="updateByIntakeSelective">
update pr_intake_controller
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
index 65e7dd0..13ad59e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
@@ -29,6 +29,7 @@
<result column="cl_this_amount" jdbcType="DOUBLE" property="clThisAmount"/>
<result column="cl_this_money" jdbcType="DOUBLE" property="clThisMoney"/>
<result column="cl_this_time" jdbcType="INTEGER" property="clThisTime"/>
+ <result column="cl_price" jdbcType="DOUBLE" property="clPrice"/>
<result column="cl_open_dt" jdbcType="TIMESTAMP" property="clOpenDt"/>
<result column="close_dt" jdbcType="TIMESTAMP" property="closeDt"/>
<result column="cl_order_no" jdbcType="VARCHAR" property="clOrderNo"/>
@@ -63,6 +64,7 @@
cl_this_amount,
cl_this_money,
cl_this_time,
+ cl_price,
cl_open_dt,
close_dt,
cl_order_no,
@@ -93,7 +95,7 @@
op_ele_total_amount, op_water_remain_user, cl_dt,
cl_type, cl_total_amount, cl_ic_card_no,
cl_ic_card_addr, cl_remain_money, cl_this_amount,
- cl_this_money, cl_this_time, cl_open_dt,
+ cl_this_money, cl_this_time, cl_price, cl_open_dt,
close_dt, cl_order_no, cl_ele_total_amount,
cl_water_remain_user, cl_this_ele)
values (#{id,jdbcType=BIGINT}, #{clientId,jdbcType=BIGINT}, #{clientName,jdbcType=VARCHAR},
@@ -104,9 +106,9 @@
#{opEleTotalAmount,jdbcType=FLOAT}, #{opWaterRemainUser,jdbcType=FLOAT}, #{clDt,jdbcType=TIMESTAMP},
#{clType,jdbcType=TINYINT}, #{clTotalAmount,jdbcType=DOUBLE}, #{clIcCardNo,jdbcType=VARCHAR},
#{clIcCardAddr,jdbcType=VARCHAR}, #{clRemainMoney,jdbcType=DOUBLE}, #{clThisAmount,jdbcType=DOUBLE},
- #{clThisMoney,jdbcType=DOUBLE}, #{clThisTime,jdbcType=INTEGER}, #{clOpenDt,jdbcType=TIMESTAMP},
- #{closeDt,jdbcType=TIMESTAMP}, #{clOrderNo,jdbcType=VARCHAR}, #{clEleTotalAmount,jdbcType=FLOAT},
- #{clWaterRemainUser,jdbcType=FLOAT}, #{clThisEle,jdbcType=FLOAT})
+ #{clThisMoney,jdbcType=DOUBLE}, #{clThisTime,jdbcType=INTEGER}, #{clPrice,jdbcType=INTEGER},
+ #{clOpenDt,jdbcType=TIMESTAMP}, #{closeDt,jdbcType=TIMESTAMP}, #{clOrderNo,jdbcType=VARCHAR},
+ #{clEleTotalAmount,jdbcType=FLOAT},#{clWaterRemainUser,jdbcType=FLOAT}, #{clThisEle,jdbcType=FLOAT})
</insert>
<insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveHistory">
<!--@mbg.generated-->
@@ -183,6 +185,9 @@
</if>
<if test="clThisMoney != null">
cl_this_money,
+ </if>
+ <if test="clPrice != null">
+ cl_price,
</if>
<if test="clThisTime != null">
cl_this_time,
@@ -282,6 +287,9 @@
<if test="clThisTime != null">
#{clThisTime,jdbcType=INTEGER},
</if>
+ <if test="clPrice != null">
+ #{clPrice,jdbcType=DOUBLE},
+ </if>
<if test="clOpenDt != null">
#{clOpenDt,jdbcType=TIMESTAMP},
</if>
@@ -378,6 +386,9 @@
<if test="clThisTime != null">
cl_this_time = #{clThisTime,jdbcType=INTEGER},
</if>
+ <if test="clPrice != null">
+ cl_price = #{clPrice,jdbcType=INTEGER},
+ </if>
<if test="clOpenDt != null">
cl_open_dt = #{clOpenDt,jdbcType=TIMESTAMP},
</if>
@@ -426,6 +437,7 @@
cl_this_amount = #{clThisAmount,jdbcType=DOUBLE},
cl_this_money = #{clThisMoney,jdbcType=DOUBLE},
cl_this_time = #{clThisTime,jdbcType=INTEGER},
+ cl_price = #{clPrice,jdbcType=DOUBLE},
cl_open_dt = #{clOpenDt,jdbcType=TIMESTAMP},
close_dt = #{closeDt,jdbcType=TIMESTAMP},
cl_order_no = #{clOrderNo,jdbcType=VARCHAR},
@@ -462,16 +474,8 @@
</where>
</select>
- <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇寮�鍏抽榾鎶ュ巻鍙茶褰�-->
- <select id="getOpenCloseValveReports_history" resultType="com.dy.pipIrrGlobal.voRm.VoOpenCloseValve">
- SELECT oh.intake_id AS intakeId,
- inta.name AS intakenum,
- oh.rtu_addr AS rtuAddr,
- oh.client_name AS clientName,
- oh.op_ic_card_no AS openIcNum,
- oh.op_ic_card_addr AS openIcAddr,
- oh.open_dt AS openTime,
- CASE
+ <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇寮�鍏抽榾鎶ュ巻鍙茶褰�
+ CASE
WHEN oh.op_type = 1 THEN '鍒峰崱寮�闃�'
WHEN oh.op_type = 3 THEN '涓績绔欏紑闃�'
WHEN oh.op_type = 5 THEN '浣欓涓嶈冻鍏抽榾'
@@ -479,15 +483,8 @@
WHEN oh.op_type = 11 THEN '宸℃鍗″紑闃�'
ELSE '鏈煡'
END AS openType,
- oh.op_order_no AS openOrderNo,
- oh.op_total_amount AS openTotalAmount,
- oh.op_remain_money AS openRemainMoney,
- oh.op_water_remain_user AS openWaterRemain,
- oh.op_ele_total_amount AS openEleTotalAmount,
- oh.cl_ic_card_no AS closeIcNum,
- oh.cl_ic_card_addr AS closeIcAddr,
- oh.close_dt AS closeTime,
- CASE
+
+ CASE
WHEN oh.cl_type = 2 THEN '鍒峰崱鍏抽榾'
WHEN oh.cl_type = 4 THEN '涓績绔欏叧闃�'
WHEN oh.cl_type = 5 THEN '浣欓涓嶈冻鍏抽榾'
@@ -500,13 +497,35 @@
WHEN oh.cl_type = 14 THEN '鐢ㄦ埛杩滅▼瀹氶噺鍏抽榾'
ELSE '鏈煡'
END AS closeType,
+ -->
+ <select id="getOpenCloseValveReports_history" resultType="com.dy.pipIrrGlobal.voRm.VoOpenCloseValve">
+ SELECT oh.intake_id AS intakeId,
+ inta.name AS intakenum,
+ oh.rtu_addr AS rtuAddr,
+ cl.name AS clientName,
+ cl.address AS clientAddr,
+ oh.op_ic_card_no AS openIcNum,
+ oh.op_ic_card_addr AS openIcAddr,
+ oh.open_dt AS openTime,
+ oh.op_type AS openType_,
+ oh.op_order_no AS openOrderNo,
+ oh.op_total_amount AS openTotalAmount,
+ oh.op_remain_money AS openRemainMoney,
+ oh.op_water_remain_user AS openWaterRemain,
+ oh.op_ele_total_amount AS openEleTotalAmount,
+ oh.cl_ic_card_no AS closeIcNum,
+ oh.cl_ic_card_addr AS closeIcAddr,
+ oh.close_dt AS closeTime,
+ oh.cl_type AS closeType_,
oh.cl_this_amount AS closeThisAmount,
oh.cl_this_time AS thisTime,
+ oh.cl_price AS closePrice,
oh.cl_this_money AS thisMoney,
oh.cl_remain_money AS closeRemainMoney,
oh.cl_total_amount AS closeTotalAmount
FROM rm_open_close_valve_history oh
- INNER JOIN pr_intake inta ON inta.id = oh.intake_id
+ LEFT JOIN pr_intake inta ON inta.id = oh.intake_id
+ LEFT JOIN ba_client cl ON cl.id = oh.client_id
<where>
<if test="intakeId != null and intakeId > 0">
AND oh.intake_id = #{intakeId}
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
index d77590b..cbbad3c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
@@ -30,6 +30,7 @@
<result column="cl_this_amount" jdbcType="DOUBLE" property="clThisAmount"/>
<result column="cl_this_money" jdbcType="DOUBLE" property="clThisMoney"/>
<result column="cl_this_time" jdbcType="INTEGER" property="clThisTime"/>
+ <result column="cl_price" jdbcType="DOUBLE" property="clPrice"/>
<result column="cl_open_dt" jdbcType="TIMESTAMP" property="clOpenDt"/>
<result column="close_dt" jdbcType="TIMESTAMP" property="closeDt"/>
<result column="cl_order_no" jdbcType="VARCHAR" property="clOrderNo"/>
@@ -65,6 +66,7 @@
cl_this_amount,
cl_this_money,
cl_this_time,
+ cl_price,
cl_open_dt,
close_dt,
cl_order_no,
@@ -102,7 +104,7 @@
op_order_no, op_ele_total_amount, op_water_remain_user,
cl_dt, cl_type, cl_total_amount,
cl_ic_card_no, cl_ic_card_addr, cl_remain_money,
- cl_this_amount, cl_this_money, cl_this_time,
+ cl_this_amount, cl_this_money, cl_this_time, cl_price,
cl_open_dt, close_dt, cl_order_no,
cl_ele_total_amount, cl_water_remain_user, cl_this_ele)
values (#{id,jdbcType=BIGINT}, #{lastHistoryId,jdbcType=BIGINT},
@@ -114,8 +116,9 @@
#{clDt,jdbcType=TIMESTAMP}, #{clType,jdbcType=TINYINT}, #{clTotalAmount,jdbcType=DOUBLE},
#{clIcCardNo,jdbcType=VARCHAR}, #{clIcCardAddr,jdbcType=VARCHAR}, #{clRemainMoney,jdbcType=DOUBLE},
#{clThisAmount,jdbcType=DOUBLE}, #{clThisMoney,jdbcType=DOUBLE}, #{clThisTime,jdbcType=INTEGER},
- #{clOpenDt,jdbcType=TIMESTAMP}, #{closeDt,jdbcType=TIMESTAMP}, #{clOrderNo,jdbcType=VARCHAR},
- #{clEleTotalAmount,jdbcType=FLOAT}, #{clWaterRemainUser,jdbcType=FLOAT}, #{clThisEle,jdbcType=FLOAT})
+ #{clPrice,jdbcType=DOUBLE},#{clOpenDt,jdbcType=TIMESTAMP}, #{closeDt,jdbcType=TIMESTAMP},
+ #{clOrderNo,jdbcType=VARCHAR},#{clEleTotalAmount,jdbcType=FLOAT}, #{clWaterRemainUser,jdbcType=FLOAT},
+ #{clThisEle,jdbcType=FLOAT})
</insert>
<insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveLast">
<!--@mbg.generated-->
@@ -198,6 +201,9 @@
</if>
<if test="clThisTime != null">
cl_this_time,
+ </if>
+ <if test="clPrice != null">
+ cl_price,
</if>
<if test="clOpenDt != null">
cl_open_dt,
@@ -296,6 +302,9 @@
</if>
<if test="clThisTime != null">
#{clThisTime,jdbcType=INTEGER},
+ </if>
+ <if test="clPrice != null">
+ #{clPrice,jdbcType=DOUBLE},
</if>
<if test="clOpenDt != null">
#{clOpenDt,jdbcType=TIMESTAMP},
@@ -396,6 +405,9 @@
<if test="clThisTime != null">
cl_this_time = #{clThisTime,jdbcType=INTEGER},
</if>
+ <if test="clPrice != null">
+ cl_price = #{clPrice,jdbcType=DOUBLE},
+ </if>
<if test="clOpenDt != null">
cl_open_dt = #{clOpenDt,jdbcType=TIMESTAMP},
</if>
@@ -445,6 +457,7 @@
cl_this_amount = #{clThisAmount,jdbcType=DOUBLE},
cl_this_money = #{clThisMoney,jdbcType=DOUBLE},
cl_this_time = #{clThisTime,jdbcType=INTEGER},
+ cl_price = #{clPrice,jdbcType=DOUBLE},
cl_open_dt = #{clOpenDt,jdbcType=TIMESTAMP},
close_dt = #{closeDt,jdbcType=TIMESTAMP},
cl_order_no = #{clOrderNo,jdbcType=VARCHAR},
@@ -484,48 +497,32 @@
<!--鏍规嵁鎸囧畾鏉′欢鑾峰彇寮�鍏抽榾鎶ユ渶鏂拌褰�-->
<select id="getOpenCloseValveReports_last" resultType="com.dy.pipIrrGlobal.voRm.VoOpenCloseValve">
SELECT oh.intake_id AS intakeId,
- inta.name AS intakeNum,
- oh.rtu_addr AS rtuAddr,
- oh.client_name AS clientName,
- oh.op_ic_card_no AS openIcNum,
- oh.op_ic_card_addr AS openIcAddr,
- oh.open_dt AS openTime,
- CASE
- WHEN oh.op_type = 1 THEN '鍒峰崱寮�闃�'
- WHEN oh.op_type = 3 THEN '涓績绔欏紑闃�'
- WHEN oh.op_type = 5 THEN '浣欓涓嶈冻鍏抽榾'
- WHEN oh.op_type = 8 THEN '鐢ㄦ埛杩滅▼寮�闃�'
- WHEN oh.op_type = 11 THEN '宸℃鍗″紑闃�'
- ELSE '鏈煡'
- END AS openType,
- oh.op_order_no AS openOrderNo,
- oh.op_total_amount AS openTotalAmount,
- oh.op_remain_money AS openRemainMoney,
- oh.op_water_remain_user AS openWaterRemain,
- oh.op_ele_total_amount AS openEleTotalAmount,
- oh.cl_ic_card_no AS closeIcNum,
- oh.cl_ic_card_addr AS closeIcAddr,
- oh.close_dt AS closeTime,
- CASE
- WHEN oh.cl_type = 2 THEN '鍒峰崱鍏抽榾'
- WHEN oh.cl_type = 4 THEN '涓績绔欏叧闃�'
- WHEN oh.cl_type = 5 THEN '浣欓涓嶈冻鍏抽榾'
- WHEN oh.cl_type = 6 THEN '娴侀噺璁℃晠闅滃叧闃�'
- WHEN oh.cl_type = 7 THEN '绱ф�ュ叧闂�'
- WHEN oh.cl_type = 9 THEN '鐢ㄦ埛杩滅▼鍏抽榾'
- WHEN oh.cl_type = 10 THEN '宸℃鍗″叧闃�'
- WHEN oh.cl_type = 12 THEN '榛戝悕鍗曞懡浠ゅ叧闃�'
- WHEN oh.cl_type = 13 THEN '鐢ㄦ埛杩滅▼瀹氭椂鍏抽榾'
- WHEN oh.cl_type = 14 THEN '鐢ㄦ埛杩滅▼瀹氶噺鍏抽榾'
- ELSE '鏈煡'
- END AS closeType,
- oh.cl_this_amount AS closeThisAmount,
- oh.cl_this_time AS thisTime,
- oh.cl_this_money AS thisMoney,
- oh.cl_remain_money AS closeRemainMoney,
- oh.cl_total_amount AS closeTotalAmount
+ inta.name AS intakenum,
+ oh.rtu_addr AS rtuAddr,
+ cl.name AS clientName,
+ cl.address AS clientAddr,
+ oh.op_ic_card_no AS openIcNum,
+ oh.op_ic_card_addr AS openIcAddr,
+ oh.open_dt AS openTime,
+ oh.op_type AS openType_,
+ oh.op_order_no AS openOrderNo,
+ oh.op_total_amount AS openTotalAmount,
+ oh.op_remain_money AS openRemainMoney,
+ oh.op_water_remain_user AS openWaterRemain,
+ oh.op_ele_total_amount AS openEleTotalAmount,
+ oh.cl_ic_card_no AS closeIcNum,
+ oh.cl_ic_card_addr AS closeIcAddr,
+ oh.close_dt AS closeTime,
+ oh.cl_type AS closeType_,
+ oh.cl_this_amount AS closeThisAmount,
+ oh.cl_this_time AS thisTime,
+ oh.cl_price AS closePrice,
+ oh.cl_this_money AS thisMoney,
+ oh.cl_remain_money AS closeRemainMoney,
+ oh.cl_total_amount AS closeTotalAmount
FROM rm_open_close_valve_last oh
- INNER JOIN pr_intake inta ON inta.id = oh.intake_id
+ LEFT JOIN pr_intake inta ON inta.id = oh.intake_id
+ LEFT JOIN ba_client cl ON cl.id = oh.client_id
<where>
<if test="intakeId != null and intakeId > 0">
AND oh.intake_id = #{intakeId}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java
index 83b463b..8a0af3b 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java
@@ -1,5 +1,6 @@
package com.dy.pipIrrRemote.report;
+import com.dy.common.mw.protocol.p206V1_0_0.CommonV1_0_1;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoRm.*;
import com.dy.pipIrrGlobal.voRm.VoOnHour;
@@ -149,7 +150,14 @@
rsVo.pageCurr = qo.pageCurr ;
rsVo.calculateAndSet(itemTotal, params);
- rsVo.obj = rmOpenCloseValveHistoryMapper.getOpenCloseValveReports_history(params);
+ List<VoOpenCloseValve> list = rmOpenCloseValveHistoryMapper.getOpenCloseValveReports_history(params);
+ if (list != null && list.size() > 0) {
+ for (VoOpenCloseValve vo : list) {
+ vo.setOpenType(CommonV1_0_1.openCloseValveType(vo.getOpenType_()==null?(byte)100:vo.getOpenType_()));
+ vo.setCloseType(CommonV1_0_1.openCloseValveType(vo.getCloseType_()==null?(byte)100:vo.getCloseType_()));
+ }
+ }
+ rsVo.obj = list;
return rsVo ;
}
@@ -189,7 +197,14 @@
rsVo.pageCurr = qo.pageCurr ;
rsVo.calculateAndSet(itemTotal, params);
- rsVo.obj = rmOpenCloseValveLastMapper.getOpenCloseValveReports_last(params);
+ List<VoOpenCloseValve> list = rmOpenCloseValveLastMapper.getOpenCloseValveReports_last(params);
+ if (list != null && list.size() > 0) {
+ for (VoOpenCloseValve vo : list) {
+ vo.setOpenType(CommonV1_0_1.openCloseValveType(vo.getOpenType_()==null?(byte)100:vo.getOpenType_()));
+ vo.setCloseType(CommonV1_0_1.openCloseValveType(vo.getCloseType_()==null?(byte)100:vo.getCloseType_()));
+ }
+ }
+ rsVo.obj = list;
return rsVo ;
}
--
Gitblit v1.8.0