From f16c96a3bbd126dca21b254ceb018a0558f5ea1d Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 25 十月 2024 13:57:24 +0800
Subject: [PATCH] “开关阀卡”修改成“巡检卡”
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/dto/ManagerCard.java | 2 +-
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml | 4 ++--
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java | 6 +++---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CommonV1_0_1.java | 12 ++++++------
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeManagerCard.java | 2 +-
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml | 4 ++--
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd84Vo.java | 2 +-
7 files changed, 16 insertions(+), 16 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 8de6bb7..02f388b 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
@@ -147,7 +147,7 @@
return b ;
}
/**
- * 寰楀埌IC鍗＄被鍨嬪悕绉� 锛� 鍗＄被鍨�(1:鐢ㄦ埛鍗★紱2锛氱鐞嗗憳鍗★紱3锛氳皟璇曞崱锛�4锛氬紑鍏抽榾鍗★紱5锛氭竻绌哄崱)锛�
+ * 寰楀埌IC鍗＄被鍨嬪悕绉� 锛� 鍗＄被鍨�(1:鐢ㄦ埛鍗★紱2锛氱鐞嗗憳鍗★紱3锛氳皟璇曞崱锛�4锛氬贰妫�鍗★紱5锛氭竻绌哄崱)锛�
* @param type 瀛楄妭
* @return 鍚嶇О
*/
@@ -157,7 +157,7 @@
case 1 -> "鐢ㄦ埛鍗�";
case 2 -> "绠＄悊鍛樺崱";
case 3 -> "璋冭瘯鍗�";
- case 4 -> "寮�鍏抽榾鍗�";
+ case 4 -> "宸℃鍗�";
case 5 -> "娓呯┖鍗�";
default -> "鏈煡";
};
@@ -175,8 +175,8 @@
* 7:绱ф�ュ叧闂紱
* 8:鐢ㄦ埛杩滅▼寮�闃�锛�
* 9:鐢ㄦ埛杩滅▼鍏抽榾锛�
- * 10:寮�鍏抽榾鍗″叧闃�锛�
- * 11:寮�鍏抽榾鍗″埛鍗″崱寮�闃�锛�
+ * 10:宸℃鍗″叧闃�锛�
+ * 11:宸℃鍗″埛鍗″崱寮�闃�锛�
* 12:榛戝悕鍗曞懡浠ゅ叧闃�锛�
* 13:杩滅▼瀹氭椂鍏抽榾锛�
* 14:杩滅▼瀹氶噺鍏抽榾锛�
@@ -195,8 +195,8 @@
case 7 -> "绱ф�ュ叧闃�";
case 8 -> "鐢ㄦ埛杩滅▼寮�闃�";
case 9 -> "鐢ㄦ埛杩滅▼鍏抽榾";
- case 10 -> "寮�鍏抽榾鍗″叧闃�";
- case 11 -> "寮�鍏抽榾鍗″紑闃�";
+ case 10 -> "宸℃鍗″叧闃�";
+ case 11 -> "宸℃鍗″紑闃�";
case 12 -> "榛戝悕鍗曞懡浠ゅ叧闃�";
case 13 -> "杩滅▼瀹氭椂鍏抽榾";
case 14 -> "杩滅▼瀹氶噺鍏抽榾";
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd84Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd84Vo.java
index dbfc32c..a9bbcb4 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd84Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd84Vo.java
@@ -11,7 +11,7 @@
public class DataCd84Vo implements UpDataVo {
public Byte opType;
- public Byte cardType ;//鍗＄被鍨�(0:鏃犲崱锛�1:鐢ㄦ埛鍗★紱2锛氱鐞嗗憳鍗★紱3锛氳皟璇曞崱锛�4锛氬紑鍏抽榾鍗★紱5锛氭竻绌哄崱)
+ public Byte cardType ;//鍗＄被鍨�(0:鏃犲崱锛�1:鐢ㄦ埛鍗★紱2锛氱鐞嗗憳鍗★紱3锛氳皟璇曞崱锛�4锛氬贰妫�鍗★紱5锛氭竻绌哄崱)
public String cardAddr ;//IC鍗″湴鍧�锛�8浣嶅瓧绗︼級
public String cardNo ;//IC鍗＄紪鍙�
public Double remainMoney ;//鍓╀綑閲戦锛氱敤鎴蜂綑棰�4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0.00~999999.99锛屽崟浣嶄负鍏�
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeManagerCard.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeManagerCard.java
index 6bf4d99..932ba30 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeManagerCard.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeManagerCard.java
@@ -53,7 +53,7 @@
private String cardNum;
/**
- * 鍗＄墖绫诲瀷;2-绠＄悊绉戯紝4-寮�鍏抽榾鍗★紝5娓呯┖鍗�
+ * 鍗＄墖绫诲瀷;2-绠＄悊绉戯紝4-宸℃鍗★紝5娓呯┖鍗�
*/
@NotNull(message = "鍗＄墖绫诲瀷涓嶈兘涓虹┖")
private Byte cardType;
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 42a788f..65e7dd0 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
@@ -476,7 +476,7 @@
WHEN oh.op_type = 3 THEN '涓績绔欏紑闃�'
WHEN oh.op_type = 5 THEN '浣欓涓嶈冻鍏抽榾'
WHEN oh.op_type = 8 THEN '鐢ㄦ埛杩滅▼寮�闃�'
- WHEN oh.op_type = 11 THEN '寮�鍏抽榾鍗″紑闃�'
+ WHEN oh.op_type = 11 THEN '宸℃鍗″紑闃�'
ELSE '鏈煡'
END AS openType,
oh.op_order_no AS openOrderNo,
@@ -494,7 +494,7 @@
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 = 10 THEN '宸℃鍗″叧闃�'
WHEN oh.cl_type = 12 THEN '榛戝悕鍗曞懡浠ゅ叧闃�'
WHEN oh.cl_type = 13 THEN '鐢ㄦ埛杩滅▼瀹氭椂鍏抽榾'
WHEN oh.cl_type = 14 THEN '鐢ㄦ埛杩滅▼瀹氶噺鍏抽榾'
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 a58f814..d77590b 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
@@ -495,7 +495,7 @@
WHEN oh.op_type = 3 THEN '涓績绔欏紑闃�'
WHEN oh.op_type = 5 THEN '浣欓涓嶈冻鍏抽榾'
WHEN oh.op_type = 8 THEN '鐢ㄦ埛杩滅▼寮�闃�'
- WHEN oh.op_type = 11 THEN '寮�鍏抽榾鍗″紑闃�'
+ WHEN oh.op_type = 11 THEN '宸℃鍗″紑闃�'
ELSE '鏈煡'
END AS openType,
oh.op_order_no AS openOrderNo,
@@ -513,7 +513,7 @@
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 = 10 THEN '宸℃鍗″叧闃�'
WHEN oh.cl_type = 12 THEN '榛戝悕鍗曞懡浠ゅ叧闃�'
WHEN oh.cl_type = 13 THEN '鐢ㄦ埛杩滅▼瀹氭椂鍏抽榾'
WHEN oh.cl_type = 14 THEN '鐢ㄦ埛杩滅▼瀹氶噺鍏抽榾'
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/dto/ManagerCard.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/dto/ManagerCard.java
index 0b28e12..eea4342 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/dto/ManagerCard.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/dto/ManagerCard.java
@@ -21,7 +21,7 @@
private String cardAddr;
/**
- * 鍗＄墖绫诲瀷锛�2-绠＄悊绉戯紝4-寮�鍏抽榾鍗★紝5-娓呯┖鍗�
+ * 鍗＄墖绫诲瀷锛�2-绠＄悊绉戯紝4-宸℃鍗★紝5-娓呯┖鍗�
*/
private Byte cardType;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java
index f0d7ddf..98a7e5f 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java
@@ -342,10 +342,10 @@
openTypeName = "鐢ㄦ埛杩滅▼寮�闃�";
break;
case 11:
- openTypeName = "寮�鍏抽榾鍗″紑闃�";
+ openTypeName = "宸℃鍗″紑闃�";
break;
case 13:
- openTypeName = "寮�鍏抽榾鍗″紑闃�";
+ openTypeName = "宸℃鍗″紑闃�";
break;
default:
openTypeName = "涓嶇煡閬撴偍瑕佹煡閭ｇ寮�闃�绫诲瀷";
@@ -412,7 +412,7 @@
closeTypeName = "鐢ㄦ埛杩滅▼鍏抽榾";
break;
case 10:
- closeTypeName = "寮�鍏抽榾鍗″叧闃�";
+ closeTypeName = "宸℃鍗″叧闃�";
break;
case 12:
closeTypeName = "榛戝悕鍗曞懡浠ゅ叧闃�";
--
Gitblit v1.8.0