From 9860dd8d6a437ba7e11168f490f86d4cc6edf584 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期四, 13 六月 2024 22:34:47 +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 | 168 ++++++
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3AAnd6AVo.java | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_A0_Up.java | 72 ++
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java | 4
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Org.java | 15
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_35_Up.java | 1
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3BAnd6BVo.java | 2
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java | 43
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_99_Up.java | 72 ++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrControllerTramp.java | 2
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealCloseValveReport.java | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd21Vo.java | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_67_Up.java | 1
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataAlarmVo.java | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_3D_Up.java | 1
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/CodeLocal.java | 11
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/CommandP206V100Ctrl.java | 16
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd66Vo.java | 2
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictCtrl.java | 139 ++--
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd83OpenVo.java | 3
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DtoToDividePojo.java | 1
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_39_Up.java | 1
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCdA0Vo.java | 6
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd97Vo.java | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_02_Down.java | 1
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd39And69Vo.java | 2
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealLoss.java | 2
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardCtrl.java | 9
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd99Vo.java | 6
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd93Vo.java | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_6C_Up.java | 1
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeVirtualCardMapper.java | 14
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateHistoryMapper.xml | 30
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd35And65Vo.java | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd37And67Vo.java | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_81_Up.java | 1
pipIrr-platform/pipIrr-global/src/main/resources/application-database-ym.yml | 2
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatusV202404.java | 27
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_21_Up.java | 1
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_66_Up.java | 1
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrController.java | 2
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java | 11
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd6CVo.java | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeVirtualCard.java | 6
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_92_Up.java | 1
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_3C_Up.java | 1
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_10_Up.java | 1
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmAlarmStateHistory.java | 10
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/downVos/ComA0Vo.java | 17
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3CVo.java | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_6B_Up.java | 1
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/log4j2.yml | 16
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd92Vo.java | 2
pipIrr-platform/pipIrr-web/pom.xml | 1
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd83CloseVo.java | 3
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeRechargeMapper.xml | 9
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/RtuDataDealTree.xml | 2
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/localProtocol/RtuOnLineDeal.java | 7
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd38And68Vo.java | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/DistrictLevel.java | 5
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_37_Up.java | 1
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_97_Up.java | 1
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java | 37
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_93_Up.java | 1
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_84_Up.java | 1
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveLast.java | 2
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkRtuDealCommandResponse.java | 6
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd81Vo.java | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCdC0Vo.java | 2
pipIrr-platform/文档/各系统部署/嘉峪关.txt | 2
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml | 32 +
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_69_Up.java | 1
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeRechargeMapper.java | 6
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3DVo.java | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_71_Up.java | 1
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataStateVo.java | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CodeV1_0_1.java | 6
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealAlarmStatus.java | 207 +++++--
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_3B_Up.java | 1
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd84Vo.java | 5
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeSv.java | 10
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/MidResultFromRtu.java | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_83_Up.java | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd10Vo.java | 2
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealAutoReport.java | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_6A_Up.java | 1
pipIrr-platform/pipIrr-common/pom.xml | 6
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_02_Up.java | 1
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_36_Up.java | 1
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealOpenValveReport.java | 27
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideCtrl.java | 14
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_68_Up.java | 1
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd36Vo.java | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_98_Up.java | 1
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_A0_Down.java | 168 ++++++
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd71Vo.java | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/downVos/Com99Vo.java | 17
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java | 20
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd98Vo.java | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_3A_Up.java | 1
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealWorkReport.java | 2
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml | 5
/dev/null | 181 ------
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVirtualCardMapper.xml | 34 +
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DtoDivide.java | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_C0_Up.java | 1
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmAlarmStateLast.java | 10
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkFindP206V1_0_0.java | 2
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/DtoIntakeController.java | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd02Vo.java | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_65_Up.java | 1
111 files changed, 1,148 insertions(+), 468 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/pom.xml b/pipIrr-platform/pipIrr-common/pom.xml
index 480dd56..c000009 100644
--- a/pipIrr-platform/pipIrr-common/pom.xml
+++ b/pipIrr-platform/pipIrr-common/pom.xml
@@ -122,12 +122,6 @@
<version>2.2.2</version>
</dependency>
- <!-- apache httpClient -->
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.5.14</version>
- </dependency>
<!-- quartz -->
<dependency>
<groupId>org.quartz-scheduler</groupId>
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/MidResultFromRtu.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/MidResultFromRtu.java
index f5c44b7..62278cc 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/MidResultFromRtu.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/MidResultFromRtu.java
@@ -1,6 +1,8 @@
package com.dy.common.mw.protocol;
import com.dy.common.mw.protocol.p206V1_0_0.*;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd97Vo;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd98Vo;
/**
* 浠嶳TU鏀跺埌鏁版嵁
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CodeV1_0_1.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CodeV1_0_1.java
index 3724072..e794d02 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CodeV1_0_1.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CodeV1_0_1.java
@@ -30,6 +30,8 @@
public static final String cd_93 = "93" ;//閬ユ帶鍏抽棴闃�闂�
public static final String cd_97 = "97" ;//APP杩滅▼寮�闃�
public static final String cd_98 = "98" ;//APP杩滅▼鍏抽榾
+ public static final String cd_99 = "99" ;//瀹氭椂鍏抽榾寮�闃�
+ public static final String cd_A0 = "A0" ;//瀹氶噺鍏抽榾寮�闃�
public static final String cd_3C = "3C" ;//璁剧疆姘翠环
public static final String cd_6C = "6C" ;//鏌ヨ姘翠环
public static final String cd_3D = "3D" ;//璁剧疆榛戝悕鍗�
@@ -63,11 +65,13 @@
(code.equals(cd_93) ? "閬ユ帶鍏抽棴闃�闂�" :
(code.equals(cd_97) ? "APP杩滅▼寮�闃�" :
(code.equals(cd_98) ? "APP杩滅▼鍏抽榾" :
+ (code.equals(cd_99) ? "瀹氭椂鍏抽榾寮�闃�" :
+ (code.equals(cd_A0) ? "瀹氶噺鍏抽榾寮�闃�" :
(code.equals(cd_3C) ? "璁剧疆姘翠环" :
(code.equals(cd_6C) ? "鏌ヨ姘翠环" :
(code.equals(cd_3D) ? "璁剧疆榛戝悕鍗�" :
(code.equals(cd_C0) ? "鑷姤瀹炴椂鏁版嵁" :
- ""))))))))))))))))))))))))))))))) ;
+ ""))))))))))))))))))))))))))))))))) ;
return name ;
}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/downVos/Com99Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/downVos/Com99Vo.java
new file mode 100644
index 0000000..af014d5
--- /dev/null
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/downVos/Com99Vo.java
@@ -0,0 +1,17 @@
+package com.dy.common.mw.protocol.p206V1_0_0.downVos;
+
+import lombok.Data;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2024/5/28 21:30
+ * @Description 瀹氭椂鍏抽榾寮�闃�
+ */
+@Data
+public class Com99Vo {
+ public String icCardNo ;//17浣嶈櫄鎷烮C鍗＄紪鍙�(鍗忚鏄�10浣嶆暟瀛�)
+ public Integer moneyRemain;//鍓╀綑閲戦(鍙栧�艰寖鍥�0.00~999999.99锛屽崟浣嶄负鍏�)
+ public Double waterPrice;//姘翠环(鍙栧�艰寖鍥�0.00~99.99鍏�/m3)
+ public Integer minutes ;//鐢ㄦ按鏃堕暱锛�0~9999鍒嗛挓锛�
+ public String orderNo ;//璁㈠崟鍙凤紙16浣嶆暟瀛楋級
+}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/downVos/ComA0Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/downVos/ComA0Vo.java
new file mode 100644
index 0000000..9f78660
--- /dev/null
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/downVos/ComA0Vo.java
@@ -0,0 +1,17 @@
+package com.dy.common.mw.protocol.p206V1_0_0.downVos;
+
+import lombok.Data;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2024/5/28 21:30
+ * @Description 瀹氭椂鍏抽榾寮�闃�
+ */
+@Data
+public class ComA0Vo {
+ public String icCardNo ;//17浣嶈櫄鎷烮C鍗＄紪鍙�(鍗忚鏄�10浣嶆暟瀛�)
+ public Integer moneyRemain;//鍓╀綑閲戦(鍙栧�艰寖鍥�0.00~999999.99锛屽崟浣嶄负鍏�)
+ public Double waterPrice;//姘翠环(鍙栧�艰寖鍥�0.00~99.99鍏�/m3)
+ public Integer waterAmount ;//棰勭敤姘撮噺锛�0~9999 m3锛�
+ public String orderNo ;//璁㈠崟鍙凤紙16浣嶆暟瀛楋級
+}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_02_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_02_Down.java
index 1813dc5..445c5f7 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_02_Down.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_02_Down.java
@@ -3,6 +3,7 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1_0_0.*;
import com.dy.common.mw.protocol.p206V1_0_0.parse.global.GlCreate;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd02Vo;
import com.dy.common.util.ByteUtil;
@AnnotationCodeDown(ifAny={
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_02_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_02_Up.java
index 973fa1f..02e12ef 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_02_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_02_Up.java
@@ -2,6 +2,7 @@
import com.dy.common.mw.protocol.*;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd02Vo;
import com.dy.common.util.ByteUtil;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_10_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_10_Up.java
index fb61e3d..50642b6 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_10_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_10_Up.java
@@ -2,6 +2,7 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1_0_0.*;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd10Vo;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_21_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_21_Up.java
index b3d5d9f..6fe58e9 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_21_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_21_Up.java
@@ -2,6 +2,7 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1_0_0.*;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd21Vo;
import com.dy.common.util.ByteUtilUnsigned;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_35_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_35_Up.java
index 20c22f4..cfe0b79 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_35_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_35_Up.java
@@ -2,6 +2,7 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1_0_0.*;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd35And65Vo;
import com.dy.common.util.ByteUtilUnsigned;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_36_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_36_Up.java
index 7bb568f..8fe20cc 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_36_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_36_Up.java
@@ -2,6 +2,7 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1_0_0.*;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd36Vo;
import com.dy.common.util.ByteUtilUnsigned;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_37_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_37_Up.java
index f06141a..b251c1a 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_37_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_37_Up.java
@@ -2,6 +2,7 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1_0_0.*;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd37And67Vo;
import com.dy.common.util.ByteUtilUnsigned;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_39_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_39_Up.java
index a38bed7..1a6deca 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_39_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_39_Up.java
@@ -2,6 +2,7 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1_0_0.*;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd39And69Vo;
import com.dy.common.util.ByteUtilUnsigned;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_3A_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_3A_Up.java
index 9bb3f9c..19ffe39 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_3A_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_3A_Up.java
@@ -2,6 +2,7 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1_0_0.*;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd3AAnd6AVo;
import com.dy.common.util.ByteUtilUnsigned;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_3B_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_3B_Up.java
index f74416c..61d3d4f 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_3B_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_3B_Up.java
@@ -2,6 +2,7 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1_0_0.*;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd3BAnd6BVo;
import com.dy.common.util.ByteUtilUnsigned;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_3C_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_3C_Up.java
index 77deb9e..5c748d1 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_3C_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_3C_Up.java
@@ -2,6 +2,7 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1_0_0.*;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd3CVo;
import com.dy.common.util.ByteUtilUnsigned;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_3D_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_3D_Up.java
index 7e4b381..866626a 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_3D_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_3D_Up.java
@@ -2,6 +2,7 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1_0_0.*;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd3DVo;
import com.dy.common.util.ByteUtilUnsigned;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_65_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_65_Up.java
index 8df865f..934f557 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_65_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_65_Up.java
@@ -2,6 +2,7 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1_0_0.*;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd35And65Vo;
import com.dy.common.util.ByteUtilUnsigned;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_66_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_66_Up.java
index 17a9964..2a5f5ae 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_66_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_66_Up.java
@@ -2,6 +2,7 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1_0_0.*;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd66Vo;
import com.dy.common.util.ByteUtilUnsigned;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_67_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_67_Up.java
index 7bd2a88..43d9233 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_67_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_67_Up.java
@@ -2,6 +2,7 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1_0_0.*;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd37And67Vo;
import com.dy.common.util.ByteUtilUnsigned;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_68_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_68_Up.java
index 5ae92ad..2cebfea 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_68_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_68_Up.java
@@ -2,6 +2,7 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1_0_0.*;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd38And68Vo;
import com.dy.common.util.ByteUtilUnsigned;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_69_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_69_Up.java
index 032e924..dba2aca 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_69_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_69_Up.java
@@ -2,6 +2,7 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1_0_0.*;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd39And69Vo;
import com.dy.common.util.ByteUtilUnsigned;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_6A_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_6A_Up.java
index ef81124..bd969f2 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_6A_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_6A_Up.java
@@ -2,6 +2,7 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1_0_0.*;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd3AAnd6AVo;
import com.dy.common.util.ByteUtilUnsigned;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_6B_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_6B_Up.java
index 3aacc9c..6d31883 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_6B_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_6B_Up.java
@@ -2,6 +2,7 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1_0_0.*;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd3BAnd6BVo;
import com.dy.common.util.ByteUtilUnsigned;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_6C_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_6C_Up.java
index e197445..eafb6d7 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_6C_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_6C_Up.java
@@ -2,6 +2,7 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1_0_0.*;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd6CVo;
import com.dy.common.util.ByteUtilUnsigned;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_71_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_71_Up.java
index e249ac8..0df3b8b 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_71_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_71_Up.java
@@ -2,6 +2,7 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1_0_0.*;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd71Vo;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_81_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_81_Up.java
index de67039..029c4e3 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_81_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_81_Up.java
@@ -3,6 +3,7 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1_0_0.*;
import com.dy.common.mw.protocol.p206V1_0_0.parse.global.GlParse;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd81Vo;
import com.dy.common.util.ByteUtil;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_83_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_83_Up.java
index cf23f06..e8e34f4 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_83_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_83_Up.java
@@ -3,6 +3,8 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1_0_0.*;
import com.dy.common.mw.protocol.p206V1_0_0.parse.global.GlParse;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd83CloseVo;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd83OpenVo;
import com.dy.common.util.ByteUtil;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_84_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_84_Up.java
index 293a0fa..e4fd9cd 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_84_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_84_Up.java
@@ -3,6 +3,7 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1_0_0.*;
import com.dy.common.mw.protocol.p206V1_0_0.parse.global.GlParse;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd84Vo;
import com.dy.common.util.ByteUtil;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_92_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_92_Up.java
index b19a7d1..1da3c4b 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_92_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_92_Up.java
@@ -2,6 +2,7 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1_0_0.*;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd92Vo;
import com.dy.common.util.ByteUtil;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_93_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_93_Up.java
index 77b7dc5..10bd5ce 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_93_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_93_Up.java
@@ -2,6 +2,7 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1_0_0.*;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd93Vo;
import com.dy.common.util.ByteUtil;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_97_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_97_Up.java
index 78a5b61..7e4f9ef 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_97_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_97_Up.java
@@ -2,6 +2,7 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1_0_0.*;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd97Vo;
import com.dy.common.util.ByteUtil;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_98_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_98_Up.java
index e35c2af..777f9b4 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_98_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_98_Up.java
@@ -2,6 +2,7 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1_0_0.*;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd98Vo;
import com.dy.common.util.ByteUtil;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
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
new file mode 100644
index 0000000..9e84e6b
--- /dev/null
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_99_Down.java
@@ -0,0 +1,168 @@
+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.Com97Vo;
+import com.dy.common.mw.protocol.p206V1_0_0.downVos.Com99Vo;
+import com.dy.common.mw.protocol.p206V1_0_0.parse.global.GlCreate;
+import com.dy.common.util.ByteUtil;
+
+/**
+ * @Author liurunyu
+ * @Date 2024/06/12 9:30
+ * @Description
+ */
+@AnnotationCodeDown(ifAny={
+ CodeV1_0_1.cd_99
+})
+public class Cd_99_Down implements CodeParse {
+
+ @Override
+ public MidResult[] parse(Boolean isLowPower, CodeParseParams params, CodeParseCallback callback) throws Exception {
+ ParseParamsForDownV1_0_1 para = (ParseParamsForDownV1_0_1) params ;
+ MidResultToRtu midRs = new MidResultToRtu() ;
+ byte[] bs = this.doParse(midRs, para) ;
+
+ midRs.rtuResultSendWebUrl = para.rtuResultSendWebUrl ;//rtu杩斿洖鍛戒护缁撴灉 鍙戝悜鐩殑鍦皐eb URL
+ midRs.protocolName = para.protocolName ;//鍗忚鍚嶇О
+ midRs.rtuAddr = para.rtuAddr ;//Rtu鍦板潃
+ midRs.commandId = para.commandId ;//鍛戒护ID锛屽彂璧峰懡浠ょ殑瀹㈡埛绔�(web绔�)鐢熸垚锛屼互鍖归厤鍛戒护缁撴灉
+ midRs.downCode = para.commandCode ;//涓嬭鍛戒护鍔熻兘鐮�;
+ midRs.downBuffer = bs ;//涓嬭鍛戒护鏁版嵁
+ midRs.downBufHex = ByteUtil.bytes2Hex(bs, true) ;//涓嬭鍛戒护鏁版嵁鍗佸叚杩涘埗褰㈠紡
+ midRs.hasResponse = true ;//鏄惁鏈夊簲绛�
+ midRs.maxSendTimes = null ;//鍛戒护鏈�澶у彂閫佹鏁�(褰撴敹涓嶅埌搴旂瓟鏃讹紝灏嗛噸鍙�)锛屽鏋滀笉璁剧疆锛屽懡浠ょ紦瀛樺櫒杩涜琛ュ厖璁剧疆
+ midRs.isCachForOffLine = false ;//RTU涓嶅湪绾匡紝鍛戒护鏄惁缂撳瓨锛屼綆鍔熻�楁椂涓簍rue
+
+ if(isLowPower != null && isLowPower.booleanValue()){
+ //浣庡姛鑰楁椂锛屽敖蹇彂閫�
+ midRs.isQuickSend = true ;
+ }
+
+ return new MidResult[]{midRs} ;
+ }
+
+ /**
+ * 鏋勯�犱笅琛屾暟鎹�
+ * @param midRs 鍙傛暟
+ * @param para 鍙傛暟
+ * @return 瀛楄妭鏁扮粍
+ * @throws Exception 寮傚父
+ */
+ public byte[] doParse(MidResultToRtu midRs, 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 ;
+
+ index++ ;
+ bsHead[index] = 0 ;//甯ч暱搴�
+
+ index++ ;
+ bsHead[index] = ProtocolConstantV206V1_0_0.P_Head_Byte ;
+
+ index++ ;
+ bsHead[index] = commonV1_0_1.createCtrl((byte)0, (byte)0) ;
+
+ index++ ;
+ GlCreate.createRtuAddr(para.rtuAddr, bsHead, index);
+ index += 5 ;
+
+ ByteUtil.hex2Bytes(para.commandCode, bsHead, index) ;
+
+ JSONObject obj = (JSONObject)para.param;
+ String json = obj.toJSONString();
+ Com99Vo cvo = JSON.parseObject(json, Com99Vo.class) ;
+ if(cvo == null){
+ throw new Exception("json杞珻om97Vo涓簄ull") ;
+ }
+ if(cvo.icCardNo == null){
+ throw new Exception("铏氭嫙IC鍗＄紪鍙蜂笉鑳戒负绌�") ;
+ }
+ if(cvo.moneyRemain == null){
+ throw new Exception("鍓╀綑閲戦涓嶈兘涓虹┖") ;
+ }
+ if(cvo.waterPrice == null){
+ throw new Exception("姘翠环涓嶈兘涓虹┖") ;
+ }
+ if(cvo.minutes == null){
+ throw new Exception("鐢ㄦ按鏃堕暱涓嶈兘涓虹┖") ;
+ }
+ if(cvo.minutes < 0 || cvo.minutes > 9999){
+ throw new Exception("鐢ㄦ按鏃堕暱鍙栧�艰寖鍥存槸0~9999鍒嗛挓") ;
+ }
+
+ String[] icCardNoGrp = CommonV1_0_1.dealIcCardNo(cvo.icCardNo) ;
+ if(icCardNoGrp[0] != null){
+ midRs.param = icCardNoGrp[0] ;
+ }
+
+ byte[] bs = new byte[13] ;
+ index = 0 ;
+ ByteUtil.string2BCD_LE(bs, icCardNoGrp[1], index) ;
+
+ index += 5 ;
+ Integer money = Double.valueOf(cvo.moneyRemain * 100.0D).intValue() ;
+ byte[] bTemp = ByteUtil.int2BCD_LE(money) ;
+ int bTempLen = bTemp.length ;
+ int count = 0 ;
+ for(int i = 0 ; i < bTempLen; i++){
+ bs[index++] = bTemp[i] ;
+ count ++ ;
+ if(count >= 4){
+ break ;
+ }
+ }
+ for(; count < 4; count++){
+ bs[index++] = 0 ;
+ }
+
+ Integer price = Double.valueOf(cvo.waterPrice * 100.0D).intValue() ;
+ bTemp = ByteUtil.int2BCD_LE(price) ;
+ bTempLen = bTemp.length ;
+ count = 0 ;
+ for(int i = 0 ; i < bTempLen; i++){
+ bs[index++] = bTemp[i] ;
+ count ++ ;
+ if(count >= 2){
+ break ;
+ }
+ }
+ for(; count < 2; count++){
+ bs[index++] = 0 ;
+ }
+
+
+ bTemp = ByteUtil.int2BCD_LE(cvo.minutes) ;
+ bTempLen = bTemp.length ;
+ count = 0 ;
+ for(int i = 0 ; i < bTempLen; i++){
+ bs[index++] = bTemp[i] ;
+ count ++ ;
+ if(count >= 2){
+ break ;
+ }
+ }
+ for(; count < 2; count++){
+ bs[index++] = 0 ;
+ }
+
+ bytes = ByteUtil.bytesMerge(bsHead, bs) ;
+
+ 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_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_99_Up.java
new file mode 100644
index 0000000..c6ca29d
--- /dev/null
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_99_Up.java
@@ -0,0 +1,72 @@
+package com.dy.common.mw.protocol.p206V1_0_0.parse;
+
+import com.dy.common.mw.protocol.*;
+import com.dy.common.mw.protocol.p206V1_0_0.*;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd98Vo;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd99Vo;
+import com.dy.common.util.ByteUtil;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+/**
+ * @Author liurunyu
+ * @Date 2024/06/12 9:30
+ * @Description
+ */
+@AnnotationCodeUp(ifAny={
+ CodeV1_0_1.cd_99
+})
+@SuppressWarnings("unused")
+public class Cd_99_Up implements CodeParse {
+
+ private static final Logger log = LogManager.getLogger(Cd_99_Up.class);
+
+ /**
+ * 鍒嗘瀽涓婅鏁版嵁
+ */
+ @Override
+ public MidResult[] parse(Boolean isLowPower, CodeParseParams params, CodeParseCallback callback)throws Exception {
+ ParseParamsForUpV1_0_1 para = (ParseParamsForUpV1_0_1)params ;
+ int bsLen = new CommonV1_0_1().parseDataLen(para.upBuffer) ;
+ if(bsLen > 0){
+ this.doParse(para.upBuffer,
+ bsLen,
+ para.upCode,
+ para.data) ;
+ }
+ log.info("鍒嗘瀽涓婅鏁版嵁<" + CodeV1_0_1.getCodeName(para.upCode) + " RTU鍦板潃=" + para.rtuAddr + ">:\n" + para.data.toString());
+
+ MidResultFromRtu midRs = new MidResultFromRtu() ;
+ midRs.protocolName = para.protocolName ;//鍗忚鍚嶇О
+ midRs.rtuAddr = para.rtuAddr ;//Rtu鍦板潃
+ midRs.upCode = para.upCode ;//涓婅鏁版嵁涓殑鍔熻兘鐮�
+ midRs.upHex = para.upHex ;//涓婅鏁版嵁鍗佸叚杩涘埗褰㈠紡
+ midRs.upBuffer = para.upBuffer ;//涓婅鏁版嵁瀛楄妭鏁扮粍
+ midRs.data = para.data ;//瑙ｆ瀽鍚庣殑鏁版嵁
+
+ midRs.reportOrResponse_trueOrFalse = false ;//涓诲姩涓婃姤
+
+ callback.callback(midRs.reportOrResponse_trueOrFalse);
+ return new MidResult[]{midRs} ;
+ }
+ /**
+ * 鎵ц鍒嗘瀽
+ * @param bs 瀛楄妭鏁扮粍
+ * @param bsLen 瀛楄妭闀垮害锛堟�诲寘闀匡紝鍖呮嫭鍖呭ご鍜屽寘灏撅級
+ * @param dataCode 鍔熻兘鐮�
+ * @param data 鏁版嵁
+ * @throws Exception 寮傚父
+ */
+ protected void doParse(byte[] bs, int bsLen, String dataCode, Data data) throws Exception {
+ DataV1_0_1 dV1 = (DataV1_0_1)data.getSubData() ;
+ DataCd99Vo cdData = new DataCd99Vo() ;
+ dV1.subData = cdData ;
+ //铏氭嫙鍗″彿
+ cdData.cardNo = ByteUtil.BCD2String_LE(bs, ProtocolConstantV206V1_0_0.dataIndex, ProtocolConstantV206V1_0_0.dataIndex+4) ;
+ if(bs[ProtocolConstantV206V1_0_0.dataIndex + 5] == (byte)0xAA){
+ cdData.success = true ;
+ }else{
+ cdData.success = false ;
+ }
+ }
+}
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
new file mode 100644
index 0000000..919df26
--- /dev/null
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_A0_Down.java
@@ -0,0 +1,168 @@
+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.Com99Vo;
+import com.dy.common.mw.protocol.p206V1_0_0.downVos.ComA0Vo;
+import com.dy.common.mw.protocol.p206V1_0_0.parse.global.GlCreate;
+import com.dy.common.util.ByteUtil;
+
+/**
+ * @Author liurunyu
+ * @Date 2024/06/12 9:30
+ * @Description
+ */
+@AnnotationCodeDown(ifAny={
+ CodeV1_0_1.cd_A0
+})
+public class Cd_A0_Down implements CodeParse {
+
+ @Override
+ public MidResult[] parse(Boolean isLowPower, CodeParseParams params, CodeParseCallback callback) throws Exception {
+ ParseParamsForDownV1_0_1 para = (ParseParamsForDownV1_0_1) params ;
+ MidResultToRtu midRs = new MidResultToRtu() ;
+ byte[] bs = this.doParse(midRs, para) ;
+
+ midRs.rtuResultSendWebUrl = para.rtuResultSendWebUrl ;//rtu杩斿洖鍛戒护缁撴灉 鍙戝悜鐩殑鍦皐eb URL
+ midRs.protocolName = para.protocolName ;//鍗忚鍚嶇О
+ midRs.rtuAddr = para.rtuAddr ;//Rtu鍦板潃
+ midRs.commandId = para.commandId ;//鍛戒护ID锛屽彂璧峰懡浠ょ殑瀹㈡埛绔�(web绔�)鐢熸垚锛屼互鍖归厤鍛戒护缁撴灉
+ midRs.downCode = para.commandCode ;//涓嬭鍛戒护鍔熻兘鐮�;
+ midRs.downBuffer = bs ;//涓嬭鍛戒护鏁版嵁
+ midRs.downBufHex = ByteUtil.bytes2Hex(bs, true) ;//涓嬭鍛戒护鏁版嵁鍗佸叚杩涘埗褰㈠紡
+ midRs.hasResponse = true ;//鏄惁鏈夊簲绛�
+ midRs.maxSendTimes = null ;//鍛戒护鏈�澶у彂閫佹鏁�(褰撴敹涓嶅埌搴旂瓟鏃讹紝灏嗛噸鍙�)锛屽鏋滀笉璁剧疆锛屽懡浠ょ紦瀛樺櫒杩涜琛ュ厖璁剧疆
+ midRs.isCachForOffLine = false ;//RTU涓嶅湪绾匡紝鍛戒护鏄惁缂撳瓨锛屼綆鍔熻�楁椂涓簍rue
+
+ if(isLowPower != null && isLowPower.booleanValue()){
+ //浣庡姛鑰楁椂锛屽敖蹇彂閫�
+ midRs.isQuickSend = true ;
+ }
+
+ return new MidResult[]{midRs} ;
+ }
+
+ /**
+ * 鏋勯�犱笅琛屾暟鎹�
+ * @param midRs 鍙傛暟
+ * @param para 鍙傛暟
+ * @return 瀛楄妭鏁扮粍
+ * @throws Exception 寮傚父
+ */
+ public byte[] doParse(MidResultToRtu midRs, 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 ;
+
+ index++ ;
+ bsHead[index] = 0 ;//甯ч暱搴�
+
+ index++ ;
+ bsHead[index] = ProtocolConstantV206V1_0_0.P_Head_Byte ;
+
+ index++ ;
+ bsHead[index] = commonV1_0_1.createCtrl((byte)0, (byte)0) ;
+
+ index++ ;
+ GlCreate.createRtuAddr(para.rtuAddr, bsHead, index);
+ index += 5 ;
+
+ ByteUtil.hex2Bytes(para.commandCode, bsHead, index) ;
+
+ JSONObject obj = (JSONObject)para.param;
+ String json = obj.toJSONString();
+ ComA0Vo cvo = JSON.parseObject(json, ComA0Vo.class) ;
+ if(cvo == null){
+ throw new Exception("json杞珻om97Vo涓簄ull") ;
+ }
+ if(cvo.icCardNo == null){
+ throw new Exception("铏氭嫙IC鍗＄紪鍙蜂笉鑳戒负绌�") ;
+ }
+ if(cvo.moneyRemain == null){
+ throw new Exception("鍓╀綑閲戦涓嶈兘涓虹┖") ;
+ }
+ if(cvo.waterPrice == null){
+ throw new Exception("姘翠环涓嶈兘涓虹┖") ;
+ }
+ if(cvo.waterAmount == null){
+ throw new Exception("棰勭敤姘撮噺涓嶈兘涓虹┖") ;
+ }
+ if(cvo.waterAmount < 0 || cvo.waterAmount > 9999){
+ throw new Exception("棰勭敤姘撮噺鍙栧�艰寖鍥存槸0~9999m3") ;
+ }
+
+ String[] icCardNoGrp = CommonV1_0_1.dealIcCardNo(cvo.icCardNo) ;
+ if(icCardNoGrp[0] != null){
+ midRs.param = icCardNoGrp[0] ;
+ }
+
+ byte[] bs = new byte[13] ;
+ index = 0 ;
+ ByteUtil.string2BCD_LE(bs, icCardNoGrp[1], index) ;
+
+ index += 5 ;
+ Integer money = Double.valueOf(cvo.moneyRemain * 100.0D).intValue() ;
+ byte[] bTemp = ByteUtil.int2BCD_LE(money) ;
+ int bTempLen = bTemp.length ;
+ int count = 0 ;
+ for(int i = 0 ; i < bTempLen; i++){
+ bs[index++] = bTemp[i] ;
+ count ++ ;
+ if(count >= 4){
+ break ;
+ }
+ }
+ for(; count < 4; count++){
+ bs[index++] = 0 ;
+ }
+
+ Integer price = Double.valueOf(cvo.waterPrice * 100.0D).intValue() ;
+ bTemp = ByteUtil.int2BCD_LE(price) ;
+ bTempLen = bTemp.length ;
+ count = 0 ;
+ for(int i = 0 ; i < bTempLen; i++){
+ bs[index++] = bTemp[i] ;
+ count ++ ;
+ if(count >= 2){
+ break ;
+ }
+ }
+ for(; count < 2; count++){
+ bs[index++] = 0 ;
+ }
+
+
+ bTemp = ByteUtil.int2BCD_LE(cvo.waterAmount) ;
+ bTempLen = bTemp.length ;
+ count = 0 ;
+ for(int i = 0 ; i < bTempLen; i++){
+ bs[index++] = bTemp[i] ;
+ count ++ ;
+ if(count >= 2){
+ break ;
+ }
+ }
+ for(; count < 2; count++){
+ bs[index++] = 0 ;
+ }
+
+ bytes = ByteUtil.bytesMerge(bsHead, bs) ;
+
+ 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_A0_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_A0_Up.java
new file mode 100644
index 0000000..7b133e3
--- /dev/null
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_A0_Up.java
@@ -0,0 +1,72 @@
+package com.dy.common.mw.protocol.p206V1_0_0.parse;
+
+import com.dy.common.mw.protocol.*;
+import com.dy.common.mw.protocol.p206V1_0_0.*;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd99Vo;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCdA0Vo;
+import com.dy.common.util.ByteUtil;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+/**
+ * @Author liurunyu
+ * @Date 2024/06/12 9:30
+ * @Description
+ */
+@AnnotationCodeUp(ifAny={
+ CodeV1_0_1.cd_A0
+})
+@SuppressWarnings("unused")
+public class Cd_A0_Up implements CodeParse {
+
+ private static final Logger log = LogManager.getLogger(Cd_A0_Up.class);
+
+ /**
+ * 鍒嗘瀽涓婅鏁版嵁
+ */
+ @Override
+ public MidResult[] parse(Boolean isLowPower, CodeParseParams params, CodeParseCallback callback)throws Exception {
+ ParseParamsForUpV1_0_1 para = (ParseParamsForUpV1_0_1)params ;
+ int bsLen = new CommonV1_0_1().parseDataLen(para.upBuffer) ;
+ if(bsLen > 0){
+ this.doParse(para.upBuffer,
+ bsLen,
+ para.upCode,
+ para.data) ;
+ }
+ log.info("鍒嗘瀽涓婅鏁版嵁<" + CodeV1_0_1.getCodeName(para.upCode) + " RTU鍦板潃=" + para.rtuAddr + ">:\n" + para.data.toString());
+
+ MidResultFromRtu midRs = new MidResultFromRtu() ;
+ midRs.protocolName = para.protocolName ;//鍗忚鍚嶇О
+ midRs.rtuAddr = para.rtuAddr ;//Rtu鍦板潃
+ midRs.upCode = para.upCode ;//涓婅鏁版嵁涓殑鍔熻兘鐮�
+ midRs.upHex = para.upHex ;//涓婅鏁版嵁鍗佸叚杩涘埗褰㈠紡
+ midRs.upBuffer = para.upBuffer ;//涓婅鏁版嵁瀛楄妭鏁扮粍
+ midRs.data = para.data ;//瑙ｆ瀽鍚庣殑鏁版嵁
+
+ midRs.reportOrResponse_trueOrFalse = false ;//涓诲姩涓婃姤
+
+ callback.callback(midRs.reportOrResponse_trueOrFalse);
+ return new MidResult[]{midRs} ;
+ }
+ /**
+ * 鎵ц鍒嗘瀽
+ * @param bs 瀛楄妭鏁扮粍
+ * @param bsLen 瀛楄妭闀垮害锛堟�诲寘闀匡紝鍖呮嫭鍖呭ご鍜屽寘灏撅級
+ * @param dataCode 鍔熻兘鐮�
+ * @param data 鏁版嵁
+ * @throws Exception 寮傚父
+ */
+ protected void doParse(byte[] bs, int bsLen, String dataCode, Data data) throws Exception {
+ DataV1_0_1 dV1 = (DataV1_0_1)data.getSubData() ;
+ DataCdA0Vo cdData = new DataCdA0Vo() ;
+ dV1.subData = cdData ;
+ //铏氭嫙鍗″彿
+ cdData.cardNo = ByteUtil.BCD2String_LE(bs, ProtocolConstantV206V1_0_0.dataIndex, ProtocolConstantV206V1_0_0.dataIndex+4) ;
+ if(bs[ProtocolConstantV206V1_0_0.dataIndex + 5] == (byte)0xAA){
+ cdData.success = true ;
+ }else{
+ cdData.success = false ;
+ }
+ }
+}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_C0_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_C0_Up.java
index 5ef3642..98d19eb 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_C0_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_C0_Up.java
@@ -3,6 +3,7 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1_0_0.*;
import com.dy.common.mw.protocol.p206V1_0_0.parse.global.GlParse;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCdC0Vo;
import com.dy.common.util.ByteUtil;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
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 cfbc9e2..8a5f836 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
@@ -1,7 +1,7 @@
package com.dy.common.mw.protocol.p206V1_0_0.parse.global;
-import com.dy.common.mw.protocol.p206V1_0_0.DataAlarmVo;
-import com.dy.common.mw.protocol.p206V1_0_0.DataStateVo;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataAlarmVo;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataStateVo;
import com.dy.common.util.ByteUtil;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataAlarmVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataAlarmVo.java
similarity index 94%
rename from pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataAlarmVo.java
rename to pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataAlarmVo.java
index 3accdc0..c4cb401 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataAlarmVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataAlarmVo.java
@@ -1,4 +1,4 @@
-package com.dy.common.mw.protocol.p206V1_0_0;
+package com.dy.common.mw.protocol.p206V1_0_0.upVos;
import lombok.Data;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd02Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd02Vo.java
similarity index 90%
rename from pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd02Vo.java
rename to pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd02Vo.java
index edd5ccd..ff9e9ad 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd02Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd02Vo.java
@@ -1,4 +1,4 @@
-package com.dy.common.mw.protocol.p206V1_0_0;
+package com.dy.common.mw.protocol.p206V1_0_0.upVos;
import lombok.Data;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd10Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd10Vo.java
similarity index 89%
rename from pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd10Vo.java
rename to pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd10Vo.java
index 4c8c80c..7ec0cde 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd10Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd10Vo.java
@@ -1,4 +1,4 @@
-package com.dy.common.mw.protocol.p206V1_0_0;
+package com.dy.common.mw.protocol.p206V1_0_0.upVos;
import lombok.Data;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd21Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd21Vo.java
similarity index 90%
rename from pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd21Vo.java
rename to pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd21Vo.java
index a3026fa..f622f71 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd21Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd21Vo.java
@@ -1,4 +1,4 @@
-package com.dy.common.mw.protocol.p206V1_0_0;
+package com.dy.common.mw.protocol.p206V1_0_0.upVos;
import lombok.Data;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd35And65Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd35And65Vo.java
similarity index 89%
rename from pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd35And65Vo.java
rename to pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd35And65Vo.java
index b6ad865..f361a1f 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd35And65Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd35And65Vo.java
@@ -1,4 +1,4 @@
-package com.dy.common.mw.protocol.p206V1_0_0;
+package com.dy.common.mw.protocol.p206V1_0_0.upVos;
import lombok.Data;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd36Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd36Vo.java
similarity index 90%
rename from pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd36Vo.java
rename to pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd36Vo.java
index 9f5b6a5..7a557fc 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd36Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd36Vo.java
@@ -1,4 +1,4 @@
-package com.dy.common.mw.protocol.p206V1_0_0;
+package com.dy.common.mw.protocol.p206V1_0_0.upVos;
import lombok.Data;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd37And67Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd37And67Vo.java
similarity index 89%
rename from pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd37And67Vo.java
rename to pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd37And67Vo.java
index d4cd25b..01501cc 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd37And67Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd37And67Vo.java
@@ -1,4 +1,4 @@
-package com.dy.common.mw.protocol.p206V1_0_0;
+package com.dy.common.mw.protocol.p206V1_0_0.upVos;
import lombok.Data;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd38And68Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd38And68Vo.java
similarity index 90%
rename from pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd38And68Vo.java
rename to pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd38And68Vo.java
index 789b18f..5a8a9a4 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd38And68Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd38And68Vo.java
@@ -1,4 +1,4 @@
-package com.dy.common.mw.protocol.p206V1_0_0;
+package com.dy.common.mw.protocol.p206V1_0_0.upVos;
import lombok.Data;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd39And69Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd39And69Vo.java
similarity index 90%
rename from pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd39And69Vo.java
rename to pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd39And69Vo.java
index 4e13cbe..2122403 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd39And69Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd39And69Vo.java
@@ -1,4 +1,4 @@
-package com.dy.common.mw.protocol.p206V1_0_0;
+package com.dy.common.mw.protocol.p206V1_0_0.upVos;
import lombok.Data;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd3AAnd6AVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3AAnd6AVo.java
similarity index 89%
rename from pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd3AAnd6AVo.java
rename to pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3AAnd6AVo.java
index 537a2f5..1dfe3ac 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd3AAnd6AVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3AAnd6AVo.java
@@ -1,4 +1,4 @@
-package com.dy.common.mw.protocol.p206V1_0_0;
+package com.dy.common.mw.protocol.p206V1_0_0.upVos;
import lombok.Data;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd3BAnd6BVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3BAnd6BVo.java
similarity index 89%
rename from pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd3BAnd6BVo.java
rename to pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3BAnd6BVo.java
index 51edd19..4da25a5 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd3BAnd6BVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3BAnd6BVo.java
@@ -1,4 +1,4 @@
-package com.dy.common.mw.protocol.p206V1_0_0;
+package com.dy.common.mw.protocol.p206V1_0_0.upVos;
import lombok.Data;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd3CVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3CVo.java
similarity index 89%
rename from pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd3CVo.java
rename to pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3CVo.java
index 0d95119..e2da9a3 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd3CVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3CVo.java
@@ -1,4 +1,4 @@
-package com.dy.common.mw.protocol.p206V1_0_0;
+package com.dy.common.mw.protocol.p206V1_0_0.upVos;
import lombok.Data;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd3DVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3DVo.java
similarity index 89%
rename from pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd3DVo.java
rename to pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3DVo.java
index 57c47c3..2a10047 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd3DVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3DVo.java
@@ -1,4 +1,4 @@
-package com.dy.common.mw.protocol.p206V1_0_0;
+package com.dy.common.mw.protocol.p206V1_0_0.upVos;
import lombok.Data;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd66Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd66Vo.java
similarity index 90%
rename from pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd66Vo.java
rename to pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd66Vo.java
index fe60eac..275f3ef 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd66Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd66Vo.java
@@ -1,4 +1,4 @@
-package com.dy.common.mw.protocol.p206V1_0_0;
+package com.dy.common.mw.protocol.p206V1_0_0.upVos;
import lombok.Data;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd6CVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd6CVo.java
similarity index 89%
rename from pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd6CVo.java
rename to pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd6CVo.java
index 7e8bfa2..41cde9e 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd6CVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd6CVo.java
@@ -1,4 +1,4 @@
-package com.dy.common.mw.protocol.p206V1_0_0;
+package com.dy.common.mw.protocol.p206V1_0_0.upVos;
import lombok.Data;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd71Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd71Vo.java
similarity index 90%
rename from pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd71Vo.java
rename to pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd71Vo.java
index 405a121..742e112 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd71Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd71Vo.java
@@ -1,4 +1,4 @@
-package com.dy.common.mw.protocol.p206V1_0_0;
+package com.dy.common.mw.protocol.p206V1_0_0.upVos;
import lombok.Data;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd81Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd81Vo.java
similarity index 93%
rename from pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd81Vo.java
rename to pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd81Vo.java
index e7660e8..ee2f76b 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd81Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd81Vo.java
@@ -1,4 +1,4 @@
-package com.dy.common.mw.protocol.p206V1_0_0;
+package com.dy.common.mw.protocol.p206V1_0_0.upVos;
import lombok.Data;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd83CloseVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd83CloseVo.java
similarity index 96%
rename from pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd83CloseVo.java
rename to pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd83CloseVo.java
index 89c4ac0..a83db48 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd83CloseVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd83CloseVo.java
@@ -1,5 +1,6 @@
-package com.dy.common.mw.protocol.p206V1_0_0;
+package com.dy.common.mw.protocol.p206V1_0_0.upVos;
+import com.dy.common.mw.protocol.p206V1_0_0.CommonV1_0_1;
import lombok.Data;
@Data
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd83OpenVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd83OpenVo.java
similarity index 94%
rename from pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd83OpenVo.java
rename to pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd83OpenVo.java
index ef094d6..93e0114 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd83OpenVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd83OpenVo.java
@@ -1,6 +1,7 @@
-package com.dy.common.mw.protocol.p206V1_0_0;
+package com.dy.common.mw.protocol.p206V1_0_0.upVos;
+import com.dy.common.mw.protocol.p206V1_0_0.CommonV1_0_1;
import lombok.Data;
@Data
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd84Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd84Vo.java
similarity index 92%
rename from pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd84Vo.java
rename to pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd84Vo.java
index 49d0b67..eadff1c 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd84Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd84Vo.java
@@ -1,5 +1,6 @@
-package com.dy.common.mw.protocol.p206V1_0_0;
+package com.dy.common.mw.protocol.p206V1_0_0.upVos;
+import com.dy.common.mw.protocol.p206V1_0_0.CommonV1_0_1;
import lombok.Data;
/**
@@ -24,7 +25,7 @@
StringBuilder sb = new StringBuilder() ;
sb.append(" 缁堢寮�闃�宸ヤ綔鎶�:\n");
sb.append(" 寮�闃�绫诲瀷锛�");
- sb.append(opType==null?"鏈煡":CommonV1_0_1.openCloseValveType(opType));
+ sb.append(opType==null?"鏈煡": CommonV1_0_1.openCloseValveType(opType));
sb.append("\n");
sb.append(" IC鍗＄被鍨嬶細");
sb.append(cardType==null?"鏈煡":CommonV1_0_1.icCardType(cardType)) ;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd92Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd92Vo.java
similarity index 89%
rename from pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd92Vo.java
rename to pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd92Vo.java
index fb2ee24..f0e1755 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd92Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd92Vo.java
@@ -1,4 +1,4 @@
-package com.dy.common.mw.protocol.p206V1_0_0;
+package com.dy.common.mw.protocol.p206V1_0_0.upVos;
import lombok.Data;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd93Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd93Vo.java
similarity index 89%
rename from pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd93Vo.java
rename to pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd93Vo.java
index 1365ee6..105b845 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd93Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd93Vo.java
@@ -1,4 +1,4 @@
-package com.dy.common.mw.protocol.p206V1_0_0;
+package com.dy.common.mw.protocol.p206V1_0_0.upVos;
import lombok.Data;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd97Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd97Vo.java
similarity index 91%
rename from pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd97Vo.java
rename to pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd97Vo.java
index 68d36a0..fcc3ad6 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd97Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd97Vo.java
@@ -1,4 +1,4 @@
-package com.dy.common.mw.protocol.p206V1_0_0;
+package com.dy.common.mw.protocol.p206V1_0_0.upVos;
import lombok.Data;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd98Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd98Vo.java
similarity index 91%
rename from pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd98Vo.java
rename to pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd98Vo.java
index 2898819..78183eb 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd98Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd98Vo.java
@@ -1,4 +1,4 @@
-package com.dy.common.mw.protocol.p206V1_0_0;
+package com.dy.common.mw.protocol.p206V1_0_0.upVos;
import lombok.Data;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd97Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd99Vo.java
similarity index 79%
copy from pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd97Vo.java
copy to pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd99Vo.java
index 68d36a0..67ebed5 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd97Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd99Vo.java
@@ -1,4 +1,4 @@
-package com.dy.common.mw.protocol.p206V1_0_0;
+package com.dy.common.mw.protocol.p206V1_0_0.upVos;
import lombok.Data;
@@ -9,13 +9,13 @@
* @Description
*/
@Data
-public class DataCd97Vo {
+public class DataCd99Vo {
public String cardNo ;//铏氭嫙鍗″彿
public boolean success;
public String toString(){
StringBuilder sb = new StringBuilder() ;
- sb.append(" APP杩滅▼寮�闃�搴旂瓟:\n");
+ sb.append(" 瀹氭椂鍏抽榾寮�闃�搴旂瓟:\n");
sb.append(" 铏氭嫙鍗″彿锛�");
sb.append(cardNo);
sb.append("\n");
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd97Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCdA0Vo.java
similarity index 79%
copy from pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd97Vo.java
copy to pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCdA0Vo.java
index 68d36a0..058b9f7 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd97Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCdA0Vo.java
@@ -1,4 +1,4 @@
-package com.dy.common.mw.protocol.p206V1_0_0;
+package com.dy.common.mw.protocol.p206V1_0_0.upVos;
import lombok.Data;
@@ -9,13 +9,13 @@
* @Description
*/
@Data
-public class DataCd97Vo {
+public class DataCdA0Vo {
public String cardNo ;//铏氭嫙鍗″彿
public boolean success;
public String toString(){
StringBuilder sb = new StringBuilder() ;
- sb.append(" APP杩滅▼寮�闃�搴旂瓟:\n");
+ sb.append(" 瀹氶噺鍏抽榾寮�闃�搴旂瓟:\n");
sb.append(" 铏氭嫙鍗″彿锛�");
sb.append(cardNo);
sb.append("\n");
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCdC0Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCdC0Vo.java
similarity index 97%
rename from pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCdC0Vo.java
rename to pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCdC0Vo.java
index 7baa02b..4d7c8c7 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCdC0Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCdC0Vo.java
@@ -1,4 +1,4 @@
-package com.dy.common.mw.protocol.p206V1_0_0;
+package com.dy.common.mw.protocol.p206V1_0_0.upVos;
import lombok.Data;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataStateVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataStateVo.java
similarity index 93%
rename from pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataStateVo.java
rename to pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataStateVo.java
index 45a8386..33bf869 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataStateVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataStateVo.java
@@ -1,4 +1,4 @@
-package com.dy.common.mw.protocol.p206V1_0_0;
+package com.dy.common.mw.protocol.p206V1_0_0.upVos;
import lombok.Data;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/HttpUtils.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/HttpUtils.java
deleted file mode 100644
index 05cee30..0000000
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/HttpUtils.java
+++ /dev/null
@@ -1,342 +0,0 @@
-package com.dy.common.util;
-
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.security.KeyManagementException;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.http.HttpResponse;
-import org.apache.http.NameValuePair;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.config.AuthSchemes;
-import org.apache.http.client.config.CookieSpecs;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.client.methods.HttpDelete;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.methods.HttpPut;
-import org.apache.http.config.Registry;
-import org.apache.http.config.RegistryBuilder;
-import org.apache.http.conn.socket.ConnectionSocketFactory;
-import org.apache.http.conn.socket.PlainConnectionSocketFactory;
-import org.apache.http.conn.ssl.NoopHostnameVerifier;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.entity.ByteArrayEntity;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
-import org.apache.http.message.BasicNameValuePair;
-import org.apache.http.conn.ClientConnectionManager;
-import org.apache.http.conn.scheme.Scheme;
-import org.apache.http.conn.scheme.SchemeRegistry;
-import org.apache.http.conn.ssl.SSLSocketFactory;
-
-public class HttpUtils {
- /**
- * get
- *
- * @param host 鏈嶅姟绔疷RI
- * @param path 璇锋眰璺緞
- * @param headers 璇锋眰澶�
- * @param params 璇锋眰鍙傛暟
- * @return HttpResponse鍝嶅簲
- * @throws Exception 寮傚父
- */
- public static HttpResponse doGet(String host, String path, Map<String, String> headers,
- Map<String, String> params) throws Exception{
- HttpClient httpClient = wrapClient(host);
-
- HttpGet request = new HttpGet(buildUrl(host, path, params));
- if(headers != null){
- for (Map.Entry<String, String> e : headers.entrySet()) {
- request.addHeader(e.getKey(), e.getValue());
- }
- }
-
- return httpClient.execute(request);
- }
-
- /**
- * post form
- *
- * @param host 鏈嶅姟绔疷RI
- * @param path 璇锋眰璺緞
- * @param headers 璇锋眰澶�
- * @param params 璇锋眰鍙傛暟
- * @param bodies 璇锋眰浣�
- * @return HttpResponse鍝嶅簲
- * @throws Exception 寮傚父
- */
- public static HttpResponse doPost(String host, String path, Map<String, String> headers,
- Map<String, String> params, Map<String, String> bodies) throws Exception {
- HttpClient httpClient = wrapClient(host);
-
- HttpPost request = new HttpPost(buildUrl(host, path, params));
- for (Map.Entry<String, String> e : headers.entrySet()) {
- request.addHeader(e.getKey(), e.getValue());
- }
-
- if (bodies != null) {
- List<NameValuePair> nameValuePairList = new ArrayList<>();
-
- for (String key : bodies.keySet()) {
- nameValuePairList.add(new BasicNameValuePair(key, bodies.get(key)));
- }
- UrlEncodedFormEntity formEntity = new UrlEncodedFormEntity(nameValuePairList, "utf-8");
- formEntity.setContentType("application/x-www-form-urlencoded; charset=UTF-8");
- request.setEntity(formEntity);
- }
-
- return httpClient.execute(request);
- }
-
- /**
- * Post String
- *
- * @param host 鏈嶅姟绔疷RI
- * @param path 璇锋眰璺緞
- * @param headers 璇锋眰澶�
- * @param params 璇锋眰鍙傛暟
- * @param body 璇锋眰浣�
- * @return HttpResponse鍝嶅簲
- * @throws Exception 寮傚父
- */
- public static HttpResponse doPost(String host, String path, Map<String, String> headers,
- Map<String, String> params, String body) throws Exception {
- HttpClient httpClient = wrapClient(host);
-
- HttpPost request = new HttpPost(buildUrl(host, path, params));
- for (Map.Entry<String, String> e : headers.entrySet()) {
- request.addHeader(e.getKey(), e.getValue());
- }
-
- if (StringUtils.isNotBlank(body)) {
- request.setEntity(new StringEntity(body, "utf-8"));
- }
-
- return httpClient.execute(request);
- }
-
- /**
- * Post stream
- *
- * @param host 鏈嶅姟绔疷RI
- * @param path 璇锋眰璺緞
- * @param headers 璇锋眰澶�
- * @param params 璇锋眰鍙傛暟
- * @param body 璇锋眰浣�
- * @return HttpResponse鍝嶅簲
- * @throws Exception 寮傚父
- */
- public static HttpResponse doPost(String host, String path, Map<String, String> headers,
- Map<String, String> params, byte[] body) throws Exception {
- HttpClient httpClient = wrapClient(host);
-
- HttpPost request = new HttpPost(buildUrl(host, path, params));
- if(headers != null){
- for (Map.Entry<String, String> e : headers.entrySet()) {
- request.addHeader(e.getKey(), e.getValue());
- }
- }
-
- if (body != null) {
- request.setEntity(new ByteArrayEntity(body));
- }
-
- return httpClient.execute(request);
- }
-
- /**
- * Put String
- *
- * @param host 鏈嶅姟绔疷RI
- * @param path 璇锋眰璺緞
- * @param headers 璇锋眰澶�
- * @param params 璇锋眰鍙傛暟
- * @param body 璇锋眰浣�
- * @return HttpResponse鍝嶅簲
- * @throws Exception 寮傚父
- */
- public static HttpResponse doPut(String host, String path, Map<String, String> headers,
- Map<String, String> params, String body) throws Exception {
- HttpClient httpClient = wrapClient(host);
-
- HttpPut request = new HttpPut(buildUrl(host, path, params));
- for (Map.Entry<String, String> e : headers.entrySet()) {
- request.addHeader(e.getKey(), e.getValue());
- }
-
- if (StringUtils.isNotBlank(body)) {
- request.setEntity(new StringEntity(body, "utf-8"));
- }
-
- return httpClient.execute(request);
- }
-
- /**
- * Put stream
- *
- * @param host 鏈嶅姟绔疷RI
- * @param path 璇锋眰璺緞
- * @param headers 璇锋眰澶�
- * @param params 璇锋眰鍙傛暟
- * @param body 璇锋眰浣�
- * @return HttpResponse鍝嶅簲
- * @throws Exception 寮傚父
- */
- public static HttpResponse doPut(String host, String path, Map<String, String> headers,
- Map<String, String> params, byte[] body) throws Exception {
- HttpClient httpClient = wrapClient(host);
-
- HttpPut request = new HttpPut(buildUrl(host, path, params));
- for (Map.Entry<String, String> e : headers.entrySet()) {
- request.addHeader(e.getKey(), e.getValue());
- }
-
- if (body != null) {
- request.setEntity(new ByteArrayEntity(body));
- }
-
- return httpClient.execute(request);
- }
-
- /**
- * Delete
- *
- * @param host 鏈嶅姟绔疷RI
- * @param path 璇锋眰璺緞
- * @param headers 璇锋眰澶�
- * @param params 璇锋眰鍙傛暟
- * @return HttpResponse鍝嶅簲
- * @throws Exception 寮傚父
- */
- public static HttpResponse doDelete(String host, String path, Map<String, String> headers,
- Map<String, String> params) throws Exception {
- HttpClient httpClient = wrapClient(host);
-
- HttpDelete request = new HttpDelete(buildUrl(host, path, params));
- for (Map.Entry<String, String> e : headers.entrySet()) {
- request.addHeader(e.getKey(), e.getValue());
- }
-
- return httpClient.execute(request);
- }
-
- private static String buildUrl(String host, String path, Map<String, String> params) {
- StringBuilder sbUrl = new StringBuilder();
- sbUrl.append(host);
- if (!StringUtils.isBlank(path)) {
- sbUrl.append(path);
- }
- if (null != params) {
- StringBuilder sbQuery = new StringBuilder();
- for (Map.Entry<String, String> query : params.entrySet()) {
- if (0 < sbQuery.length()) {
- sbQuery.append("&");
- }
- if (StringUtils.isBlank(query.getKey()) && !StringUtils.isBlank(query.getValue())) {
- sbQuery.append(query.getValue());
- }
- if (!StringUtils.isBlank(query.getKey())) {
- sbQuery.append(query.getKey());
- if (!StringUtils.isBlank(query.getValue())) {
- sbQuery.append("=");
- sbQuery.append(URLEncoder.encode(query.getValue(), StandardCharsets.UTF_8));
- }
- }
- }
- if (0 < sbQuery.length()) {
- sbUrl.append("?").append(sbQuery);
- }
- }
-
- return sbUrl.toString();
- }
-
- private static HttpClient wrapClient(String host) {
- if (host.startsWith("https://")) {
- return sslClient();
- }else{
- return HttpClients.createDefault();
- }
- }
-//
-// private static void sslClient(HttpClient httpClient) {
-// try {
-// SSLContext ctx = SSLContext.getInstance("TLS");
-// X509TrustManager tm = new X509TrustManager() {
-// public X509Certificate[] getAcceptedIssuers() {
-// return null;
-// }
-//
-// public void checkClientTrusted(X509Certificate[] xcs, String str) {
-//
-// }
-//
-// public void checkServerTrusted(X509Certificate[] xcs, String str) {
-//
-// }
-// };
-// ctx.init(null, new TrustManager[] { tm }, null);
-// SSLSocketFactory ssf = new SSLSocketFactory(ctx);
-// ssf.setHostnameVerifier(SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
-// ClientConnectionManager ccm = httpClient.getConnectionManager();
-// SchemeRegistry registry = ccm.getSchemeRegistry();
-// registry.register(new Scheme("https", 443, ssf));
-// } catch (KeyManagementException ex) {
-// throw new RuntimeException(ex);
-// } catch (NoSuchAlgorithmException ex) {
-// throw new RuntimeException(ex);
-// }
-// }
-
- /**
- * 鍦ㄨ皟鐢⊿SL涔嬪墠闇�瑕侀噸鍐欓獙璇佹柟娉曪紝鍙栨秷妫�娴婼SL
- * 鍒涘缓ConnectionManager锛屾坊鍔燙onnection閰嶇疆淇℃伅
- * @return HttpClient 鏀寔https
- */
- private static HttpClient sslClient() {
- try {
- // 鍦ㄨ皟鐢⊿SL涔嬪墠闇�瑕侀噸鍐欓獙璇佹柟娉曪紝鍙栨秷妫�娴婼SL
- X509TrustManager trustManager = new X509TrustManager() {
- @Override public X509Certificate[] getAcceptedIssuers() {
- return null;
- }
- @Override public void checkClientTrusted(X509Certificate[] xcs, String str) {}
- @Override public void checkServerTrusted(X509Certificate[] xcs, String str) {}
- };
- SSLContext ctx = SSLContext.getInstance(SSLConnectionSocketFactory.TLS);
- ctx.init(null, new TrustManager[] { trustManager }, null);
- SSLConnectionSocketFactory socketFactory = new SSLConnectionSocketFactory(ctx, NoopHostnameVerifier.INSTANCE);
- // 鍒涘缓Registry
- RequestConfig requestConfig = RequestConfig.custom().setCookieSpec(CookieSpecs.STANDARD_STRICT)
- .setExpectContinueEnabled(Boolean.TRUE).setTargetPreferredAuthSchemes(Arrays.asList(AuthSchemes.NTLM, AuthSchemes.DIGEST))
- .setProxyPreferredAuthSchemes(Arrays.asList(AuthSchemes.BASIC)).build();
- Registry<ConnectionSocketFactory> socketFactoryRegistry = RegistryBuilder.<ConnectionSocketFactory>create()
- .register("http", PlainConnectionSocketFactory.INSTANCE)
- .register("https",socketFactory).build();
- // 鍒涘缓ConnectionManager锛屾坊鍔燙onnection閰嶇疆淇℃伅
- PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager(socketFactoryRegistry);
- CloseableHttpClient closeableHttpClient = HttpClients.custom().setConnectionManager(connectionManager)
- .setDefaultRequestConfig(requestConfig).build();
- return closeableHttpClient;
- } catch (KeyManagementException ex) {
- throw new RuntimeException(ex);
- } catch (NoSuchAlgorithmException ex) {
- throw new RuntimeException(ex);
- }
- }
-
-}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoDemo/DemoAddressMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoDemo/DemoAddressMapper.java
deleted file mode 100644
index 79c5846..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoDemo/DemoAddressMapper.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.dy.pipIrrGlobal.daoDemo;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dy.pipIrrGlobal.pojoBa.BaUser;
-import com.dy.pipIrrGlobal.pojoDemo.DemoAddress;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-@Mapper
-public interface DemoAddressMapper extends BaseMapper<DemoAddress> {
-
- DemoAddress selectByUserId(@Param("userId") Long userId) ;
-}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoDemo/DemoAuthMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoDemo/DemoAuthMapper.java
deleted file mode 100644
index 0934a9b..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoDemo/DemoAuthMapper.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.dy.pipIrrGlobal.daoDemo;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dy.pipIrrGlobal.pojoDemo.DemoAddress;
-import com.dy.pipIrrGlobal.pojoDemo.DemoAuth;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface DemoAuthMapper extends BaseMapper<DemoAuth> {
- List<DemoAuth> selectAll() ;
-}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoDemo/DemoMpMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoDemo/DemoMpMapper.java
deleted file mode 100644
index c7bebbe..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoDemo/DemoMpMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.dy.pipIrrGlobal.daoDemo;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dy.pipIrrGlobal.pojoDemo.DemoMp;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 婕旂ず娌℃湁DemoMpMapper.xml瀹炵幇鏂瑰紡
- */
-@Mapper
-public interface DemoMpMapper extends BaseMapper<DemoMp> {
-}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoDemo/DemoRoleMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoDemo/DemoRoleMapper.java
deleted file mode 100644
index c5f9b2c..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoDemo/DemoRoleMapper.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.dy.pipIrrGlobal.daoDemo;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dy.pipIrrGlobal.pojoDemo.DemoAuth;
-import com.dy.pipIrrGlobal.pojoDemo.DemoRole;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface DemoRoleMapper extends BaseMapper<DemoRole> {
- /**
- * delete by primary key
- *
- * @param id primaryKey
- * @return deleteCount
- */
- int deleteByPrimaryKey(Long id);
-
- /**
- * insert record to table
- *
- * @param record the record
- * @return insert count
- */
- int putin(DemoRole record);
-
- /**
- * insert record to table selective
- *
- * @param record the record
- * @return insert count
- */
- int insertSelective(DemoRole record);
-
- /**
- * select by primary key
- *
- * @param id primary key
- * @return object by primary key
- */
- DemoRole selectByPrimaryKey(Long id);
-
- /**
- * update record selective
- *
- * @param record the updated record
- * @return update count
- */
- int updateByPrimaryKeySelective(DemoRole record);
-
- /**
- * update record
- *
- * @param record the updated record
- * @return update count
- */
- int updateByPrimaryKey(DemoRole record);
-
- List<DemoRole> selectAll();
-}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoDemo/DemoTestMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoDemo/DemoTestMapper.java
deleted file mode 100644
index 8fb2e7f..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoDemo/DemoTestMapper.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.dy.pipIrrGlobal.daoDemo;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dy.pipIrrGlobal.pojoDemo.DemoTest;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface DemoTestMapper extends BaseMapper<DemoTest> {
- Integer queryCount() ;
-}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoDemo/DemoUserMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoDemo/DemoUserMapper.java
deleted file mode 100644
index c8d0e74..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoDemo/DemoUserMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.dy.pipIrrGlobal.daoDemo;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dy.pipIrrGlobal.pojoDemo.DemoUser;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-@Mapper
-public interface DemoUserMapper extends BaseMapper<DemoUser> {
-
- int putin(DemoUser user) ;
-
- DemoUser selectById1(@Param("id") Long id);
-
- DemoUser selectById2(@Param("id") Long id);
-
- DemoUser selectById3(@Param("id") Long id);
-
- DemoUser selectById4(@Param("id") Long id);
-
- DemoUser selectById5(@Param("id") Long id);
-
- List<DemoUser> selectByRoleId(@Param("roleId") Long roleId) ;
-}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeRechargeMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeRechargeMapper.java
index dce9429..ccd3b59 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeRechargeMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeRechargeMapper.java
@@ -52,4 +52,10 @@
//Integer deleteByCardNum(@Param("cardNum") String cardNum);
Integer deleteByCardId(@Param("cardId") Long cardId);
+ /**
+ *鏍规嵁姘村崱id鑾峰彇鏈�杩戜竴鏉″厖鍊艰褰�
+ * @param cardId
+ * @return
+ */
+ SeRecharge selectByCardId(@Param("cardId") Long cardId);
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeVirtualCardMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeVirtualCardMapper.java
index 0efdb8a..5680485 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeVirtualCardMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeVirtualCardMapper.java
@@ -51,6 +51,13 @@
VoVirtualCard getVcById(@Param("vcId") Long vcId);
/**
+ * 鏍规嵁铏氭嫙鍗＄紪鍙疯幏鍙栬櫄鎷熷崱
+ * @param vcNum
+ * @return
+ */
+ SeVirtualCard getVcCardByNum(@Param("vcNum") String vcNum);
+
+ /**
* 鏍规嵁铏氭嫙鍗＄紪鍙疯幏鍙栬櫄鎷熷崱ID
* @param vcNum
* @return
@@ -63,4 +70,11 @@
* @return
*/
String getVcCardNumOfMax(@Param("areaCode") String areaCode);
+
+ /**
+ * 涓�涓彇姘村彛涓婂崰鐢ㄧ殑铏氭嫙鍗＄姸鎬佸彉鎴愪笉鍗犵敤
+ * @param intakeId
+ * @return
+ */
+ void updateVcCardNoUseStateByIntakeId(@Param("intakeId")Long intakeId) ;
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoAddress.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoAddress.java
deleted file mode 100644
index 6f938e4..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoAddress.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.dy.pipIrrGlobal.pojoDemo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.dy.common.po.BaseEntity;
-import lombok.*;
-
-@TableName(value="demo_address", autoResultMap = true)
-@Data
-@Builder
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
-public class DemoAddress implements BaseEntity {
-
- public static final long serialVersionUID = 987654322L;
-
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- @TableId(type = IdType.INPUT)
- public Long id ;
-
- public String name ;
-
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- public Long userId ;
-
-
-}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoAuth.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoAuth.java
deleted file mode 100644
index 3448bf4..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoAuth.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.dy.pipIrrGlobal.pojoDemo;
-
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.dy.common.po.BaseEntity;
-import lombok.*;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-@TableName(value="demo_auth", autoResultMap = true)
-@Data
-@Builder
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
-public class DemoAuth implements BaseEntity {
-
- public static final long serialVersionUID = 2023112658742315L;
-
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- @TableId(type = IdType.INPUT)
- public Long id;
- /**
- * 鏉冮檺缂栧彿
- */
- public Integer num;
- /**
- * 鏉冮檺鍚嶇О
- */
- public String name;
- /**
- * 鏉冮檺绫诲埆
- */
- public String type;
-
- @TableField(exist = false)
- public List<DemoRole> roleList ;
-
- @JSONField(format="yyyy-MM-dd HH:mm:ss")
- @TableField(exist = false)
- public Date date ;
-
-}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoMp.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoMp.java
deleted file mode 100644
index b0818e7..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoMp.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.dy.pipIrrGlobal.pojoDemo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.dy.common.po.BaseEntity;
-import lombok.*;
-
-import java.time.LocalDateTime;
-
-@TableName(value="demo_mp", autoResultMap = true)
-@Data
-@Builder
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
-public class DemoMp implements BaseEntity {
- public static final long serialVersionUID = 202311071534001L;
-
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- @TableId(type = IdType.INPUT)
- public Long id ;
-
- public String name ;
-
- public Integer age ;
-
- public LocalDateTime dt ;
-
-}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoRole.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoRole.java
deleted file mode 100644
index 8268249..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoRole.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.dy.pipIrrGlobal.pojoDemo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.*;
-
-import java.util.List;
-
-@TableName(value="demo_role", autoResultMap = true)
-@Data
-@Builder
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
-public class DemoRole {
- public static final long serialVersionUID = 202310311722001L;
- private Long id;
-
- private String name;
-
- private Byte deleted;
-
- @TableField(exist = false)
- private List<DemoUser> userList;
-
-}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoRoleAuth.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoRoleAuth.java
deleted file mode 100644
index 4448222..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoRoleAuth.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.dy.pipIrrGlobal.pojoDemo;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.dy.common.po.BaseEntity;
-import lombok.*;
-
-import java.io.Serializable;
-
-@TableName(value="demo_role_auth", autoResultMap = true)
-@Data
-@Builder
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
-public class DemoRoleAuth implements BaseEntity {
-
- public static final long serialVersionUID = 987654323L;
-
- @TableId(value = "roleId", type = IdType.INPUT)
- public Long roleId ;
-
- @TableId(value = "authId", type = IdType.INPUT)
- public Long authId ;
-
-}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoTest.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoTest.java
deleted file mode 100644
index d22672e..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.dy.pipIrrGlobal.pojoDemo;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.dy.common.po.BaseEntity;
-import lombok.*;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@TableName(value="demo_test", autoResultMap = true)
-@Data
-@Builder
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
-public class DemoTest implements BaseEntity {
-
- public static final long serialVersionUID = 202310101010001L;
-
- @TableId(value = "id", type = IdType.INPUT)
- public Long id ;
-
- @TableField(value = "age")
- public Integer age ;
-
- @TableField(value = "name")
- public String name ;
-
- @TableField(value = "nick_name")
- public String nickName ;
-
- @TableField(value = "phone")
- public String phone ;
-
- @TableField(value = "create_dt")
- public Date createDt ;
-
- @TableField(exist = false)
- public DemoTestAttr attr ;
-
-}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoTestAttr.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoTestAttr.java
deleted file mode 100644
index f41f0c2..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoTestAttr.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.dy.pipIrrGlobal.pojoDemo;
-
-import com.dy.common.po.BaseEntity;
-import lombok.*;
-
-//鏃犲搴旀暟鎹簱琛�
-//@TableName(value="demo_test_attr", autoResultMap = true)
-@Data
-@Builder
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
-public class DemoTestAttr implements BaseEntity {
- private Long id;
- private String name;
-}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoUser.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoUser.java
deleted file mode 100644
index 83860ea..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoUser.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.dy.pipIrrGlobal.pojoDemo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.dy.common.mybatis.envm.Deleted;
-import com.dy.common.mybatis.envm.Disabled;
-import com.dy.common.po.BaseEntity;
-import lombok.*;
-
-@TableName(value="demo_user", autoResultMap = true)
-@Data
-@Builder
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
-public class DemoUser implements BaseEntity {
-
- public static final long serialVersionUID = 987654321L;
-
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- @TableId(type = IdType.INPUT)
- public Long id ;
-
- public String name ;
-
- public String password ;
-
- public Disabled disabled ;
-
- public Deleted deleted ;
-
- @TableField(exist = false)
- public DemoAddress address ;
-
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- public Long roleId ;
-
-
-}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrController.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrController.java
index 0000ebb..a16b166 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrController.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrController.java
@@ -55,7 +55,6 @@
*/
@Schema(description = "鎺у埗鍣ㄥ湴鍧�", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "鎺у埗鍣ㄥ湴鍧�涓嶈兘涓虹┖")
- @Length(message = "鎺у埗鍣ㄥ湴鍧�涓嶅ぇ浜巤max}瀛�",max = 11)
private String rtuAddr;
/**
@@ -63,7 +62,6 @@
*/
@Schema(description = "閫氳鍗忚", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "閫氳鍗忚涓嶈兘涓虹┖")
- @Length(message = "閫氳鍗忚涓嶅ぇ浜巤max}瀛�",max = 25)
private String protocol;
/**
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrControllerTramp.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrControllerTramp.java
index b133303..22a5e73 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrControllerTramp.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrControllerTramp.java
@@ -46,7 +46,6 @@
*/
@Schema(description = "鎺у埗鍣ㄥ湴鍧�", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "鎺у埗鍣ㄥ湴鍧�涓嶈兘涓虹┖")
- @Length(message = "鎺у埗鍣ㄥ湴鍧�蹇呴』{max}浣�",min = 11, max = 11)
public String rtuAddr;
/**
@@ -54,7 +53,6 @@
*/
@Schema(description = "閫氳鍗忚", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "閫氳鍗忚涓嶈兘涓虹┖")
- @Length(message = "閫氳鍗忚涓嶅ぇ浜巤max}瀛�",max = 25)
public String protocol;
/**
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmAlarmStateHistory.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmAlarmStateHistory.java
index 71d78d5..1ec2a27 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmAlarmStateHistory.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmAlarmStateHistory.java
@@ -130,4 +130,14 @@
*/
public Byte stateIcEnable;
+ /**
+ * 鐢垫睜鐢靛帇(1锛氭姤璀︼紝0锛氭甯�)
+ */
+ public Byte alarmBatteryVolt;
+
+ /**
+ * 闃�闂ㄦ姤璀�(1锛氭姤璀︼紝0锛氭甯�)
+ */
+ public Byte alarmValve;
+
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmAlarmStateLast.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmAlarmStateLast.java
index ee87103..6a5a21d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmAlarmStateLast.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmAlarmStateLast.java
@@ -130,4 +130,14 @@
*/
public Byte stateIcEnable;
+ /**
+ * 鐢垫睜鐢靛帇(1锛氭姤璀︼紝0锛氭甯�)
+ */
+ public Byte alarmBatteryVolt;
+
+ /**
+ * 闃�闂ㄦ姤璀�(1锛氭姤璀︼紝0锛氭甯�)
+ */
+ public Byte alarmValve;
+
}
\ No newline at end of file
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 8950a0f..96d29d6 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
@@ -66,7 +66,7 @@
/**
* 寮�闃�鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿
*/
- @Schema(description = "鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Schema(description = "寮�闃�鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
public Date opDt;
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeVirtualCard.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeVirtualCard.java
index 5bb4a02..bb3b69b 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeVirtualCard.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeVirtualCard.java
@@ -89,4 +89,10 @@
@Schema(description = "鍒涘缓鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Date createTime;
+ /**
+ * 鍙栨按鍙D(铏氭嫙鍗′娇鐢ㄦ椂鎵�搴旂敤浜庣殑鍙栨按鍙D)
+ */
+ @Schema(description = "鍙栨按鍙D", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ private Long intakeId;
+
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestConflict.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestConflict.java
deleted file mode 100644
index c672194..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestConflict.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.dy.pipIrrGlobal.test;
-
-public class TestConflict {
- public void test1(){
- System.out.println("test1");
- }
- public void test2(){
- System.out.println("test2");
- }
- public void test3(){
- System.out.println("test31");
- System.out.println("test32");
- System.out.println("test33");
- System.out.println("test34");
- System.out.println("test33");
- }
-}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo0.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo0.java
deleted file mode 100644
index 8468fe1..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo0.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.dy.pipIrrGlobal.test;
-
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.dy.common.po.BaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
-import java.util.Date;
-
-/**
- * 娴嬭瘯琛�
- */
-@TableName(value="test0", autoResultMap = true)
-@Data
-@Builder
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
-@Schema(name = "RTU娴嬭瘯涓婃姤鏁版嵁0")
-public class TestPo0 implements BaseEntity {
-
- public static final long serialVersionUID = 202311141539001L;
-
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- @TableId(type = IdType.INPUT)
- @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Long id ;
-
- @Schema(description = "rtu鍦板潃", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public String rtuAddr ;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", locale = "zh", timezone = "GMT+8")
- @Schema(description = "涓婃姤鏁版嵁鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Date dt ;
-
- @Schema(description = "涓婃姤鏁版嵁鍐呭锛圚EX锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public String content ;
-
-}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo0Mapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo0Mapper.java
deleted file mode 100644
index 7863a5b..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo0Mapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.dy.pipIrrGlobal.test;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface TestPo0Mapper extends BaseMapper<TestPo0> {
-
- /**
- * insert record to table
- * @param po the record
- * @return insert count
- */
- int putin(TestPo0 po);
-
-
-}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo1.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo1.java
deleted file mode 100644
index 6c0928a..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo1.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.dy.pipIrrGlobal.test;
-
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.dy.common.po.BaseEntity;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * 娴嬭瘯琛�
- */
-@TableName(value="test1", autoResultMap = true)
-@Data
-@Builder
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
-@Schema(name = "RTU娴嬭瘯涓婃姤鏁版嵁1")
-public class TestPo1 implements BaseEntity {
-
- public static final long serialVersionUID = 202311141539001L;
-
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- @TableId(type = IdType.INPUT)
- @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Long id ;
-
- @Schema(description = "rtu鍦板潃", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public String rtuAddr ;
-
- @Schema(description = "涓婃姤鏁版嵁鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Date dt ;
-
- @Schema(description = "涓婃姤鏁版嵁鍐呭锛圚EX锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public String content ;
-
-}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo1Mapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo1Mapper.java
deleted file mode 100644
index 8b552cb..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo1Mapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.dy.pipIrrGlobal.test;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface TestPo1Mapper extends BaseMapper<TestPo1> {
-
- /**
- * insert record to table
- * @param po the record
- * @return insert count
- */
- int putin(TestPo1 po);
-
-
-}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo2.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo2.java
deleted file mode 100644
index 8eb7258..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo2.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.dy.pipIrrGlobal.test;
-
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.dy.common.po.BaseEntity;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * 娴嬭瘯琛�
- */
-@TableName(value="test2", autoResultMap = true)
-@Data
-@Builder
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
-@Schema(name = "RTU娴嬭瘯涓婃姤鏁版嵁2")
-public class TestPo2 implements BaseEntity {
-
- public static final long serialVersionUID = 202311141539001L;
-
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- @TableId(type = IdType.INPUT)
- @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Long id ;
-
- @Schema(description = "rtu鍦板潃", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public String rtuAddr ;
-
- @Schema(description = "涓婃姤鏁版嵁鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Date dt ;
-
- @Schema(description = "涓婃姤鏁版嵁鍐呭锛圚EX锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public String content ;
-
-}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo2Mapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo2Mapper.java
deleted file mode 100644
index 167a093..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo2Mapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.dy.pipIrrGlobal.test;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface TestPo2Mapper extends BaseMapper<TestPo2> {
-
- /**
- * insert record to table
- * @param po the record
- * @return insert count
- */
- int putin(TestPo2 po);
-
-
-}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo3.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo3.java
deleted file mode 100644
index 38312d8..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo3.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.dy.pipIrrGlobal.test;
-
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.dy.common.po.BaseEntity;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * 娴嬭瘯琛�
- */
-@TableName(value="test3", autoResultMap = true)
-@Data
-@Builder
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
-@Schema(name = "RTU娴嬭瘯涓婃姤鏁版嵁3")
-public class TestPo3 implements BaseEntity {
-
- public static final long serialVersionUID = 202311141539001L;
-
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- @TableId(type = IdType.INPUT)
- @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Long id ;
-
- @Schema(description = "rtu鍦板潃", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public String rtuAddr ;
-
- @Schema(description = "涓婃姤鏁版嵁鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Date dt ;
-
- @Schema(description = "涓婃姤鏁版嵁鍐呭锛圚EX锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public String content ;
-
-}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo3Mapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo3Mapper.java
deleted file mode 100644
index fed9dca..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo3Mapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.dy.pipIrrGlobal.test;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface TestPo3Mapper extends BaseMapper<TestPo3> {
-
- /**
- * insert record to table
- * @param po the record
- * @return insert count
- */
- int putin(TestPo3 po);
-
-
-}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo4.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo4.java
deleted file mode 100644
index 8430bfc..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo4.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.dy.pipIrrGlobal.test;
-
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.dy.common.po.BaseEntity;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * 娴嬭瘯琛�
- */
-@TableName(value="test4", autoResultMap = true)
-@Data
-@Builder
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
-@Schema(name = "RTU娴嬭瘯涓婃姤鏁版嵁4")
-public class TestPo4 implements BaseEntity {
-
- public static final long serialVersionUID = 202311141539001L;
-
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- @TableId(type = IdType.INPUT)
- @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Long id ;
-
- @Schema(description = "rtu鍦板潃", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public String rtuAddr ;
-
- @Schema(description = "涓婃姤鏁版嵁鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Date dt ;
-
- @Schema(description = "涓婃姤鏁版嵁鍐呭锛圚EX锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public String content ;
-
-}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo4Mapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo4Mapper.java
deleted file mode 100644
index 76d774a..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo4Mapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.dy.pipIrrGlobal.test;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface TestPo4Mapper extends BaseMapper<TestPo4> {
-
- /**
- * insert record to table
- * @param po the record
- * @return insert count
- */
- int putin(TestPo4 po);
-
-
-}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo5.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo5.java
deleted file mode 100644
index 7809faa..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo5.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.dy.pipIrrGlobal.test;
-
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.dy.common.po.BaseEntity;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * 娴嬭瘯琛�
- */
-@TableName(value="test5", autoResultMap = true)
-@Data
-@Builder
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
-@Schema(name = "RTU娴嬭瘯涓婃姤鏁版嵁5")
-public class TestPo5 implements BaseEntity {
-
- public static final long serialVersionUID = 202311141539001L;
-
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- @TableId(type = IdType.INPUT)
- @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Long id ;
-
- @Schema(description = "rtu鍦板潃", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public String rtuAddr ;
-
- @Schema(description = "涓婃姤鏁版嵁鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Date dt ;
-
- @Schema(description = "涓婃姤鏁版嵁鍐呭锛圚EX锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public String content ;
-
-}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo5Mapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo5Mapper.java
deleted file mode 100644
index 678cbf2..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo5Mapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.dy.pipIrrGlobal.test;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface TestPo5Mapper extends BaseMapper<TestPo5> {
-
- /**
- * insert record to table
- * @param po the record
- * @return insert count
- */
- int putin(TestPo5 po);
-
-
-}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo6.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo6.java
deleted file mode 100644
index fbdb8db..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo6.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.dy.pipIrrGlobal.test;
-
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.dy.common.po.BaseEntity;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * 娴嬭瘯琛�
- */
-@TableName(value="test6", autoResultMap = true)
-@Data
-@Builder
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
-@Schema(name = "RTU娴嬭瘯涓婃姤鏁版嵁6")
-public class TestPo6 implements BaseEntity {
-
- public static final long serialVersionUID = 202311141539001L;
-
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- @TableId(type = IdType.INPUT)
- @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Long id ;
-
- @Schema(description = "rtu鍦板潃", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public String rtuAddr ;
-
- @Schema(description = "涓婃姤鏁版嵁鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Date dt ;
-
- @Schema(description = "涓婃姤鏁版嵁鍐呭锛圚EX锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public String content ;
-
-}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo6Mapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo6Mapper.java
deleted file mode 100644
index 3441990..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo6Mapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.dy.pipIrrGlobal.test;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface TestPo6Mapper extends BaseMapper<TestPo6> {
-
- /**
- * insert record to table
- * @param po the record
- * @return insert count
- */
- int putin(TestPo6 po);
-
-
-}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo7.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo7.java
deleted file mode 100644
index 6821803..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo7.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.dy.pipIrrGlobal.test;
-
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.dy.common.po.BaseEntity;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * 娴嬭瘯琛�
- */
-@TableName(value="test7", autoResultMap = true)
-@Data
-@Builder
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
-@Schema(name = "RTU娴嬭瘯涓婃姤鏁版嵁7")
-public class TestPo7 implements BaseEntity {
-
- public static final long serialVersionUID = 202311141539001L;
-
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- @TableId(type = IdType.INPUT)
- @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Long id ;
-
- @Schema(description = "rtu鍦板潃", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public String rtuAddr ;
-
- @Schema(description = "涓婃姤鏁版嵁鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Date dt ;
-
- @Schema(description = "涓婃姤鏁版嵁鍐呭锛圚EX锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public String content ;
-
-}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo7Mapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo7Mapper.java
deleted file mode 100644
index 5cc6efb..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo7Mapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.dy.pipIrrGlobal.test;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface TestPo7Mapper extends BaseMapper<TestPo7> {
-
- /**
- * insert record to table
- * @param po the record
- * @return insert count
- */
- int putin(TestPo7 po);
-
-
-}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo8.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo8.java
deleted file mode 100644
index 68be918..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo8.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.dy.pipIrrGlobal.test;
-
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.dy.common.po.BaseEntity;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * 娴嬭瘯琛�
- */
-@TableName(value="test8", autoResultMap = true)
-@Data
-@Builder
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
-@Schema(name = "RTU娴嬭瘯涓婃姤鏁版嵁8")
-public class TestPo8 implements BaseEntity {
-
- public static final long serialVersionUID = 202311141539001L;
-
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- @TableId(type = IdType.INPUT)
- @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Long id ;
-
- @Schema(description = "rtu鍦板潃", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public String rtuAddr ;
-
- @Schema(description = "涓婃姤鏁版嵁鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Date dt ;
-
- @Schema(description = "涓婃姤鏁版嵁鍐呭锛圚EX锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public String content ;
-
-}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo8Mapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo8Mapper.java
deleted file mode 100644
index ef6b34d..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo8Mapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.dy.pipIrrGlobal.test;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface TestPo8Mapper extends BaseMapper<TestPo8> {
-
- /**
- * insert record to table
- * @param po the record
- * @return insert count
- */
- int putin(TestPo8 po);
-
-
-}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo9.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo9.java
deleted file mode 100644
index bc540d5..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo9.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.dy.pipIrrGlobal.test;
-
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.dy.common.po.BaseEntity;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * 娴嬭瘯琛�
- */
-@TableName(value="test9", autoResultMap = true)
-@Data
-@Builder
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
-@Schema(name = "RTU娴嬭瘯涓婃姤鏁版嵁9")
-public class TestPo9 implements BaseEntity {
-
- public static final long serialVersionUID = 202311141539001L;
-
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- @TableId(type = IdType.INPUT)
- @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Long id ;
-
- @Schema(description = "rtu鍦板潃", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public String rtuAddr ;
-
- @Schema(description = "涓婃姤鏁版嵁鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Date dt ;
-
- @Schema(description = "涓婃姤鏁版嵁鍐呭锛圚EX锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public String content ;
-
-}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo9Mapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo9Mapper.java
deleted file mode 100644
index e4afae4..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo9Mapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.dy.pipIrrGlobal.test;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface TestPo9Mapper extends BaseMapper<TestPo9> {
-
- /**
- * insert record to table
- * @param po the record
- * @return insert count
- */
- int putin(TestPo9 po);
-
-
-}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/DistrictLevel.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/DistrictLevel.java
index 4e210ff..8e49596 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/DistrictLevel.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/DistrictLevel.java
@@ -15,6 +15,7 @@
*/
public enum DistrictLevel implements IEnum {
+ Province((byte)0, "鐪�"),
City((byte)1, "甯�"),
County((byte)2, "鍘�"),
Town((byte)3, "闀�"),
@@ -52,7 +53,9 @@
}
public static DistrictLevel get(Byte code){
- if(code.byteValue() == City.code.byteValue()){
+ if(code.byteValue() == Province.code.byteValue()) {
+ return Province;
+ }else if(code.byteValue() == City.code.byteValue()){
return City ;
}else if(code.byteValue() == County.code.byteValue()){
return County ;
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Org.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Org.java
index f5870de..70a0885 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Org.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Org.java
@@ -12,8 +12,8 @@
public enum Org {
- Ym("ym", "鍏冭皨"),
- Pj("pj", "鐗囪闀�"),
+// Ym("ym", "鍏冭皨"),
+// Pj("pj", "鐗囪闀�"),
Jyg("ym", "鍢夊唱鍏�");
@EnumValue
@@ -45,10 +45,13 @@
}
public static Org get(String tag){
- if(tag.equals(Ym.tag) || tag.equals(Jyg.tag)){
- return Ym ;
- }else if(tag.equals(Pj.tag)){
- return Pj ;
+// if(tag.equals(Ym.tag) || tag.equals(Jyg.tag)){
+// return Ym ;
+// }else if(tag.equals(Pj.tag)){
+// return Pj ;
+// }
+ if( tag.equals(Jyg.tag)){
+ return Jyg ;
}
return null ;
}
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-database-ym.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-database-ym.yml
index 87cffb8..29fac5c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-database-ym.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-database-ym.yml
@@ -5,7 +5,7 @@
#name: ym
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
-# url: jdbc:mysql://192.168.91.73:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+# url: jdbc:mysql://192.168.40.166:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
url: jdbc:mysql://127.0.0.1:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
username: root
password: dysql,;.abc!@#
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoAddressMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoAddressMapper.xml
deleted file mode 100644
index 612d013..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoAddressMapper.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!--namespace瀵瑰簲mapper鎺ュ彛鎵�鍦ㄧ殑浣嶇疆-->
-<mapper namespace="com.dy.pipIrrGlobal.daoDemo.DemoAddressMapper">
-
- <resultMap id="addressMap" type="com.dy.pipIrrGlobal.pojoDemo.DemoAddress">
- <id property="id" column="id" />
- <result property="name" column="name"/>
- <result property="userId" column="userId"/>
- </resultMap>
-
- <select id="selectByUserId" resultType="com.dy.pipIrrGlobal.pojoDemo.DemoAddress">
- select * from demo_address where userId=#{userId}
- </select>
-
-
-</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoAuthMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoAuthMapper.xml
deleted file mode 100644
index f726906..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoAuthMapper.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!--namespace瀵瑰簲mapper鎺ュ彛鎵�鍦ㄧ殑浣嶇疆-->
-<mapper namespace="com.dy.pipIrrGlobal.daoDemo.DemoAuthMapper">
- <resultMap id="authMap" type="com.dy.pipIrrGlobal.pojoDemo.DemoAuth">
- <id property="id" column="id" />
- <result property="num" column="num"/>
- <result property="name" column="name"/>
- <result property="type" column="type"/>
- </resultMap>
-
-
- <!-- fetchType="lazy" 杩橀渶瑕侀厤缃產ggressiveLazyLoading=false -->
- <resultMap id="selectAll" extends="authMap" type="com.dy.pipIrrGlobal.pojoDemo.DemoAuth">
- <collection property="roleList" fetchType="lazy" column="{authId=id}" select="com.dy.pipIrrGlobal.daoDemo.DemoRoleMapper.selectByAuthId" />
- </resultMap>
-
-
- <select id="selectAll" resultMap="selectAll">
- select * from demo_auth
- </select>
-
-
-</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoRoleMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoRoleMapper.xml
deleted file mode 100644
index 9a5e14d..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoRoleMapper.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dy.pipIrrGlobal.daoDemo.DemoRoleMapper">
-
- <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoDemo.DemoRole">
- <!--@mbg.generated-->
- <!--@Table demo_role-->
- <id column="id" jdbcType="BIGINT" property="id" />
- <result column="name" jdbcType="VARCHAR" property="name" />
- <result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler" javaType="com.dy.common.mybatis.envm.Deleted"/>
- </resultMap>
-
- <sql id="Base_Column_List">
- <!--@mbg.generated-->
- id, `name`, deleted
- </sql>
-
- <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
- <!--@mbg.generated-->
- select
- <include refid="Base_Column_List" />
- from demo_role
- where id = #{id,jdbcType=BIGINT}
- </select>
-
- <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
- <!--@mbg.generated-->
- delete from demo_role
- where id = #{id,jdbcType=BIGINT}
- </delete>
-
- <insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoDemo.DemoRole">
- <!--@mbg.generated-->
- insert into demo_role (id, `name`, deleted
- )
- values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{deleted,jdbcType=TINYINT}
- )
- </insert>
-
- <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoDemo.DemoRole">
- <!--@mbg.generated-->
- insert into demo_role
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">
- id,
- </if>
- <if test="name != null">
- `name`,
- </if>
- <if test="deleted != null">
- deleted,
- </if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="id != null">
- #{id,jdbcType=BIGINT},
- </if>
- <if test="name != null">
- #{name,jdbcType=VARCHAR},
- </if>
- <if test="deleted != null">
- #{deleted,jdbcType=TINYINT},
- </if>
- </trim>
- </insert>
- <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoDemo.DemoRole">
- <!--@mbg.generated-->
- update demo_role
- <set>
- <if test="name != null">
- `name` = #{name,jdbcType=VARCHAR},
- </if>
- <if test="deleted != null">
- deleted = #{deleted,jdbcType=TINYINT},
- </if>
- </set>
- where id = #{id,jdbcType=BIGINT}
- </update>
- <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoDemo.DemoRole">
- <!--@mbg.generated-->
- update demo_role
- set `name` = #{name,jdbcType=VARCHAR},
- deleted = #{deleted,jdbcType=TINYINT}
- where id = #{id,jdbcType=BIGINT}
- </update>
- <select id="selectAll" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List" />
- from demo_role
- </select>
-</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoTestMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoTestMapper.xml
deleted file mode 100644
index ab0b277..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoTestMapper.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!--namespace瀵瑰簲mapper鎺ュ彛鎵�鍦ㄧ殑浣嶇疆-->
-<mapper namespace="com.dy.pipIrrGlobal.daoDemo.DemoTestMapper">
- <!--瀵瑰簲mapper鎺ュ彛涓殑鏂规硶public Integer queryCount();-->
- <select id="queryCount" resultType="java.lang.Integer">
- select count(*) from demo_test ;
- </select>
-</mapper>
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoUserMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoUserMapper.xml
deleted file mode 100644
index 13b5d2a..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoUserMapper.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!--namespace瀵瑰簲mapper鎺ュ彛鎵�鍦ㄧ殑浣嶇疆-->
-<mapper namespace="com.dy.pipIrrGlobal.daoDemo.DemoUserMapper">
- <resultMap id="userMap" type="com.dy.pipIrrGlobal.pojoDemo.DemoUser">
- <id property="id" column="id" />
- <result property="name" column="name"/>
- <result property="password" column="password"/>
- <result property="roleId" column="roleId"/>
- <result property="disabled" column="disabled" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler" javaType="com.dy.common.mybatis.envm.Disabled"/>
- <result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler" javaType="com.dy.common.mybatis.envm.Deleted"/>
- </resultMap>
-
- <resultMap id="addressMap" type="com.dy.pipIrrGlobal.pojoDemo.DemoAddress">
- <id property="id" column="id" />
- <result property="name" column="name"/>
- <result property="userId" column="userId"/>
- </resultMap>
-
- <resultMap id="userAddressMap1" extends="userMap" type="com.dy.pipIrrGlobal.pojoDemo.DemoUser">
- <association property="address" columnPrefix="addr_" resultMap="addressMap" />
- </resultMap>
-
- <resultMap id="userAddressMap2" extends="userMap" type="com.dy.pipIrrGlobal.pojoDemo.DemoUser">
- <association property="address" columnPrefix="addr_" resultMap="com.dy.pipIrrGlobal.daoDemo.DemoAddressMapper.addressMap" />
- </resultMap>
-
- <resultMap id="userAddressMap3" extends="userMap" type="com.dy.pipIrrGlobal.pojoDemo.DemoUser">
- <association property="address" column="{userId=id}" select="com.dy.pipIrrGlobal.daoDemo.DemoAddressMapper.selectByUserId" />
- </resultMap>
-
- <!-- fetchType="lazy" 杩橀渶瑕侀厤缃產ggressiveLazyLoading=false -->
- <resultMap id="userAddressMap4" extends="userMap" type="com.dy.pipIrrGlobal.pojoDemo.DemoUser">
- <association property="address" fetchType="lazy" column="{userId=id}" select="com.dy.pipIrrGlobal.daoDemo.DemoAddressMapper.selectByUserId" />
- </resultMap>
-
- <!-- 鍏宠仈鐨勫祵濂楃粨鏋滄槧灏勶紝浼樼偣锛氭暟鎹簱鏌ヨ娆℃暟灏戯紝鍘嬪姏灏忥紝缂虹偣锛歋QL澶嶆潅 -->
- <select id="selectById1" resultType="com.dy.pipIrrGlobal.pojoDemo.DemoUser">
- select u.*,
- adr.id "address.id",
- adr.name "address.name",
- adr.userId "address.userId"
- from demo_user u
- inner join demo_address adr on u.id = adr.userId
- where u.id = #{id}
- </select>
-
-
- <!-- 鍏宠仈鐨勫祵濂楃粨鏋滄槧灏勶紝浼樼偣锛氭暟鎹簱鏌ヨ娆℃暟灏戯紝鍘嬪姏灏忥紝缂虹偣锛歋QL澶嶆潅 -->
- <select id="selectById2" resultMap="userAddressMap1">
- select u.*,
- adr.id addr_id,
- adr.name addr_name,
- adr.userId addr_userId
- from demo_user u
- inner join demo_address adr on u.id = adr.userId
- where u.id = #{id}
- </select>
-
-
- <!-- 鍏宠仈鐨勫祵濂楃粨鏋滄槧灏勶紝浼樼偣锛氭暟鎹簱鏌ヨ娆℃暟灏戯紝鍘嬪姏灏忥紝缂虹偣锛歋QL澶嶆潅 -->
- <select id="selectById3" resultMap="userAddressMap2">
- select u.*,
- adr.id addr_id,
- adr.name addr_name,
- adr.userId addr_userId
- from demo_user u
- inner join demo_address adr on u.id = adr.userId
- where u.id = #{id}
- </select>
-
-
-
- <!-- 鍏宠仈宓屽鏌ヨ锛屼紭鐐癸細SQL绠�鍗曪紝缂虹偣锛氭暟鎹簱鍙兘鏌ヨ澶氭鏁帮紝鍘嬪姏澶э紝 -->
- <select id="selectById4" resultMap="userAddressMap3">
- select u.*
- from demo_user u
- where u.id = #{id}
- </select>
-
-
- <!-- 鍏宠仈宓屽鏌ヨ锛屼紭鐐癸細SQL绠�鍗曪紝缂虹偣锛氭暟鎹簱鍙兘鏌ヨ澶氭鏁帮紝鍘嬪姏澶э紝 -->
- <select id="selectById5" resultMap="userAddressMap4">
- select u.*
- from demo_user u
- where u.id = #{id}
- </select>
-
- <!-- 绗笁鏂瑰叧鑱旀煡璇� -->
- <select id="selectByRoleId" resultMap="userAddressMap4">
- select * from demo_user where roleId=#{roleId}
- </select>
-
- <!--瀵瑰簲mapper鎺ュ彛鏂规硶public void insert(DemoUser user);-->
- <insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoDemo.DemoUser">
- insert into
- demo_user (id, name, password, roleId, disabled, deleted)
- values (#{id},#{name},#{password},#{roleId},
- #{disabled, typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
- #{deleted, typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT}
- );
- </insert>
-
-</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
index 1d5434d..2ee04fa 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
@@ -364,7 +364,7 @@
COUNT(*) AS recordCount
FROM pr_controller con
INNER JOIN pr_intake inta ON con.intakeId = inta.id
- INNER JOIN JSON_TABLE(
+ left JOIN JSON_TABLE(
<!--'[{"rtuAddr":"37142501020100215","isOnLine":true},{"rtuAddr":"4000004","isOnLine":true},{"rtuAddr":"dy20240325","isOnLine":false}]',-->
#{onLineMap},
'$[*]' COLUMNS(
@@ -391,7 +391,7 @@
rtus.isOnLine
FROM pr_controller con
INNER JOIN pr_intake inta ON con.intakeId = inta.id
- INNER JOIN JSON_TABLE(
+ left JOIN JSON_TABLE(
<!--'[{"rtuAddr":"37142501020100215","isOnLine":true},{"rtuAddr":"4000004","isOnLine":true},{"rtuAddr":"dy20240325","isOnLine":false}]',-->
#{onLineMap},
'$[*]' COLUMNS(
@@ -407,6 +407,7 @@
AND inta.name LIKE CONCAT('%', #{intakeNum}, '%')
</if>
</where>
+ order by con.id ASC
<if test="pageCurr != null and pageSize != null">
LIMIT ${(pageCurr-1)*pageSize}, ${pageSize}
</if>
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 e9ea639..6f610a5 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateHistoryMapper.xml
@@ -25,13 +25,15 @@
<result column="alarm_ele_exceed" jdbcType="TINYINT" property="alarmEleExceed" />
<result column="alarm_ele_low_volt" jdbcType="TINYINT" property="alarmEleLowVolt" />
<result column="state_ic_enable" jdbcType="TINYINT" property="stateIcEnable" />
+ <result column="alarm_battery_volt" jdbcType="TINYINT" property="alarmBatteryVolt" />
+ <result column="alarm_valve" jdbcType="TINYINT" property="alarmValve" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, controller_id, intake_id, rtu_addr, dt, rtu_dt, valve_state, alarm_remain_water,
alarm0_water_remain, alarm_exceed_year, alarm_water_meter_fault, alarm_loss, alarm_water_meter_break,
alarm_ele_meter_fault, alarm0_money_remain, alarm_inner_door, alarm_outer_door, alarm_ele_miss,
- alarm_ele_exceed, alarm_ele_low_volt, state_ic_enable
+ alarm_ele_exceed, alarm_ele_low_volt, state_ic_enable,alarm_battery_volt,alarm_valve
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
@@ -54,7 +56,7 @@
alarm_loss, alarm_water_meter_break, alarm_ele_meter_fault,
alarm0_money_remain, alarm_inner_door, alarm_outer_door,
alarm_ele_miss, alarm_ele_exceed, alarm_ele_low_volt,
- state_ic_enable)
+ state_ic_enable,alarm_battery_volt,alarm_valve)
values (#{id,jdbcType=BIGINT}, #{controllerId,jdbcType=BIGINT}, #{intakeId,jdbcType=BIGINT},
#{rtuAddr,jdbcType=VARCHAR}, #{dt,jdbcType=TIMESTAMP}, #{rtuDt,jdbcType=TIMESTAMP},
#{valveState,jdbcType=TINYINT}, #{alarmRemainWater,jdbcType=TINYINT}, #{alarm0WaterRemain,jdbcType=TINYINT},
@@ -62,7 +64,7 @@
#{alarmLoss,jdbcType=TINYINT}, #{alarmWaterMeterBreak,jdbcType=TINYINT}, #{alarmEleMeterFault,jdbcType=TINYINT},
#{alarm0MoneyRemain,jdbcType=TINYINT}, #{alarmInnerDoor,jdbcType=TINYINT}, #{alarmOuterDoor,jdbcType=TINYINT},
#{alarmEleMiss,jdbcType=TINYINT}, #{alarmEleExceed,jdbcType=TINYINT}, #{alarmEleLowVolt,jdbcType=TINYINT},
- #{stateIcEnable,jdbcType=TINYINT})
+ #{stateIcEnable,jdbcType=TINYINT}, #{alarmBatteryVolt,jdbcType=TINYINT}, #{alarmValve,jdbcType=TINYINT})
</insert>
<insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmAlarmStateHistory">
<!--@mbg.generated-->
@@ -131,6 +133,12 @@
<if test="stateIcEnable != null">
state_ic_enable,
</if>
+ <if test="alarmBatteryVolt != null">
+ alarm_battery_volt,
+ </if>
+ <if test="alarmValve != null">
+ alarm_valve,
+ </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
@@ -195,6 +203,12 @@
</if>
<if test="stateIcEnable != null">
#{stateIcEnable,jdbcType=TINYINT},
+ </if>
+ <if test="alarmBatteryVolt != null">
+ #{alarmBatteryVolt,jdbcType=TINYINT},
+ </if>
+ <if test="alarmValve != null">
+ #{alarmValve,jdbcType=TINYINT},
</if>
</trim>
</insert>
@@ -262,6 +276,12 @@
<if test="stateIcEnable != null">
state_ic_enable = #{stateIcEnable,jdbcType=TINYINT},
</if>
+ <if test="alarmBatteryVolt != null">
+ alarm_battery_volt = #{alarmBatteryVolt,jdbcType=TINYINT},
+ </if>
+ <if test="alarmValve != null">
+ alarm_valve = #{alarmValve,jdbcType=TINYINT},
+ </if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
@@ -287,7 +307,9 @@
alarm_ele_miss = #{alarmEleMiss,jdbcType=TINYINT},
alarm_ele_exceed = #{alarmEleExceed,jdbcType=TINYINT},
alarm_ele_low_volt = #{alarmEleLowVolt,jdbcType=TINYINT},
- state_ic_enable = #{stateIcEnable,jdbcType=TINYINT}
+ state_ic_enable = #{stateIcEnable,jdbcType=TINYINT},
+ alarm_battery_volt = #{alarmBatteryVolt,jdbcType=TINYINT},
+ alarm_valve = #{alarmValve,jdbcType=TINYINT},
where id = #{id,jdbcType=BIGINT}
</update>
</mapper>
\ No newline at end of file
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 2056c59..0402aec 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml
@@ -25,13 +25,15 @@
<result column="alarm_ele_exceed" jdbcType="TINYINT" property="alarmEleExceed" />
<result column="alarm_ele_low_volt" jdbcType="TINYINT" property="alarmEleLowVolt" />
<result column="state_ic_enable" jdbcType="TINYINT" property="stateIcEnable" />
+ <result column="alarm_battery_volt" jdbcType="TINYINT" property="alarmBatteryVolt" />
+ <result column="alarm_valve" jdbcType="TINYINT" property="alarmValve" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, controller_id, intake_id, rtu_addr, dt, rtu_dt, valve_state, alarm_remain_water,
alarm0_water_remain, alarm_exceed_year, alarm_water_meter_fault, alarm_loss, alarm_water_meter_break,
alarm_ele_meter_fault, alarm0_money_remain, alarm_inner_door, alarm_outer_door, alarm_ele_miss,
- alarm_ele_exceed, alarm_ele_low_volt, state_ic_enable
+ alarm_ele_exceed, alarm_ele_low_volt, state_ic_enable,alarm_battery_volt,alarm_valve
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
@@ -61,15 +63,15 @@
alarm_loss, alarm_water_meter_break, alarm_ele_meter_fault,
alarm0_money_remain, alarm_inner_door, alarm_outer_door,
alarm_ele_miss, alarm_ele_exceed, alarm_ele_low_volt,
- state_ic_enable)
+ state_ic_enable,alarm_battery_volt,alarm_valve)
values (#{id,jdbcType=BIGINT}, #{controllerId,jdbcType=BIGINT}, #{intakeId,jdbcType=BIGINT},
#{rtuAddr,jdbcType=VARCHAR}, #{dt,jdbcType=TIMESTAMP}, #{rtuDt,jdbcType=TIMESTAMP},
#{valveState,jdbcType=TINYINT}, #{alarmRemainWater,jdbcType=TINYINT}, #{alarm0WaterRemain,jdbcType=TINYINT},
#{alarmExceedYear,jdbcType=TINYINT}, #{alarmWaterMeterFault,jdbcType=TINYINT},
#{alarmLoss,jdbcType=TINYINT}, #{alarmWaterMeterBreak,jdbcType=TINYINT}, #{alarmEleMeterFault,jdbcType=TINYINT},
#{alarm0MoneyRemain,jdbcType=TINYINT}, #{alarmInnerDoor,jdbcType=TINYINT}, #{alarmOuterDoor,jdbcType=TINYINT},
- #{alarmEleMiss,jdbcType=TINYINT}, #{alarmEleExceed,jdbcType=TINYINT}, #{alarmEleLowVolt,jdbcType=TINYINT},
- #{stateIcEnable,jdbcType=TINYINT})
+ #{alarmEleMiss,jdbcType=TINYINT}, #{alarmEleExceed,jdbcType=TINYINT}, #{alarmEleLowVolt,jdbcType=TINYINT},
+ #{stateIcEnable,jdbcType=TINYINT}, #{alarmBatteryVolt,jdbcType=TINYINT}, #{alarmValve,jdbcType=TINYINT})
</insert>
<insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmAlarmStateLast">
<!--@mbg.generated-->
@@ -138,6 +140,12 @@
<if test="stateIcEnable != null">
state_ic_enable,
</if>
+ <if test="alarmBatteryVolt != null">
+ alarm_battery_volt,
+ </if>
+ <if test="alarmValve != null">
+ alarm_valve,
+ </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
@@ -202,6 +210,12 @@
</if>
<if test="stateIcEnable != null">
#{stateIcEnable,jdbcType=TINYINT},
+ </if>
+ <if test="alarmBatteryVolt != null">
+ #{alarmBatteryVolt,jdbcType=TINYINT},
+ </if>
+ <if test="alarmValve != null">
+ #{alarmValve,jdbcType=TINYINT},
</if>
</trim>
</insert>
@@ -269,6 +283,12 @@
<if test="stateIcEnable != null">
state_ic_enable = #{stateIcEnable,jdbcType=TINYINT},
</if>
+ <if test="alarmBatteryVolt != null">
+ alarm_battery_volt = #{alarmBatteryVolt,jdbcType=TINYINT},
+ </if>
+ <if test="alarmValve != null">
+ alarm_valve = #{alarmValve,jdbcType=TINYINT},
+ </if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
@@ -294,7 +314,9 @@
alarm_ele_miss = #{alarmEleMiss,jdbcType=TINYINT},
alarm_ele_exceed = #{alarmEleExceed,jdbcType=TINYINT},
alarm_ele_low_volt = #{alarmEleLowVolt,jdbcType=TINYINT},
- state_ic_enable = #{stateIcEnable,jdbcType=TINYINT}
+ state_ic_enable = #{stateIcEnable,jdbcType=TINYINT},
+ alarm_battery_volt = #{alarmBatteryVolt,jdbcType=TINYINT},
+ alarm_valve = #{alarmValve,jdbcType=TINYINT},
where id = #{id,jdbcType=BIGINT}
</update>
</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeRechargeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeRechargeMapper.xml
index e7edb52..42cb6b4 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeRechargeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeRechargeMapper.xml
@@ -264,4 +264,13 @@
</if>
</trim>
</select>
+
+ <select id="selectByCardId" resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List" />
+ from se_recharge
+ where cardId = #{cardId,jdbcType=BIGINT}
+ ORDER BY operateDt DESC
+ limit 0,1
+ </select>
</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVirtualCardMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVirtualCardMapper.xml
index f579148..dd319b6 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVirtualCardMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVirtualCardMapper.xml
@@ -11,11 +11,12 @@
<result column="last_operate" jdbcType="TINYINT" property="lastOperate" />
<result column="last_operate_time" jdbcType="TIMESTAMP" property="lastOperateTime" />
<result column="in_use" jdbcType="TINYINT" property="inUse" />
+ <result column="intake_id" jdbcType="BIGINT" property="intakeId" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, vc_num, client_id, money, last_operate, last_operate_time, in_use, create_time
+ id, vc_num, client_id, money, last_operate, last_operate_time, in_use, intake_id, create_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
@@ -33,10 +34,10 @@
<!--@mbg.generated-->
insert into se_virtual_card (id, vc_num, client_id,
money, last_operate, last_operate_time,
- in_use, create_time)
+ in_use, intake_id, create_time)
values (#{id,jdbcType=BIGINT}, #{vcNum,jdbcType=BIGINT}, #{clientId,jdbcType=BIGINT},
#{money,jdbcType=FLOAT}, #{lastOperate,jdbcType=TINYINT}, #{lastOperateTime,jdbcType=TIMESTAMP},
- #{inUse,jdbcType=TINYINT}, #{createTime,jdbcType=TIMESTAMP})
+ #{inUse,jdbcType=TINYINT}, #{intakeId,jdbcType=BIGINT},#{createTime,jdbcType=TIMESTAMP})
</insert>
<insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoSe.SeVirtualCard">
<!--@mbg.generated-->
@@ -63,6 +64,9 @@
<if test="inUse != null">
in_use,
</if>
+ <if test="intakeId != null">
+ intake_id,
+ </if>
<if test="createTime != null">
create_time,
</if>
@@ -88,6 +92,9 @@
</if>
<if test="inUse != null">
#{inUse,jdbcType=TINYINT},
+ </if>
+ <if test="intakeId != null">
+ #{intakeId,jdbcType=BIGINT},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
@@ -116,6 +123,9 @@
<if test="inUse != null">
in_use = #{inUse,jdbcType=TINYINT},
</if>
+ <if test="intakeId != null">
+ intake_id = #{intakeId,jdbcType=BIGINT},
+ </if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
@@ -131,10 +141,16 @@
last_operate = #{lastOperate,jdbcType=TINYINT},
last_operate_time = #{lastOperateTime,jdbcType=TIMESTAMP},
in_use = #{inUse,jdbcType=TINYINT},
+ intake_id = #{intakeId,jdbcType=BIGINT},
create_time = #{createTime,jdbcType=TIMESTAMP}
where id = #{id,jdbcType=BIGINT}
</update>
-
+ <update id="updateVcCardNoUseStateByIntakeId" parameterType="java.lang.Long">
+ update se_virtual_card
+ set in_use = 0,
+ intake_id = null
+ where intake_id = #{intakeId,jdbcType=BIGINT}
+ </update>
<!--楠岃瘉鍐滄埛鏄惁鎷ユ湁鎸囧畾鍚嶇О鐨勮櫄鎷熷崱-->
<select id="getRecordCountByName" resultType="java.lang.Integer">
SELECT COUNT(*) AS recordCount
@@ -145,7 +161,7 @@
</if>
<if test = "vcName != null and vcName !=''">
- AND vc_name = #{vcName}
+ AND vc_num = #{vcName}
</if>
</where>
</select>
@@ -185,6 +201,13 @@
WHERE id = #{vcId}
</select>
+ <!--鏍规嵁铏氭嫙鍗＄紪鍙疯幏鍙栬櫄鎷熷崱-->
+ <select id="getVcCardByNum" resultType="com.dy.pipIrrGlobal.pojoSe.SeVirtualCard">
+ select
+ <include refid="Base_Column_List" />
+ FROM se_virtual_card WHERE vc_num = #{vcNum}
+ </select>
+
<!--鏍规嵁铏氭嫙鍗＄紪鍙疯幏鍙栬櫄鎷熷崱ID-->
<select id="getVcIdByNum" resultType="java.lang.Long">
SELECT id FROM se_virtual_card WHERE vc_num = #{vcNum}
@@ -198,4 +221,5 @@
ORDER BY vc_num desc
LIMIT 0,1
</select>
+
</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test0Mapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test0Mapper.xml
deleted file mode 100644
index 1d3c95f..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test0Mapper.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dy.pipIrrGlobal.test.TestPo0Mapper">
- <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.test.TestPo0">
- <!--@mbg.generated-->
- <!--@Table test0-->
- <id column="id" jdbcType="BIGINT" property="id" />
- <result column="rtuAddr" jdbcType="VARCHAR" property="rtuAddr" />
- <result column="content" jdbcType="VARCHAR" property="content" />
- <result column="dt" jdbcType="TIMESTAMP" property="dt" />
- </resultMap>
- <sql id="Base_Column_List">
- <!--@mbg.generated-->
- id, rtuAddr, content, dt
- </sql>
-
- <insert id="putin" parameterType="com.dy.pipIrrGlobal.test.TestPo0">
- <!--@mbg.generated-->
- insert into test0 (id, rtuAddr, content, dt)
- values (#{id,jdbcType=BIGINT},
- #{rtuAddr,jdbcType=VARCHAR},
- #{content,jdbcType=VARCHAR},
- #{dt,jdbcType=TIMESTAMP})
- </insert>
-</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test1Mapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test1Mapper.xml
deleted file mode 100644
index a95a566..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test1Mapper.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dy.pipIrrGlobal.test.TestPo1Mapper">
- <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.test.TestPo1">
- <!--@mbg.generated-->
- <!--@Table test1-->
- <id column="id" jdbcType="BIGINT" property="id" />
- <result column="rtuAddr" jdbcType="VARCHAR" property="rtuAddr" />
- <result column="content" jdbcType="VARCHAR" property="content" />
- <result column="dt" jdbcType="TIMESTAMP" property="dt" />
- </resultMap>
- <sql id="Base_Column_List">
- <!--@mbg.generated-->
- id, rtuAddr, content, dt
- </sql>
-
- <insert id="putin" parameterType="com.dy.pipIrrGlobal.test.TestPo1">
- <!--@mbg.generated-->
- insert into test1 (id, rtuAddr, content, dt)
- values (#{id,jdbcType=BIGINT},
- #{rtuAddr,jdbcType=VARCHAR},
- #{content,jdbcType=VARCHAR},
- #{dt,jdbcType=TIMESTAMP})
- </insert>
-</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test2Mapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test2Mapper.xml
deleted file mode 100644
index a150f8f..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test2Mapper.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dy.pipIrrGlobal.test.TestPo2Mapper">
- <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.test.TestPo2">
- <!--@mbg.generated-->
- <!--@Table test2-->
- <id column="id" jdbcType="BIGINT" property="id" />
- <result column="rtuAddr" jdbcType="VARCHAR" property="rtuAddr" />
- <result column="content" jdbcType="VARCHAR" property="content" />
- <result column="dt" jdbcType="TIMESTAMP" property="dt" />
- </resultMap>
- <sql id="Base_Column_List">
- <!--@mbg.generated-->
- id, rtuAddr, content, dt
- </sql>
-
- <insert id="putin" parameterType="com.dy.pipIrrGlobal.test.TestPo2">
- <!--@mbg.generated-->
- insert into test2 (id, rtuAddr, content, dt)
- values (#{id,jdbcType=BIGINT},
- #{rtuAddr,jdbcType=VARCHAR},
- #{content,jdbcType=VARCHAR},
- #{dt,jdbcType=TIMESTAMP})
- </insert>
-</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test3Mapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test3Mapper.xml
deleted file mode 100644
index 694b363..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test3Mapper.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dy.pipIrrGlobal.test.TestPo3Mapper">
- <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.test.TestPo3">
- <!--@mbg.generated-->
- <!--@Table test3-->
- <id column="id" jdbcType="BIGINT" property="id" />
- <result column="rtuAddr" jdbcType="VARCHAR" property="rtuAddr" />
- <result column="content" jdbcType="VARCHAR" property="content" />
- <result column="dt" jdbcType="TIMESTAMP" property="dt" />
- </resultMap>
- <sql id="Base_Column_List">
- <!--@mbg.generated-->
- id, rtuAddr, content, dt
- </sql>
-
- <insert id="putin" parameterType="com.dy.pipIrrGlobal.test.TestPo3">
- <!--@mbg.generated-->
- insert into test3 (id, rtuAddr, content, dt)
- values (#{id,jdbcType=BIGINT},
- #{rtuAddr,jdbcType=VARCHAR},
- #{content,jdbcType=VARCHAR},
- #{dt,jdbcType=TIMESTAMP})
- </insert>
-</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test4Mapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test4Mapper.xml
deleted file mode 100644
index b0960fb..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test4Mapper.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dy.pipIrrGlobal.test.TestPo4Mapper">
- <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.test.TestPo4">
- <!--@mbg.generated-->
- <!--@Table test4-->
- <id column="id" jdbcType="BIGINT" property="id" />
- <result column="rtuAddr" jdbcType="VARCHAR" property="rtuAddr" />
- <result column="content" jdbcType="VARCHAR" property="content" />
- <result column="dt" jdbcType="TIMESTAMP" property="dt" />
- </resultMap>
- <sql id="Base_Column_List">
- <!--@mbg.generated-->
- id, rtuAddr, content, dt
- </sql>
-
- <insert id="putin" parameterType="com.dy.pipIrrGlobal.test.TestPo4">
- <!--@mbg.generated-->
- insert into test4 (id, rtuAddr, content, dt)
- values (#{id,jdbcType=BIGINT},
- #{rtuAddr,jdbcType=VARCHAR},
- #{content,jdbcType=VARCHAR},
- #{dt,jdbcType=TIMESTAMP})
- </insert>
-</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test5Mapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test5Mapper.xml
deleted file mode 100644
index a4baa60..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test5Mapper.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dy.pipIrrGlobal.test.TestPo5Mapper">
- <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.test.TestPo5">
- <!--@mbg.generated-->
- <!--@Table test5-->
- <id column="id" jdbcType="BIGINT" property="id" />
- <result column="rtuAddr" jdbcType="VARCHAR" property="rtuAddr" />
- <result column="content" jdbcType="VARCHAR" property="content" />
- <result column="dt" jdbcType="TIMESTAMP" property="dt" />
- </resultMap>
- <sql id="Base_Column_List">
- <!--@mbg.generated-->
- id, rtuAddr, content, dt
- </sql>
-
- <insert id="putin" parameterType="com.dy.pipIrrGlobal.test.TestPo5">
- <!--@mbg.generated-->
- insert into test5 (id, rtuAddr, content, dt)
- values (#{id,jdbcType=BIGINT},
- #{rtuAddr,jdbcType=VARCHAR},
- #{content,jdbcType=VARCHAR},
- #{dt,jdbcType=TIMESTAMP})
- </insert>
-</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test6Mapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test6Mapper.xml
deleted file mode 100644
index 7a7972c..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test6Mapper.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dy.pipIrrGlobal.test.TestPo6Mapper">
- <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.test.TestPo6">
- <!--@mbg.generated-->
- <!--@Table test6-->
- <id column="id" jdbcType="BIGINT" property="id" />
- <result column="rtuAddr" jdbcType="VARCHAR" property="rtuAddr" />
- <result column="content" jdbcType="VARCHAR" property="content" />
- <result column="dt" jdbcType="TIMESTAMP" property="dt" />
- </resultMap>
- <sql id="Base_Column_List">
- <!--@mbg.generated-->
- id, rtuAddr, content, dt
- </sql>
-
- <insert id="putin" parameterType="com.dy.pipIrrGlobal.test.TestPo6">
- <!--@mbg.generated-->
- insert into test6 (id, rtuAddr, content, dt)
- values (#{id,jdbcType=BIGINT},
- #{rtuAddr,jdbcType=VARCHAR},
- #{content,jdbcType=VARCHAR},
- #{dt,jdbcType=TIMESTAMP})
- </insert>
-</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test7Mapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test7Mapper.xml
deleted file mode 100644
index 53eba1c..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test7Mapper.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dy.pipIrrGlobal.test.TestPo7Mapper">
- <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.test.TestPo7">
- <!--@mbg.generated-->
- <!--@Table test7-->
- <id column="id" jdbcType="BIGINT" property="id" />
- <result column="rtuAddr" jdbcType="VARCHAR" property="rtuAddr" />
- <result column="content" jdbcType="VARCHAR" property="content" />
- <result column="dt" jdbcType="TIMESTAMP" property="dt" />
- </resultMap>
- <sql id="Base_Column_List">
- <!--@mbg.generated-->
- id, rtuAddr, content, dt
- </sql>
-
- <insert id="putin" parameterType="com.dy.pipIrrGlobal.test.TestPo7">
- <!--@mbg.generated-->
- insert into test7 (id, rtuAddr, content, dt)
- values (#{id,jdbcType=BIGINT},
- #{rtuAddr,jdbcType=VARCHAR},
- #{content,jdbcType=VARCHAR},
- #{dt,jdbcType=TIMESTAMP})
- </insert>
-</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test8Mapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test8Mapper.xml
deleted file mode 100644
index ae507a8..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test8Mapper.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dy.pipIrrGlobal.test.TestPo8Mapper">
- <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.test.TestPo8">
- <!--@mbg.generated-->
- <!--@Table test8-->
- <id column="id" jdbcType="BIGINT" property="id" />
- <result column="rtuAddr" jdbcType="VARCHAR" property="rtuAddr" />
- <result column="content" jdbcType="VARCHAR" property="content" />
- <result column="dt" jdbcType="TIMESTAMP" property="dt" />
- </resultMap>
- <sql id="Base_Column_List">
- <!--@mbg.generated-->
- id, rtuAddr, content, dt
- </sql>
-
- <insert id="putin" parameterType="com.dy.pipIrrGlobal.test.TestPo8">
- <!--@mbg.generated-->
- insert into test8 (id, rtuAddr, content, dt)
- values (#{id,jdbcType=BIGINT},
- #{rtuAddr,jdbcType=VARCHAR},
- #{content,jdbcType=VARCHAR},
- #{dt,jdbcType=TIMESTAMP})
- </insert>
-</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test9Mapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test9Mapper.xml
deleted file mode 100644
index c2d13a4..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test9Mapper.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dy.pipIrrGlobal.test.TestPo9Mapper">
- <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.test.TestPo9">
- <!--@mbg.generated-->
- <!--@Table test9-->
- <id column="id" jdbcType="BIGINT" property="id" />
- <result column="rtuAddr" jdbcType="VARCHAR" property="rtuAddr" />
- <result column="content" jdbcType="VARCHAR" property="content" />
- <result column="dt" jdbcType="TIMESTAMP" property="dt" />
- </resultMap>
- <sql id="Base_Column_List">
- <!--@mbg.generated-->
- id, rtuAddr, content, dt
- </sql>
-
- <insert id="putin" parameterType="com.dy.pipIrrGlobal.test.TestPo9">
- <!--@mbg.generated-->
- insert into test9 (id, rtuAddr, content, dt)
- values (#{id,jdbcType=BIGINT},
- #{rtuAddr,jdbcType=VARCHAR},
- #{content,jdbcType=VARCHAR},
- #{dt,jdbcType=TIMESTAMP})
- </insert>
-</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/localProtocol/RtuOnLineDeal.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/localProtocol/RtuOnLineDeal.java
index 0338eb7..15fe543 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/localProtocol/RtuOnLineDeal.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/localProtocol/RtuOnLineDeal.java
@@ -9,12 +9,5 @@
*/
public RtuOnLineVo deal(){
return (new RtuOnLineVo()).setOnLine(TcpSessionCache.allOnLine());
-
- // 杩斿洖鍊兼祴璇曚唬鐮�
- //HashMap<String , Boolean> onLineMap = new HashMap<>() ;
- //onLineMap.put("37142501020100215", true);
- //onLineMap.put("dy20240325", false);
- //onLineMap.put("4000004", true);
- //return (new RtuOnLineVo()).setOnLine(onLineMap);
}
}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java
index 1fd18ed..6def3c1 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java
@@ -3,6 +3,7 @@
import com.dy.pipIrrGlobal.daoPr.PrControllerMapper;
import com.dy.pipIrrGlobal.daoPr.PrControllerTrampMapper;
import com.dy.pipIrrGlobal.daoRm.*;
+import com.dy.pipIrrGlobal.daoSe.SeVirtualCardMapper;
import com.dy.pipIrrGlobal.pojoPr.PrController;
import com.dy.pipIrrGlobal.pojoPr.PrControllerTramp;
import com.dy.pipIrrGlobal.pojoRm.*;
@@ -47,6 +48,8 @@
private RmLossHistoryMapper rmLossHistoryMapperDao ;//鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁″巻鍙叉暟鎹瓺AO
@Autowired
private RmCommandHistoryMapper rmCommandHistoryDao ;//杩滅▼鍛戒护鏃ュ織鐩稿叧
+ @Autowired
+ private SeVirtualCardMapper seVirtualCardDao ;//铏氭嫙鍗＄浉鍏�
//@Autowired
//@Lazy
@@ -141,6 +144,14 @@
this.rmAlarmStateHistoryMapperDao.insert(po) ;
}
+ /**
+ * 鍙樻洿铏氭嫙鍗″崰鐢ㄧ姸鎬�
+ * @param intakeId
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void updateVirCardNoUseState(Long intakeId){
+ this.seVirtualCardDao.updateVcCardNoUseStateByIntakeId(intakeId); ;
+ }
/////////////////////////////////////////////////
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealAlarmStatus.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealAlarmStatus.java
index 55cede3..cafed3b 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealAlarmStatus.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealAlarmStatus.java
@@ -1,22 +1,20 @@
package com.dy.rtuMw.server.rtuData.p206V1_0_0;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.*;
+import com.dy.common.util.DateTime;
+import com.dy.pipIrrGlobal.pojoRm.RmAlarmStateHistory;
import com.dy.rtuMw.server.rtuData.TaskSurpport;
import com.dy.rtuMw.server.rtuData.dbSv.DbSv;
import com.dy.common.mw.protocol.Data;
-import com.dy.common.mw.protocol.p206V1_0_0.DataAlarmVo;
-import com.dy.common.mw.protocol.p206V1_0_0.DataStateVo;
import com.dy.common.mw.protocol.p206V1_0_0.DataV1_0_1;
-import com.dy.common.util.DateTime;
import com.dy.pipIrrGlobal.pojoPr.PrController;
-import com.dy.pipIrrGlobal.pojoRm.RmAlarmStateHistory;
import com.dy.pipIrrGlobal.pojoRm.RmAlarmStateLast;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
/**
* @Author liurunyu
- * @Date 2024/1/15 21:59
- * @LastEditTime 2024/1/15 21:59
+ * @Date 2024/6/11 17:19
* @Description
*/
public class TkDealAlarmStatus extends TaskSurpport {
@@ -36,27 +34,39 @@
Object subD = d.getSubData() ;
if(subD != null){
DataV1_0_1 dV1_0_1 = (DataV1_0_1)subD ;
- if(dV1_0_1 != null){
- //dV1_0_1.dataCd81Vo 涓� dV1_0_1.dataCdC0Vo 涓嶄細鍚屾椂鏈夊��
- try{
-// if(dV1_0_1.dataCd81Vo != null){
-// if(dV1_0_1.dataCd81Vo.alarmVo != null || dV1_0_1.dataCd81Vo.stateVo != null){
-// Object[] objs = this.getTaskResults(TkPreGenObjs.taskId) ;
-// DbSv sv = (DbSv)objs[0] ;
-// PrController controller = (PrController)objs[1] ;
-// this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), dV1_0_1.dataCd81Vo.rtuDt, dV1_0_1, dV1_0_1.dataCd81Vo.alarmVo, dV1_0_1.dataCd81Vo.stateVo) ;
-// this.saveHistory(sv, controller, d.getRtuAddr(), dV1_0_1.dataCd81Vo.rtuDt, dV1_0_1, dV1_0_1.dataCd81Vo.alarmVo, dV1_0_1.dataCd81Vo.stateVo) ;
-// }
-// } else if(dV1_0_1.dataCdC0Vo != null){
-// if(dV1_0_1.dataCdC0Vo.alarmVo != null || dV1_0_1.dataCdC0Vo.stateVo != null){
-// Object[] objs = this.getTaskResults(TkPreGenObjs.taskId) ;
-// DbSv sv = (DbSv)objs[0] ;
-// PrController controller = (PrController)objs[1] ;
-// this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), dV1_0_1.dataCdC0Vo.rtuDt, dV1_0_1, dV1_0_1.dataCdC0Vo.alarmVo, dV1_0_1.dataCdC0Vo.stateVo) ;
-// this.saveHistory(sv, controller, d.getRtuAddr(), dV1_0_1.dataCdC0Vo.rtuDt, dV1_0_1, dV1_0_1.dataCdC0Vo.alarmVo, dV1_0_1.dataCdC0Vo.stateVo) ;
-// }
-// }
- }catch (Exception e){
+ if(dV1_0_1 != null && dV1_0_1.subData != null){
+ //dV1_0_1.dataCd81Vo銆� dV1_0_1.dataCd84Vo 涓� dV1_0_1.dataCdC0Vo 涓嶄細鍚屾椂鏈夊��
+ Object cdObj = dV1_0_1.subData ;
+ try {
+ if (cdObj instanceof DataCd81Vo) {
+ DataCd81Vo dataCd81Vo = (DataCd81Vo)cdObj ;
+ if (dataCd81Vo.alarmVo != null || dataCd81Vo.stateVo != null) {
+ Object[] objs = this.getTaskResults(TkPreGenObjs.taskId);
+ DbSv sv = (DbSv) objs[0];
+ PrController controller = (PrController) objs[1];
+ this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), dataCd81Vo.rtuDt, dV1_0_1, dataCd81Vo.alarmVo, dataCd81Vo.stateVo);
+ this.saveHistory(sv, controller, d.getRtuAddr(), dataCd81Vo.rtuDt, dV1_0_1, dataCd81Vo.alarmVo, dataCd81Vo.stateVo);
+ }
+ } else if (cdObj instanceof DataCd84Vo) {
+ DataCd84Vo dataCd84Vo = (DataCd84Vo)cdObj ;
+ if (dataCd84Vo.alarmVo != null || dataCd84Vo.stateVo != null) {
+ Object[] objs = this.getTaskResults(TkPreGenObjs.taskId);
+ DbSv sv = (DbSv) objs[0];
+ PrController controller = (PrController) objs[1];
+ this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), dataCd84Vo.rtuDt, dV1_0_1, dataCd84Vo.alarmVo, dataCd84Vo.stateVo);
+ this.saveHistory(sv, controller, d.getRtuAddr(), dataCd84Vo.rtuDt, dV1_0_1, dataCd84Vo.alarmVo, dataCd84Vo.stateVo);
+ }
+ } else if (cdObj instanceof DataCdC0Vo) {
+ DataCdC0Vo dataCdC0Vo = (DataCdC0Vo)cdObj ;
+ if (dataCdC0Vo.alarmVo != null || dataCdC0Vo.stateVo != null) {
+ Object[] objs = this.getTaskResults(TkPreGenObjs.taskId);
+ DbSv sv = (DbSv) objs[0];
+ PrController controller = (PrController) objs[1];
+ this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), dataCdC0Vo.rtuDt, dV1_0_1, dataCdC0Vo.alarmVo, dataCdC0Vo.stateVo);
+ this.saveHistory(sv, controller, d.getRtuAddr(), dataCdC0Vo.rtuDt, dV1_0_1, dataCdC0Vo.alarmVo, dataCdC0Vo.stateVo);
+ }
+ }
+ } catch (Exception e) {
log.error("淇濆瓨鎺у埗鍣ㄦ姤璀﹀拰鐘舵�佹暟鎹椂鍙戠敓寮傚父", e);
}
}
@@ -72,19 +82,36 @@
* @param stateVo 鐘舵�佸璞�
*/
private void saveOrUpdateLast(DbSv sv, PrController controller, String rtuAddr, String rtuDt, DataV1_0_1 dV1_0_1, DataAlarmVo alarmVo, DataStateVo stateVo) throws Exception {
-// RmAlarmStateLast po = sv.getRmAlarmStateLast(rtuAddr) ;
-// if(po == null){
-// po = new RmAlarmStateLast(null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
-// rtuAddr,
-// DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt),
-// DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(rtuDt),
-// alarmVo==null?null:alarmVo.batteryVolt, alarmVo==null?null:alarmVo.loss, alarmVo==null?null:alarmVo.meter, alarmVo==null?null:alarmVo.valve,
-// stateVo==null?null:stateVo.icCard, stateVo==null?null:stateVo.working, stateVo==null?null:stateVo.valve) ;
-// sv.saveRmAlarmStateLast(po) ;
-// }else{
-// po = this.update(controller, po, rtuDt, dV1_0_1, alarmVo, stateVo) ;
-// sv.updateRmAlarmStateLast(po);
-// }
+ RmAlarmStateLast po = sv.getRmAlarmStateLast(rtuAddr) ;
+ if(po == null){
+ po = new RmAlarmStateLast(null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
+ rtuAddr,
+ DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt),
+ DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(rtuDt),
+ stateVo==null?null:stateVo.working,//鐘舵��-闃�闂�/娉碉紙1鎵撳紑銆�0鍏抽棴锛�
+ (byte)0,//鍓╀綑姘撮噺鎶ヨ (1锛氬皬浜庢姤璀︿笂闄愭姤璀� 0锛氭甯�)
+ (byte)0,//鍓╀綑姘撮噺涓�0鍏虫车/闃� (1锛氬墿浣欐按閲忎负0鍏虫车 0锛氭甯�)
+ (byte)0,//骞寸敤姘撮噺澶т簬闄愬埗姘撮噺鎶ヨ(1锛氭姤璀� 0锛氭甯�)
+ alarmVo==null?null:alarmVo.meter,// 娴侀噺璁℃晠闅�(1锛氭姤璀︼紝0锛氭甯�)
+ alarmVo==null?null:alarmVo.loss,// 婕忔崯(鍋锋按)鎶ヨ(1锛氭姤璀︼紝 0锛氭甯�)
+ (byte)0,//娴侀噺璁℃崯鍧�(姝ｅ父閫氳浣嗙灛鏃朵负0)鎶ヨ(1锛氭姤璀︼紝0锛氭甯�)
+ (byte)0,//鐢佃〃鏁呴殰鎶ヨ(1锛氭姤璀︼紝0锛氭甯�)
+ (byte)0,//鍓╀綑閲戦涓�0(1锛氭姤璀︼紝0锛氭甯�)
+ (byte)0,//鎺у埗鍣ㄥ唴闂ㄦ姤璀�(1锛氭姤璀︼紝0锛氭甯�)
+ (byte)0,//鎺у埗鍣ㄥ闂ㄦ墦寮�鎶ヨ(1锛氭姤璀︼紝0锛氭甯�)
+ (byte)0,//浜ゆ祦缂洪」鎶ヨ(1锛氭姤璀︼紝0锛氭甯�)
+ (byte)0,//浜ゆ祦杩囨祦鎶ヨ(1锛氭姤璀︼紝0锛氭甯�)
+ (byte)0,//涓夌浉鐢垫瑺鍘嬫姤璀�(1锛氭姤璀︼紝0锛氭甯�)
+ stateVo==null?null:stateVo.icCard,//IC鍗＄姸鎬�(1銆佹湁鏁堬紝0锛氭棤鏁�) ;
+ alarmVo==null?null:alarmVo.batteryVolt,//鐢垫睜鐢靛帇(1锛氭姤璀︼紝0锛氭甯�)
+ alarmVo==null?null:alarmVo.valve//闃�闂ㄦ姤璀�(1锛氭姤璀︼紝0锛氭甯�)
+ );
+ sv.saveRmAlarmStateLast(po) ;
+ }else{
+ po = this.update(controller, po, rtuDt, dV1_0_1, alarmVo, stateVo) ;
+ this.updateVirCardNoUseState(sv, controller, stateVo) ;
+ sv.updateRmAlarmStateLast(po);
+ }
}
/**
@@ -97,43 +124,79 @@
* @param stateVo 鐘舵�佸璞�
*/
private void saveHistory(DbSv sv, PrController controller, String rtuAddr, String rtuDt, DataV1_0_1 dV1_0_1, DataAlarmVo alarmVo, DataStateVo stateVo) throws Exception {
-// RmAlarmStateHistory po = new RmAlarmStateHistory(null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
-// rtuAddr,
-// DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt),
-// DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(rtuDt),
-// alarmVo==null?null:alarmVo.batteryVolt, alarmVo==null?null:alarmVo.loss, alarmVo==null?null:alarmVo.meter, alarmVo==null?null:alarmVo.valve,
-// stateVo==null?null:stateVo.icCard, stateVo==null?null:stateVo.working, stateVo==null?null:stateVo.valve) ;
-// sv.saveRmAlarmStateHistory(po) ;
+ RmAlarmStateHistory po = new RmAlarmStateHistory(null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
+ rtuAddr,
+ DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt),
+ DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(rtuDt),
+ stateVo==null?null:stateVo.working,//鐘舵��-闃�闂�/娉碉紙1鎵撳紑銆�0鍏抽棴锛�
+ (byte)0,//鍓╀綑姘撮噺鎶ヨ (1锛氬皬浜庢姤璀︿笂闄愭姤璀� 0锛氭甯�)
+ (byte)0,//鍓╀綑姘撮噺涓�0鍏虫车/闃� (1锛氬墿浣欐按閲忎负0鍏虫车 0锛氭甯�)
+ (byte)0,//骞寸敤姘撮噺澶т簬闄愬埗姘撮噺鎶ヨ(1锛氭姤璀� 0锛氭甯�)
+ alarmVo==null?null:alarmVo.meter,// 娴侀噺璁℃晠闅�(1锛氭姤璀︼紝0锛氭甯�)
+ alarmVo==null?null:alarmVo.loss,// 婕忔崯(鍋锋按)鎶ヨ(1锛氭姤璀︼紝 0锛氭甯�)
+ (byte)0,//娴侀噺璁℃崯鍧�(姝ｅ父閫氳浣嗙灛鏃朵负0)鎶ヨ(1锛氭姤璀︼紝0锛氭甯�)
+ (byte)0,//鐢佃〃鏁呴殰鎶ヨ(1锛氭姤璀︼紝0锛氭甯�)
+ (byte)0,//鍓╀綑閲戦涓�0(1锛氭姤璀︼紝0锛氭甯�)
+ (byte)0,//鎺у埗鍣ㄥ唴闂ㄦ姤璀�(1锛氭姤璀︼紝0锛氭甯�)
+ (byte)0,//鎺у埗鍣ㄥ闂ㄦ墦寮�鎶ヨ(1锛氭姤璀︼紝0锛氭甯�)
+ (byte)0,//浜ゆ祦缂洪」鎶ヨ(1锛氭姤璀︼紝0锛氭甯�)
+ (byte)0,//浜ゆ祦杩囨祦鎶ヨ(1锛氭姤璀︼紝0锛氭甯�)
+ (byte)0,//涓夌浉鐢垫瑺鍘嬫姤璀�(1锛氭姤璀︼紝0锛氭甯�)
+ stateVo==null?null:stateVo.icCard,//IC鍗＄姸鎬�(1銆佹湁鏁堬紝0锛氭棤鏁�) ;
+ alarmVo==null?null:alarmVo.batteryVolt,//鐢垫睜鐢靛帇(1锛氭姤璀︼紝0锛氭甯�)
+ alarmVo==null?null:alarmVo.valve//闃�闂ㄦ姤璀�(1锛氭姤璀︼紝0锛氭甯�)
+ );
+ sv.saveRmAlarmStateHistory(po) ;
}
private RmAlarmStateLast update(PrController controller, RmAlarmStateLast po, String rtuDt, DataV1_0_1 dV1_0_1, DataAlarmVo alarmVo, DataStateVo stateVo) throws Exception {
-// po.controllerid = controller==null?null:controller.getId() ;
-// po.intakeid = controller==null?null:controller.getIntakeId() ;
-//
-// po.dt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt) ;
-// po.rtudt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(rtuDt) ;
-// if(alarmVo != null){
-// po.bateryvolt = alarmVo.batteryVolt ;
-// po.loss = alarmVo.loss ;
-// po.meter = alarmVo.meter ;
-// po.valve = alarmVo.valve ;
-// }else{
-// po.bateryvolt = null ;
-// po.loss = null ;
-// po.meter = null ;
-// po.valve = null ;
-// }
-// if(stateVo != null){
-// po.iccard = stateVo.icCard ;
-// po.working = stateVo.working ;
-// po.valvestate = stateVo.valve ;
-// }else{
-// po.iccard = null ;
-// po.working = null ;
-// po.valvestate = null ;
-// }
+ po.controllerId = controller==null?null:controller.getId() ;
+ po.intakeId = controller==null?null:controller.getIntakeId() ;
+
+ po.dt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt) ;
+ po.rtuDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(rtuDt) ;
+ if(alarmVo != null){
+ po.alarmBatteryVolt = alarmVo.batteryVolt ;
+ po.alarmLoss = alarmVo.loss ;
+ po.alarmWaterMeterBreak = alarmVo.meter ;
+ po.alarmValve = alarmVo.valve ;
+ }/*else{
+ po.alarmBatteryVolt = null ;
+ po.alarmLoss = null ;
+ po.alarmWaterMeterBreak = null ;
+ po.alarmValve = null ;
+ }*/
+ if(stateVo != null){
+ po.stateIcEnable = stateVo.icCard ;
+ po.valveState = stateVo.working ;
+ //po.valvestate = stateVo.valve ;
+ }/*else{
+ po.stateIcEnable = null ;
+ po.valveState = null ;
+ //po.valvestate = null ;
+ }*/
return po ;
}
+
+
+ /**
+ * 铏氭嫙鍗″湪鍙栨按涓殑鍗犵敤鐘舵�佹敼涓洪潪搴旂敤鐘舵��
+ */
+ private void updateVirCardNoUseState(DbSv sv,
+ PrController controller,
+ DataStateVo stateVo){
+ if(stateVo != null){
+ if(stateVo.working != null && stateVo.working.byteValue() == 0){
+ //闃�闂ㄥ叧闂姸鎬�
+ if(controller != null && controller.getIntakeId() != null){
+ //铏氭嫙鍗″湪鍙栨按涓殑鍗犵敤鐘舵�佹敼涓洪潪搴旂敤鐘舵��
+ sv.updateVirCardNoUseState(controller.getIntakeId());
+ }
+ }
+ }
+
+ }
+
}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealAutoReport.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealAutoReport.java
index 5f897e8..30f51c0 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealAutoReport.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealAutoReport.java
@@ -3,7 +3,7 @@
import com.dy.rtuMw.server.rtuData.TaskSurpport;
import com.dy.rtuMw.server.rtuData.dbSv.DbSv;
import com.dy.common.mw.protocol.Data;
-import com.dy.common.mw.protocol.p206V1_0_0.DataCdC0Vo;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCdC0Vo;
import com.dy.common.mw.protocol.p206V1_0_0.DataV1_0_1;
import com.dy.common.util.DateTime;
import com.dy.pipIrrGlobal.pojoPr.PrController;
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealCloseValveReport.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealCloseValveReport.java
index 85569fe..8c148ed 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealCloseValveReport.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealCloseValveReport.java
@@ -3,7 +3,7 @@
import com.dy.rtuMw.server.rtuData.TaskSurpport;
import com.dy.rtuMw.server.rtuData.dbSv.DbSv;
import com.dy.common.mw.protocol.Data;
-import com.dy.common.mw.protocol.p206V1_0_0.DataCd83CloseVo;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd83CloseVo;
import com.dy.common.mw.protocol.p206V1_0_0.DataV1_0_1;
import com.dy.common.util.DateTime;
import com.dy.pipIrrGlobal.pojoPr.PrController;
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealLoss.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealLoss.java
index 9507f48..72cdc87 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealLoss.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealLoss.java
@@ -3,7 +3,7 @@
import com.dy.rtuMw.server.rtuData.TaskSurpport;
import com.dy.rtuMw.server.rtuData.dbSv.DbSv;
import com.dy.common.mw.protocol.Data;
-import com.dy.common.mw.protocol.p206V1_0_0.DataCdC0Vo;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCdC0Vo;
import com.dy.common.mw.protocol.p206V1_0_0.DataV1_0_1;
import com.dy.common.util.DateTime;
import com.dy.pipIrrGlobal.pojoPr.PrController;
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealOpenValveReport.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealOpenValveReport.java
index 9fdeeeb..219fd4a 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealOpenValveReport.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealOpenValveReport.java
@@ -3,7 +3,7 @@
import com.dy.rtuMw.server.rtuData.TaskSurpport;
import com.dy.rtuMw.server.rtuData.dbSv.DbSv;
import com.dy.common.mw.protocol.Data;
-import com.dy.common.mw.protocol.p206V1_0_0.DataCd83OpenVo;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd83OpenVo;
import com.dy.common.mw.protocol.p206V1_0_0.DataV1_0_1;
import com.dy.common.util.DateTime;
import com.dy.pipIrrGlobal.pojoPr.PrController;
@@ -36,16 +36,19 @@
Object subD = d.getSubData();
if (subD != null) {
DataV1_0_1 dV1_0_1 = (DataV1_0_1) subD;
-// if (dV1_0_1 != null && dV1_0_1.dataCd83OpenVo != null) {
-// Object[] objs = this.getTaskResults(TkPreGenObjs.taskId) ;
-// DbSv sv = (DbSv)objs[0] ;
-// PrController controller = (PrController)objs[1] ;
-// try{
-// this.doDeal(sv, controller, d.getRtuAddr(), dV1_0_1, dV1_0_1.dataCd83OpenVo) ;
-// }catch (Exception e){
-// log.error("淇濆瓨鎺у埗鍣ㄥ紑闃�涓婃姤鏃跺彂鐢熷紓甯�", e);
-// }
-// }
+ if (dV1_0_1 != null && dV1_0_1.subData != null) {
+ if(dV1_0_1.subData instanceof DataCd83OpenVo){
+ DataCd83OpenVo vo83 = (DataCd83OpenVo)dV1_0_1.subData ;
+ Object[] objs = this.getTaskResults(TkPreGenObjs.taskId) ;
+ DbSv sv = (DbSv)objs[0] ;
+ PrController controller = (PrController)objs[1] ;
+ try{
+ this.doDeal(sv, controller, d.getRtuAddr(), dV1_0_1, vo83) ;
+ }catch (Exception e){
+ log.error("淇濆瓨鎺у埗鍣ㄥ紑闃�涓婃姤鏃跺彂鐢熷紓甯�", e);
+ }
+ }
+ }
}
}
/**
@@ -60,7 +63,7 @@
RmOpenCloseValveLast poLast = sv.getRmOpenCloseValveLast(rtuAddr) ;
if(poLast == null){
//鏁版嵁搴撲腑涓嶅瓨鍦ㄨ鎺у埗鍣ㄧ殑寮�鍏抽榾鏁版嵁
- //棣栧厛鐢熸垚鏈�鏂版暟鎹強鍘嗗彶鏁版嵁锛屽苟鍏堜繚瀛�
+ //棣栧厛鐢熸垚寮�鍏抽榾鐨勬渶鏂版暟鎹強鍘嗗彶鏁版嵁锛屽苟鍏堜繚瀛�
poLast = this.newRmOpenCloseValveLast(controller, rtuAddr, dV1_0_1, dataCd83OpenVo);
this.newHistoryDataDeal(sv, controller, rtuAddr, dV1_0_1, dataCd83OpenVo, poLast);
sv.saveRmOpenCloseValveLast(poLast);
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealWorkReport.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealWorkReport.java
index 01aac6f..c393b9d 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealWorkReport.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealWorkReport.java
@@ -3,7 +3,7 @@
import com.dy.rtuMw.server.rtuData.TaskSurpport;
import com.dy.rtuMw.server.rtuData.dbSv.DbSv;
import com.dy.common.mw.protocol.Data;
-import com.dy.common.mw.protocol.p206V1_0_0.DataCd84Vo;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd84Vo;
import com.dy.common.mw.protocol.p206V1_0_0.DataV1_0_1;
import com.dy.common.util.DateTime;
import com.dy.pipIrrGlobal.pojoPr.PrController;
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkFindP206V1_0_0.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkFindP206V1_0_0.java
index 4ac1923..278ffda 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkFindP206V1_0_0.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkFindP206V1_0_0.java
@@ -18,7 +18,7 @@
public void execute(Object data) {
Data d = (Data)data ;
if(d.getProtocol() != null && d.getProtocol().equals(ProtocolConstantV206V1_0_0.protocolName)){
- //this.toNextTasks(data);
+ this.toNextTasks(data);
}else{
//涓嶆槸鏈崗璁殑鏁版嵁
}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkRtuDealCommandResponse.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkRtuDealCommandResponse.java
index 24d7ac2..b01b6c1 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkRtuDealCommandResponse.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkRtuDealCommandResponse.java
@@ -3,6 +3,10 @@
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.dy.common.mw.protocol.p206V1_0_0.*;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd92Vo;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd93Vo;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd97Vo;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd98Vo;
import com.dy.common.util.DateTime;
import com.dy.pipIrrGlobal.pojoPr.PrController;
import com.dy.pipIrrGlobal.pojoRm.RmCommandHistory;
@@ -38,7 +42,7 @@
if (dV1_0_1 != null && dV1_0_1.subData != null) {
Object[] objs = this.getTaskResults(TkPreGenObjs.taskId) ;
DbSv sv = (DbSv)objs[0] ;
- PrController controller = (PrController)objs[1] ;
+ //PrController controller = (PrController)objs[1] ;
try{
RmCommandHistory po = sv.getCommandLog(d.commandId) ;
if(po != null){
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatusV202404.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatusV202404.java
index 193e8d8..e3033ee 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatusV202404.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatusV202404.java
@@ -105,11 +105,14 @@
alarmVo==null?null:alarmVo.alarmEleMiss,
alarmVo==null?null:alarmVo.alarmEleExceed,
alarmVo==null?null:alarmVo.alarmEleLowVolt,
- alarmVo==null?null:alarmVo.stateIcEnable
+ alarmVo==null?null:alarmVo.stateIcEnable,
+ (byte)0,//鐢垫睜鐢靛帇(1锛氭姤璀︼紝0锛氭甯�)
+ (byte)0//闃�闂ㄦ姤璀�(1锛氭姤璀︼紝0锛氭甯�)
) ;
sv.saveRmAlarmStateLast(po) ;
}else{
po = this.update(po, controller, rtuDt, alarmVo, receiveDt) ;
+ this.updateVirCardNoUseState(sv, controller, alarmVo) ;
sv.updateRmAlarmStateLast(po);
}
}
@@ -149,7 +152,9 @@
alarmVo==null?null:alarmVo.alarmEleMiss,
alarmVo==null?null:alarmVo.alarmEleExceed,
alarmVo==null?null:alarmVo.alarmEleLowVolt,
- alarmVo==null?null:alarmVo.stateIcEnable
+ alarmVo==null?null:alarmVo.stateIcEnable,
+ (byte)0,//鐢垫睜鐢靛帇(1锛氭姤璀︼紝0锛氭甯�)
+ (byte)0//闃�闂ㄦ姤璀�(1锛氭姤璀︼紝0锛氭甯�)
) ;
sv.saveRmAlarmStateHistory(po) ;
}
@@ -192,4 +197,22 @@
}
return po ;
}
+
+ /**
+ * 铏氭嫙鍗″湪鍙栨按涓殑鍗犵敤鐘舵�佹敼涓洪潪搴旂敤鐘舵��
+ */
+ private void updateVirCardNoUseState(DbSv sv,
+ PrController controller,
+ AlarmVo alarmVo){
+ if(alarmVo != null){
+ if(alarmVo.statePump != null && alarmVo.statePump.byteValue() == 0){
+ //闃�闂ㄥ叧闂姸鎬�
+ if(controller != null && controller.getIntakeId() != null){
+ //铏氭嫙鍗″湪鍙栨按涓殑鍗犵敤鐘舵�佹敼涓洪潪搴旂敤鐘舵��
+ sv.updateVirCardNoUseState(controller.getIntakeId());
+ }
+ }
+ }
+
+ }
}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/RtuDataDealTree.xml b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/RtuDataDealTree.xml
index 2a2e499..44a35aa 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/RtuDataDealTree.xml
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/RtuDataDealTree.xml
@@ -39,7 +39,7 @@
<!-- 璇嗗埆闈炲懡浠ゅ簲绛斾笂琛屾暟鎹� -->
<task id="TkFindReportV202404" name="璇嗗埆闈炲懡浠ゅ簲绛斾笂琛屾暟鎹�" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkFindReportV202404">
<task id="TkDealAlarmStatusV202404" name="鎺у埗鍣ㄦ姤璀︿笌鐘舵�佹暟鎹�" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkDealAlarmStatusV202404" />
- <task id="TkDealTimingReportV202404" name="鎺у埗鍣ㄥ畾鐐逛笂鎶ユ暟鎹�" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkDealTimingReportV202404" />
+ <task id="TkDealTimingReportV202404" name="鎺у埗鍣ㄥ畾鏃朵笂鎶ユ暟鎹�" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkDealTimingReportV202404" />
</task>
<!-- 璇嗗埆鍛戒护鍝嶅簲鏁版嵁 -->
<task id="TkFindComResponseV202404" name="璇嗗埆鍝嶅簲鍛戒护鏁版嵁" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkFindComResponseV202404">
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/log4j2.yml b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/log4j2.yml
index afbac2b..91e1a72 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/log4j2.yml
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/log4j2.yml
@@ -9,7 +9,7 @@
value: ./logs
#鏃ュ織鏂囦欢瀛樺偍鍚嶇О
- name: project.name
- value: aceMw
+ value: rtuMw
#瀹氫箟杈撳嚭鍣紝鍙互杈撳嚭鍒版帶鍒跺彴鍜屾枃浠�.
Appenders:
@@ -64,10 +64,10 @@
- ref: ROLLING_FILE #杈撳嚭鏃ュ織鏃讹紝棣栧厛鐢辨湰level鍒ゆ柇鏄惁杈撳嚭锛岀劧鍚庡啀鐢变笂闈㈢殑Appenders.RollingFile.ThresholdFilter.level鍒ゆ柇鏄惁杈撳嚭
# 涓虹被鍖呰矾寰勯厤缃壒娈婄殑Log绾у埆锛屾柟渚胯皟璇曪紝
# 涓嶅彈Loggers.Root.level闄愬埗
- Logger:
- - name: com.dy.pipIrrGlobal.daoBa
- additivity: false #鍘婚櫎閲嶅鐨刲og
- level: debug #杈撳嚭鏃ュ織绾у埆
- AppenderRef:
- - ref: CONSOLE #杈撳嚭鏃ュ織鏃讹紝棣栧厛鐢辨湰.level鍒ゆ柇鏄惁杈撳嚭锛岀劧鍚庡啀鐢变笂闈㈢殑Appenders.Console.ThresholdFilter.level鍒ゆ柇鏄惁杈撳嚭
- - ref: ROLLING_FILE #杈撳嚭鏃ュ織鏃讹紝棣栧厛鐢辨湰level鍒ゆ柇鏄惁杈撳嚭锛岀劧鍚庡啀鐢变笂闈㈢殑Appenders.RollingFile.ThresholdFilter.level鍒ゆ柇鏄惁杈撳嚭
+ # Logger:
+ # - name: com.dy.pipIrrGlobal.daoBa
+ # additivity: false #鍘婚櫎閲嶅鐨刲og
+ # level: debug #杈撳嚭鏃ュ織绾у埆
+ # AppenderRef:
+ # - ref: CONSOLE #杈撳嚭鏃ュ織鏃讹紝棣栧厛鐢辨湰.level鍒ゆ柇鏄惁杈撳嚭锛岀劧鍚庡啀鐢变笂闈㈢殑Appenders.Console.ThresholdFilter.level鍒ゆ柇鏄惁杈撳嚭
+ # - ref: ROLLING_FILE #杈撳嚭鏃ュ織鏃讹紝棣栧厛鐢辨湰level鍒ゆ柇鏄惁杈撳嚭锛岀劧鍚庡啀鐢变笂闈㈢殑Appenders.RollingFile.ThresholdFilter.level鍒ゆ柇鏄惁杈撳嚭
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/CodeLocal.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/CodeLocal.java
new file mode 100644
index 0000000..e6c29c8
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/CodeLocal.java
@@ -0,0 +1,11 @@
+package com.dy.pipIrrMwTestWeb.test;
+
+public class CodeLocal {
+
+ public static final String clock = "LCD0000" ;//鏌ヨ鐩戞帶涓棿浠舵椂閽�
+
+ public static final String onLine = "LCD0001" ;//鏌ヨ鎵�鏈塕TU鍦ㄧ嚎鎯呭喌
+
+ public static final String allProtocols = "LCD0100" ;//鏌ヨ鎵�鏈夊崗璁厤缃�
+
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/CommandP206V100Ctrl.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/CommandP206V100Ctrl.java
index eb74c3d..cff7e63 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/CommandP206V100Ctrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/CommandP206V100Ctrl.java
@@ -1,6 +1,9 @@
package com.dy.pipIrrMwTestWeb.test;
+import com.dy.common.mw.protocol.Command;
+import com.dy.common.mw.protocol.CommandType;
import com.dy.common.mw.protocol.p206V1_0_0.CodeV1_0_1;
+import com.dy.common.mw.protocol.p206V1_0_0.ProtocolConstantV206V1_0_0;
import com.dy.common.mw.protocol.p206V1_0_0.downVos.Com97Vo;
import com.dy.common.mw.protocol.p206V1_0_0.downVos.Com98Vo;
import com.dy.common.webUtil.BaseResponse;
@@ -23,8 +26,9 @@
@GetMapping(path = "test")
public BaseResponse<String> test() {
//return this.connect() ;//杩炴帴閫氫俊涓棿浠舵祴璇�
- return this.cd97() ;
+ //return this.cd97() ;
//return this.cd98() ;
+ return this.online() ;
}
/**
@@ -50,6 +54,16 @@
comVo.icCardNo = CommandP206V100Ctrl.icCardNo ;
return this.sendCom2Mw(this.command(CodeV1_0_1.cd_98, comVo, null)) ;
}
+ //鍦ㄧ嚎鎯呭喌
+ private BaseResponse online(){
+ Command com = new Command() ;
+ com.id = Command.defaultId;//瀹為檯搴旂敤涓紝鏇挎崲鎴愭暟鎹簱璁板綍id
+ com.protocol = ProtocolConstantV206V1_0_0.protocolName ;
+ com.code = CodeLocal.onLine ;
+ com.type = CommandType.innerCommand ;
+ com.rtuResultSendWebUrl = rtuResultSendWebUrl ;
+ return this.sendCom2Mw(com) ;
+ }
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictCtrl.java
index 8a41586..de48d21 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictCtrl.java
@@ -30,19 +30,20 @@
@Slf4j
@Tag(name = "琛屾斂鍖哄垝绠＄悊", description = "琛屾斂鍖哄垝澧炲垹鏀规煡绛夋搷浣�")
@RestController
-@RequestMapping(path="district")
+@RequestMapping(path = "district")
@SuppressWarnings("unchecked")//java鐗堟湰瓒婇珮锛屽娉涘瀷绾︽潫瓒婁弗锛屾墍浠ラ厤缃甋uppressWarnings("unchecked")
public class DistrictCtrl {
- private DistrictSv sv ;
+ private DistrictSv sv;
@Autowired
- private void setSv(DistrictSv sv){
- this.sv = sv ;
+ private void setSv(DistrictSv sv) {
+ this.sv = sv;
}
/**
* 瀹㈡埛绔姹傚緱鍒版墍鏈夎鏀垮尯鍒掔骇鍒暟鎹�
+ *
* @return 鎵�鏈夎鏀垮尯鍒掔骇鍒暟鎹�
*/
@Operation(summary = "琛屾斂鍖哄垝绾у埆", description = "杩斿洖鎵�鏈夎鏀垮尯鍒掔骇鍒暟鎹�")
@@ -55,13 +56,14 @@
)
})
@GetMapping(path = "allLevel")
- public BaseResponse<List<DistrictLevel>> allDistrictLevels(){
+ public BaseResponse<List<DistrictLevel>> allDistrictLevels() {
//List<DistrictLevel> list = Arrays.asList(DistrictLevel.City, DistrictLevel.County, DistrictLevel.Town, DistrictLevel.Village) ;
return BaseResponseUtils.buildSuccess(DistrictLevel.LevelList);
}
/**
* 瀹㈡埛绔姹傚緱鍒版墍鏈夎鏀垮尯鏁版嵁
+ *
* @return 鎵�鏈夎鏀垮尯鏁版嵁
*/
@Operation(summary = "鑾峰緱鎵�鏈夎鏀垮尯", description = "杩斿洖鎵�鏈夎鏀垮尯鏁版嵁")
@@ -75,13 +77,14 @@
})
@GetMapping(path = "all")
@SsoAop()
- public BaseResponse<List<BaDistrict>> all(){
- List<BaDistrict> list = this.sv.selectAllByLevel(DistrictLevel.City.code) ;
+ public BaseResponse<List<BaDistrict>> all() {
+ List<BaDistrict> list = this.sv.selectAllByLevel(DistrictLevel.City.code);
return BaseResponseUtils.buildSuccess(list);
}
/**
* 寰楀埌涓�涓鏀垮尯鏁版嵁
+ *
* @return 涓�涓鏀垮尯鏁版嵁
*/
@Operation(summary = "涓�涓鏀垮尯", description = "寰楀埌涓�涓鏀垮尯鏁版嵁")
@@ -95,12 +98,13 @@
})
@GetMapping(path = "one", consumes = MediaType.TEXT_PLAIN_VALUE)
@SsoAop()
- public BaseResponse<BaDistrict> one(Long id){
+ public BaseResponse<BaDistrict> one(Long id) {
return BaseResponseUtils.buildSuccess(this.sv.selectById(id));
}
/**
* 淇濆瓨琛屾斂鍖�
+ *
* @param vo 淇濆瓨琛屾斂鍖篺orm琛ㄥ崟瀵硅薄
* @return 鏄惁鎴愬姛
*/
@@ -115,34 +119,35 @@
})
@PostMapping(path = "save", consumes = MediaType.APPLICATION_JSON_VALUE)
@SsoAop()
- public BaseResponse<Boolean> save(@RequestBody @Valid DistrictVo vo, BindingResult bindingResult){
- if(bindingResult != null && bindingResult.hasErrors()){
+ public BaseResponse<Boolean> save(@RequestBody @Valid DistrictVo vo, BindingResult bindingResult) {
+ if (bindingResult != null && bindingResult.hasErrors()) {
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
BaDistrict po = DistrictVoMapper.INSTANCT.convert(vo);
int count;
try {
- BaDistrict supperPo = this.sv.selectById(po.supperId) ;
- if(supperPo == null){
- return BaseResponseUtils.buildFail("鍑洪敊锛屾湭寰楀埌涓婄骇琛屾斂鍖�") ;
- }else{
+ BaDistrict supperPo = this.sv.selectById(po.supperId);
+ if (supperPo == null) {
+ return BaseResponseUtils.buildFail("鍑洪敊锛屾湭寰楀埌涓婄骇琛屾斂鍖�");
+ } else {
po.level = DistrictLevel.get((byte)(supperPo.level.code + 1)) ;
}
- po.deleted = Deleted.NO ;
+ po.deleted = Deleted.NO;
count = this.sv.save(po);
} catch (Exception e) {
log.error("淇濆瓨琛屾斂鍖哄紓甯�", e);
- return BaseResponseUtils.buildException(e.getMessage()) ;
+ return BaseResponseUtils.buildException(e.getMessage());
}
- if(count <= 0){
- return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�") ;
- }else{
- return BaseResponseUtils.buildSuccess(true) ;
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
}
}
/**
* 缂栬緫淇敼琛屾斂鍖�
+ *
* @param vo 淇濆瓨琛屾斂鍖篺orm琛ㄥ崟瀵硅薄
* @return 鏄惁鎴愬姛
*/
@@ -157,8 +162,8 @@
})
@PostMapping(path = "update", consumes = MediaType.APPLICATION_JSON_VALUE)
@SsoAop()
- public BaseResponse<Boolean> update(@RequestBody @Valid DistrictVo vo, BindingResult bindingResult){
- if(bindingResult != null && bindingResult.hasErrors()){
+ public BaseResponse<Boolean> update(@RequestBody @Valid DistrictVo vo, BindingResult bindingResult) {
+ if (bindingResult != null && bindingResult.hasErrors()) {
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
BaDistrict po = DistrictVoMapper.INSTANCT.convert(vo);
@@ -167,18 +172,19 @@
count = this.sv.update(po);
} catch (Exception e) {
log.error("淇濆瓨琛屾斂鍖哄紓甯�", e);
- return BaseResponseUtils.buildException(e.getMessage()) ;
+ return BaseResponseUtils.buildException(e.getMessage());
}
- if(count <= 0){
- return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�") ;
- }else{
- return BaseResponseUtils.buildSuccess(true) ;
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
}
}
/**
* 鍒犻櫎琛屾斂鍖�
+ *
* @param id 琛屾斂鍖篒D
* @return 鏄惁鎴愬姛
*/
@@ -191,28 +197,29 @@
schema = @Schema(implementation = Boolean.class))}
)
})
- @GetMapping(path = "delete", consumes = MediaType.TEXT_PLAIN_VALUE)
+ @GetMapping(path = "delete")
@SsoAop()
- public BaseResponse<Boolean> delete(Long id){
- if(id == null){
- return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖") ;
+ public BaseResponse<Boolean> delete(Long id) {
+ if (id == null) {
+ return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖");
}
int count;
try {
count = this.sv.delete(id);
} catch (Exception e) {
log.error("淇濆瓨琛屾斂鍖哄紓甯�", e);
- return BaseResponseUtils.buildException(e.getMessage()) ;
+ return BaseResponseUtils.buildException(e.getMessage());
}
- if(count <= 0){
- return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�") ;
- }else{
- return BaseResponseUtils.buildSuccess(true) ;
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
}
}
/**
* 鏍规嵁绾у埆鑾峰彇琛屾斂鍖哄垝鍒楄〃
+ *
* @param id
* @return
*/
@@ -227,20 +234,21 @@
})
@GetMapping(path = "/level/{id}")
@SsoAop()
- public BaseResponse<QueryResultVo<List<Map<String, Object>>>> getDistrictgsByLevel(@PathVariable("id") Integer id){
- if(id == null || id <= 0){
- return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖") ;
+ public BaseResponse<QueryResultVo<List<Map<String, Object>>>> getDistrictgsByLevel(@PathVariable("id") Integer id) {
+ if (id == null || id <= 0) {
+ return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖");
}
List<Map<String, Object>> map_Districts = Optional.ofNullable(sv.getDistrictgsByLevel(id)).orElse(new ArrayList<>());
- if(map_Districts == null || map_Districts.size() == 0) {
- return BaseResponseUtils.buildFail("鎮ㄨ緭鍏ョ殑灞傜骇鏈夎") ;
+ if (map_Districts == null || map_Districts.size() == 0) {
+ return BaseResponseUtils.buildFail("鎮ㄨ緭鍏ョ殑灞傜骇鏈夎");
}
return BaseResponseUtils.buildSuccess(map_Districts);
}
/**
* 鏍规嵁鐖禝D鑾峰彇琛屾斂鍖哄垝鍒楄〃
+ *
* @param supperId
* @return
*/
@@ -255,20 +263,21 @@
})
@GetMapping(path = "/supperid/{supperId}")
@SsoAop()
- public BaseResponse<QueryResultVo<List<Map<String, Object>>>> getDistrictsBySupperId(@PathVariable("supperId") Long supperId){
- if(supperId == null || supperId <= 0){
- return BaseResponseUtils.buildFail("鐖禝D涓嶈兘涓虹┖") ;
+ public BaseResponse<QueryResultVo<List<Map<String, Object>>>> getDistrictsBySupperId(@PathVariable("supperId") Long supperId) {
+ if (supperId == null || supperId <= 0) {
+ return BaseResponseUtils.buildFail("鐖禝D涓嶈兘涓虹┖");
}
List<Map<String, Object>> map_Districts = Optional.ofNullable(sv.getDistrictsBySupperId(supperId)).orElse(new ArrayList<>());
- if(map_Districts == null || map_Districts.size() == 0) {
- return BaseResponseUtils.buildFail("鎮ㄨ緭鍏ョ殑鐖剁骇ID鏈夎") ;
+ if (map_Districts == null || map_Districts.size() == 0) {
+ return BaseResponseUtils.buildFail("鎮ㄨ緭鍏ョ殑鐖剁骇ID鏈夎");
}
return BaseResponseUtils.buildSuccess(map_Districts);
}
/**
* 鑾峰彇涓夌骇琛屾斂鍖哄垝
+ *
* @return 鍘块晣鏉戜笁绾ц鏀垮尯鍒�
*/
@GetMapping(path = "/three")
@@ -279,35 +288,35 @@
JSONArray array_villages = new JSONArray();
List<Map<String, Object>> list_counties = Optional.ofNullable(sv.getDistrictgsByLevel(2)).orElse(new ArrayList<>());
- if(list_counties.size() > 0) {
+ if (list_counties.size() > 0) {
array_counties = JSONArray.parseArray(JSON.toJSONString(list_counties));
// 閬嶅巻姣忎竴涓幙锛屽皢鍘夸笅鐨勯晣鏉戝姞鍒板幙鐨勫瓙闆�
- for(int i = 0; i < array_counties.size(); i++) {
+ for (int i = 0; i < array_counties.size(); i++) {
JSONObject job_county = array_counties.getJSONObject(i);
- Long countyId = job_county.getLong("id");
- List<Map<String, Object>> list_towns = Optional.ofNullable(sv.getDistrictsBySupperId(countyId)).orElse(new ArrayList<>());
- if(list_towns.size() > 0) {
- array_towns = JSONArray.parseArray(JSON.toJSONString(list_towns));
- // 閬嶅巻姣忎竴涓晣锛屽皢闀囦笅鏉戝垪琛ㄥ姞鍒伴晣鐨勫瓙闆�
- for(int j = 0; j < array_towns.size(); j++) {
- JSONObject job_town = array_towns.getJSONObject(j);
- Long townId = job_town.getLong("id");
- List<Map<String, Object>> list_villages = Optional.ofNullable(sv.getDistrictsBySupperId(townId)).orElse(new ArrayList<>());
- if(list_villages.size() > 0) {
- array_villages = JSONArray.parseArray(JSON.toJSONString(list_villages));
- job_town.put("children", array_villages);
- }
+ Long countyId = job_county.getLong("id");
+ List<Map<String, Object>> list_towns = Optional.ofNullable(sv.getDistrictsBySupperId(countyId)).orElse(new ArrayList<>());
+ if (list_towns.size() > 0) {
+ array_towns = JSONArray.parseArray(JSON.toJSONString(list_towns));
+ // 閬嶅巻姣忎竴涓晣锛屽皢闀囦笅鏉戝垪琛ㄥ姞鍒伴晣鐨勫瓙闆�
+ for (int j = 0; j < array_towns.size(); j++) {
+ JSONObject job_town = array_towns.getJSONObject(j);
+ Long townId = job_town.getLong("id");
+ List<Map<String, Object>> list_villages = Optional.ofNullable(sv.getDistrictsBySupperId(townId)).orElse(new ArrayList<>());
+ if (list_villages.size() > 0) {
+ array_villages = JSONArray.parseArray(JSON.toJSONString(list_villages));
+ job_town.put("children", array_villages);
}
- //System.out.println("----" + array_towns);
}
- // 闀囨潙缁勮瀹屾瘯锛屽皢闀囨潙鍔犲埌鍘夸笅
- job_county.put("children", array_towns);
+ //System.out.println("----" + array_towns);
+ }
+ // 闀囨潙缁勮瀹屾瘯锛屽皢闀囨潙鍔犲埌鍘夸笅
+ job_county.put("children", array_towns);
}
// 鍘跨粍瑁呭畬姣�
//String a = array_counties.toJSONString();
//System.out.println(a);
return BaseResponseUtils.buildSuccess(array_counties);
- }else {
+ } else {
return BaseResponseUtils.buildFail("鍘跨骇琛屾斂鍖哄垝涓嶅瓨鍦�");
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/.gitignore b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/.gitignore
deleted file mode 100644
index a80eabd..0000000
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/.gitignore
+++ /dev/null
@@ -1,34 +0,0 @@
-HELP.md
-target/
-/pipIrr-web-demo.iml
-!.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**/target/
-!**/src/test/**/target/
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### VS Code ###
-.vscode/
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/.mvn/wrapper/maven-wrapper.jar b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/.mvn/wrapper/maven-wrapper.jar
deleted file mode 100644
index cb28b0e..0000000
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/.mvn/wrapper/maven-wrapper.jar
+++ /dev/null
Binary files differ
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/.mvn/wrapper/maven-wrapper.properties b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/.mvn/wrapper/maven-wrapper.properties
deleted file mode 100644
index 5f0536e..0000000
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/.mvn/wrapper/maven-wrapper.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/logs/pipIrrDemo.log b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/logs/pipIrrDemo.log
deleted file mode 100644
index e69de29..0000000
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/logs/pipIrrDemo.log
+++ /dev/null
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/mvnw b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/mvnw
deleted file mode 100644
index 66df285..0000000
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/mvnw
+++ /dev/null
@@ -1,308 +0,0 @@
-#!/bin/sh
-# ----------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# ----------------------------------------------------------------------------
-
-# ----------------------------------------------------------------------------
-# Apache Maven Wrapper startup batch script, version 3.2.0
-#
-# Required ENV vars:
-# ------------------
-# JAVA_HOME - location of a JDK home dir
-#
-# Optional ENV vars
-# -----------------
-# MAVEN_OPTS - parameters passed to the Java VM when running Maven
-# e.g. to debug Maven itself, use
-# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
-# ----------------------------------------------------------------------------
-
-if [ -z "$MAVEN_SKIP_RC" ] ; then
-
- if [ -f /usr/local/etc/mavenrc ] ; then
- . /usr/local/etc/mavenrc
- fi
-
- if [ -f /etc/mavenrc ] ; then
- . /etc/mavenrc
- fi
-
- if [ -f "$HOME/.mavenrc" ] ; then
- . "$HOME/.mavenrc"
- fi
-
-fi
-
-# OS specific support. $var _must_ be set to either true or false.
-cygwin=false;
-darwin=false;
-mingw=false
-case "$(uname)" in
- CYGWIN*) cygwin=true ;;
- MINGW*) mingw=true;;
- Darwin*) darwin=true
- # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
- # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
- if [ -z "$JAVA_HOME" ]; then
- if [ -x "/usr/libexec/java_home" ]; then
- JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME
- else
- JAVA_HOME="/Library/Java/Home"; export JAVA_HOME
- fi
- fi
- ;;
-esac
-
-if [ -z "$JAVA_HOME" ] ; then
- if [ -r /etc/gentoo-release ] ; then
- JAVA_HOME=$(java-config --jre-home)
- fi
-fi
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
- [ -n "$JAVA_HOME" ] &&
- JAVA_HOME=$(cygpath --unix "$JAVA_HOME")
- [ -n "$CLASSPATH" ] &&
- CLASSPATH=$(cygpath --path --unix "$CLASSPATH")
-fi
-
-# For Mingw, ensure paths are in UNIX format before anything is touched
-if $mingw ; then
- [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] &&
- JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit 1); pwd)"
-fi
-
-if [ -z "$JAVA_HOME" ]; then
- javaExecutable="$(which javac)"
- if [ -n "$javaExecutable" ] && ! [ "$(expr "\"$javaExecutable\"" : '\([^ ]*\)')" = "no" ]; then
- # readlink(1) is not available as standard on Solaris 10.
- readLink=$(which readlink)
- if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then
- if $darwin ; then
- javaHome="$(dirname "\"$javaExecutable\"")"
- javaExecutable="$(cd "\"$javaHome\"" && pwd -P)/javac"
- else
- javaExecutable="$(readlink -f "\"$javaExecutable\"")"
- fi
- javaHome="$(dirname "\"$javaExecutable\"")"
- javaHome=$(expr "$javaHome" : '\(.*\)/bin')
- JAVA_HOME="$javaHome"
- export JAVA_HOME
- fi
- fi
-fi
-
-if [ -z "$JAVACMD" ] ; then
- if [ -n "$JAVA_HOME" ] ; then
- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
- # IBM's JDK on AIX uses strange locations for the executables
- JAVACMD="$JAVA_HOME/jre/sh/java"
- else
- JAVACMD="$JAVA_HOME/bin/java"
- fi
- else
- JAVACMD="$(\unset -f command 2>/dev/null; \command -v java)"
- fi
-fi
-
-if [ ! -x "$JAVACMD" ] ; then
- echo "Error: JAVA_HOME is not defined correctly." >&2
- echo " We cannot execute $JAVACMD" >&2
- exit 1
-fi
-
-if [ -z "$JAVA_HOME" ] ; then
- echo "Warning: JAVA_HOME environment variable is not set."
-fi
-
-# traverses directory structure from process work directory to filesystem root
-# first directory with .mvn subdirectory is considered project base directory
-find_maven_basedir() {
- if [ -z "$1" ]
- then
- echo "Path not specified to find_maven_basedir"
- return 1
- fi
-
- basedir="$1"
- wdir="$1"
- while [ "$wdir" != '/' ] ; do
- if [ -d "$wdir"/.mvn ] ; then
- basedir=$wdir
- break
- fi
- # workaround for JBEAP-8937 (on Solaris 10/Sparc)
- if [ -d "${wdir}" ]; then
- wdir=$(cd "$wdir/.." || exit 1; pwd)
- fi
- # end of workaround
- done
- printf '%s' "$(cd "$basedir" || exit 1; pwd)"
-}
-
-# concatenates all lines of a file
-concat_lines() {
- if [ -f "$1" ]; then
- # Remove \r in case we run on Windows within Git Bash
- # and check out the repository with auto CRLF management
- # enabled. Otherwise, we may read lines that are delimited with
- # \r\n and produce $'-Xarg\r' rather than -Xarg due to word
- # splitting rules.
- tr -s '\r\n' ' ' < "$1"
- fi
-}
-
-log() {
- if [ "$MVNW_VERBOSE" = true ]; then
- printf '%s\n' "$1"
- fi
-}
-
-BASE_DIR=$(find_maven_basedir "$(dirname "$0")")
-if [ -z "$BASE_DIR" ]; then
- exit 1;
-fi
-
-MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR
-log "$MAVEN_PROJECTBASEDIR"
-
-##########################################################################################
-# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
-# This allows using the maven wrapper in projects that prohibit checking in binary data.
-##########################################################################################
-wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar"
-if [ -r "$wrapperJarPath" ]; then
- log "Found $wrapperJarPath"
-else
- log "Couldn't find $wrapperJarPath, downloading it ..."
-
- if [ -n "$MVNW_REPOURL" ]; then
- wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
- else
- wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
- fi
- while IFS="=" read -r key value; do
- # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' )
- safeValue=$(echo "$value" | tr -d '\r')
- case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;;
- esac
- done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties"
- log "Downloading from: $wrapperUrl"
-
- if $cygwin; then
- wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath")
- fi
-
- if command -v wget > /dev/null; then
- log "Found wget ... using wget"
- [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet"
- if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
- wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
- else
- wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
- fi
- elif command -v curl > /dev/null; then
- log "Found curl ... using curl"
- [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent"
- if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
- curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath"
- else
- curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath"
- fi
- else
- log "Falling back to using Java to download"
- javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java"
- javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class"
- # For Cygwin, switch paths to Windows format before running javac
- if $cygwin; then
- javaSource=$(cygpath --path --windows "$javaSource")
- javaClass=$(cygpath --path --windows "$javaClass")
- fi
- if [ -e "$javaSource" ]; then
- if [ ! -e "$javaClass" ]; then
- log " - Compiling MavenWrapperDownloader.java ..."
- ("$JAVA_HOME/bin/javac" "$javaSource")
- fi
- if [ -e "$javaClass" ]; then
- log " - Running MavenWrapperDownloader.java ..."
- ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath"
- fi
- fi
- fi
-fi
-##########################################################################################
-# End of extension
-##########################################################################################
-
-# If specified, validate the SHA-256 sum of the Maven wrapper jar file
-wrapperSha256Sum=""
-while IFS="=" read -r key value; do
- case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;;
- esac
-done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties"
-if [ -n "$wrapperSha256Sum" ]; then
- wrapperSha256Result=false
- if command -v sha256sum > /dev/null; then
- if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c > /dev/null 2>&1; then
- wrapperSha256Result=true
- fi
- elif command -v shasum > /dev/null; then
- if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c > /dev/null 2>&1; then
- wrapperSha256Result=true
- fi
- else
- echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available."
- echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties."
- exit 1
- fi
- if [ $wrapperSha256Result = false ]; then
- echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2
- echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2
- echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2
- exit 1
- fi
-fi
-
-MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
- [ -n "$JAVA_HOME" ] &&
- JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME")
- [ -n "$CLASSPATH" ] &&
- CLASSPATH=$(cygpath --path --windows "$CLASSPATH")
- [ -n "$MAVEN_PROJECTBASEDIR" ] &&
- MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR")
-fi
-
-# Provide a "standardized" way to retrieve the CLI args that will
-# work with both Windows and non-Windows executions.
-MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*"
-export MAVEN_CMD_LINE_ARGS
-
-WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-
-# shellcheck disable=SC2086 # safe args
-exec "$JAVACMD" \
- $MAVEN_OPTS \
- $MAVEN_DEBUG_OPTS \
- -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
- "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
- ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/mvnw.cmd b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/mvnw.cmd
deleted file mode 100644
index 95ba6f5..0000000
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/mvnw.cmd
+++ /dev/null
@@ -1,205 +0,0 @@
-@REM ----------------------------------------------------------------------------
-@REM Licensed to the Apache Software Foundation (ASF) under one
-@REM or more contributor license agreements. See the NOTICE file
-@REM distributed with this work for additional information
-@REM regarding copyright ownership. The ASF licenses this file
-@REM to you under the Apache License, Version 2.0 (the
-@REM "License"); you may not use this file except in compliance
-@REM with the License. You may obtain a copy of the License at
-@REM
-@REM https://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM Unless required by applicable law or agreed to in writing,
-@REM software distributed under the License is distributed on an
-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM KIND, either express or implied. See the License for the
-@REM specific language governing permissions and limitations
-@REM under the License.
-@REM ----------------------------------------------------------------------------
-
-@REM ----------------------------------------------------------------------------
-@REM Apache Maven Wrapper startup batch script, version 3.2.0
-@REM
-@REM Required ENV vars:
-@REM JAVA_HOME - location of a JDK home dir
-@REM
-@REM Optional ENV vars
-@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
-@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
-@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
-@REM e.g. to debug Maven itself, use
-@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
-@REM ----------------------------------------------------------------------------
-
-@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
-@echo off
-@REM set title of command window
-title %0
-@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
-@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
-
-@REM set %HOME% to equivalent of $HOME
-if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
-
-@REM Execute a user defined script before this one
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
-@REM check for pre script, once with legacy .bat ending and once with .cmd ending
-if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %*
-if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %*
-:skipRcPre
-
-@setlocal
-
-set ERROR_CODE=0
-
-@REM To isolate internal variables from possible post scripts, we use another setlocal
-@setlocal
-
-@REM ==== START VALIDATION ====
-if not "%JAVA_HOME%" == "" goto OkJHome
-
-echo.
-echo Error: JAVA_HOME not found in your environment. >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-:OkJHome
-if exist "%JAVA_HOME%\bin\java.exe" goto init
-
-echo.
-echo Error: JAVA_HOME is set to an invalid directory. >&2
-echo JAVA_HOME = "%JAVA_HOME%" >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-@REM ==== END VALIDATION ====
-
-:init
-
-@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
-@REM Fallback to current working directory if not found.
-
-set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
-IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
-
-set EXEC_DIR=%CD%
-set WDIR=%EXEC_DIR%
-:findBaseDir
-IF EXIST "%WDIR%"\.mvn goto baseDirFound
-cd ..
-IF "%WDIR%"=="%CD%" goto baseDirNotFound
-set WDIR=%CD%
-goto findBaseDir
-
-:baseDirFound
-set MAVEN_PROJECTBASEDIR=%WDIR%
-cd "%EXEC_DIR%"
-goto endDetectBaseDir
-
-:baseDirNotFound
-set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
-cd "%EXEC_DIR%"
-
-:endDetectBaseDir
-
-IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
-
-@setlocal EnableExtensions EnableDelayedExpansion
-for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
-@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
-
-:endReadAdditionalConfig
-
-SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
-set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
-set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-
-set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
-
-FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
- IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B
-)
-
-@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
-@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
-if exist %WRAPPER_JAR% (
- if "%MVNW_VERBOSE%" == "true" (
- echo Found %WRAPPER_JAR%
- )
-) else (
- if not "%MVNW_REPOURL%" == "" (
- SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
- )
- if "%MVNW_VERBOSE%" == "true" (
- echo Couldn't find %WRAPPER_JAR%, downloading it ...
- echo Downloading from: %WRAPPER_URL%
- )
-
- powershell -Command "&{"^
- "$webclient = new-object System.Net.WebClient;"^
- "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
- "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
- "}"^
- "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^
- "}"
- if "%MVNW_VERBOSE%" == "true" (
- echo Finished downloading %WRAPPER_JAR%
- )
-)
-@REM End of extension
-
-@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file
-SET WRAPPER_SHA_256_SUM=""
-FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
- IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B
-)
-IF NOT %WRAPPER_SHA_256_SUM%=="" (
- powershell -Command "&{"^
- "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^
- "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^
- " Write-Output 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^
- " Write-Output 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^
- " Write-Output 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^
- " exit 1;"^
- "}"^
- "}"
- if ERRORLEVEL 1 goto error
-)
-
-@REM Provide a "standardized" way to retrieve the CLI args that will
-@REM work with both Windows and non-Windows executions.
-set MAVEN_CMD_LINE_ARGS=%*
-
-%MAVEN_JAVA_EXE% ^
- %JVM_CONFIG_MAVEN_PROPS% ^
- %MAVEN_OPTS% ^
- %MAVEN_DEBUG_OPTS% ^
- -classpath %WRAPPER_JAR% ^
- "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
- %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
-if ERRORLEVEL 1 goto error
-goto end
-
-:error
-set ERROR_CODE=1
-
-:end
-@endlocal & set ERROR_CODE=%ERROR_CODE%
-
-if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost
-@REM check for post script, once with legacy .bat ending and once with .cmd ending
-if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat"
-if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd"
-:skipRcPost
-
-@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
-if "%MAVEN_BATCH_PAUSE%"=="on" pause
-
-if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE%
-
-cmd /C exit /B %ERROR_CODE%
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/pom.xml b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/pom.xml
deleted file mode 100644
index ae0ed8e..0000000
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/pom.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>pipIrr-web</artifactId>
- <groupId>com.dy</groupId>
- <version>1.0.0</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <packaging>jar</packaging>
- <artifactId>pipIrr-web-demo</artifactId>
- <name>pipIrr-web-demo</name>
- <description>web寮�鍙戞紨绀虹郴缁燂紝婕旂ず绀轰緥</description>
-
-
-</project>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/PipIrrDemoApplication.java b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/PipIrrDemoApplication.java
deleted file mode 100644
index 06eeafc..0000000
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/PipIrrDemoApplication.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.dy.pipIrrDemo;
-
-import com.dy.common.multiDataSource.EnableMultiDataSource;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.EnableAspectJAutoProxy;
-import org.springframework.context.annotation.FilterType;
-
-@SpringBootApplication
-@EnableAspectJAutoProxy
-@EnableMultiDataSource
-@ComponentScan(basePackages = {"com.dy.common", "com.dy.pipIrrGlobal", "com.dy.pipIrrDemo"},
- excludeFilters = {
- @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = {
- com.dy.common.singleDataSource.DruidDataSourceConfig.class //鎺掗櫎鍗曟暟鎹簮
- })
- }
-)
-@MapperScan(basePackages={"com.dy.pipIrrGlobal.daoDemo"})
-public class PipIrrDemoApplication {
-
- public static void main(String[] args) {
- SpringApplication.run(PipIrrDemoApplication.class, args);
- }
-
-}
-
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/auth/AuthCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/auth/AuthCtrl.java
deleted file mode 100644
index 84661c6..0000000
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/auth/AuthCtrl.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.dy.pipIrrDemo.auth;
-
-
-import com.dy.common.webUtil.BaseResponse;
-import com.dy.common.webUtil.BaseResponseUtils;
-import com.dy.pipIrrGlobal.pojoDemo.DemoAuth;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-@Slf4j
-@RestController
-@RequestMapping(path="auth")
-@SuppressWarnings("unchecked")
-public class AuthCtrl {
-
- @Autowired
- AuthSv sv ;
-
- @GetMapping("selectAll")
- public BaseResponse<DemoAuth> selectAll(){
- try {
- List<DemoAuth> list = sv.selectAll() ;
- return BaseResponseUtils.buildSuccess(list);
- } catch (Exception e) {
- log.error("寰楀埌鎵�鏈塪emo鏉冮檺寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage()) ;
- }
- }
-}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/auth/AuthSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/auth/AuthSv.java
deleted file mode 100644
index 495b6ca..0000000
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/auth/AuthSv.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.dy.pipIrrDemo.auth;
-
-
-import com.dy.pipIrrGlobal.daoDemo.DemoAuthMapper;
-import com.dy.pipIrrGlobal.pojoDemo.DemoAddress;
-import com.dy.pipIrrGlobal.pojoDemo.DemoAuth;
-import com.dy.pipIrrGlobal.pojoDemo.DemoRole;
-import com.dy.pipIrrGlobal.pojoDemo.DemoUser;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-import java.util.List;
-
-@Service
-public class AuthSv {
- @Autowired
- private DemoAuthMapper demoAuthMapper ;
-
- public List<DemoAuth> selectAll() {
- List<DemoAuth> list = this.demoAuthMapper.selectAll() ;
- for(DemoAuth po : list){
- po.date = new Date() ;
- List<DemoRole> roleList = po.getRoleList() ;
- if(roleList != null){
- for(DemoRole rpo : roleList){
- List<DemoUser> userList = rpo.getUserList() ;
- if(userList != null){
- for(DemoUser upo : userList){
- DemoAddress dPo = upo.getAddress() ;
- if(dPo != null){
- System.out.println(dPo.name);
- }
- }
- }
- }
- }
- }
- return list ;
- }
-}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/config/WebFilterConfiguration.java b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/config/WebFilterConfiguration.java
deleted file mode 100644
index c4f1e2e..0000000
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/config/WebFilterConfiguration.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.dy.pipIrrDemo.config;
-
-import com.dy.common.webFilter.DevOfDataSourceNameSetFilter;
-import com.dy.common.webFilter.UserTokenFilter;
-import jakarta.servlet.Filter;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class WebFilterConfiguration {
-
- @Value("${pipIrr.global.dev}")
- public String isDevStage ;//鏄惁涓哄紑鍙戦樁娈�
- @Value("${pipIrr.global.dsName}")
- public String dsName ;//寮�鍙戦樁娈电殑鏁版嵁婧愬悕绉�
-
- /**
- * DevOfDataSourceNameSetFilter涓嶶serTokenFilter鍙兘涓�涓閰嶇疆涓婏紝
- * 鎵�浠ヤ粬浠殑order閮芥槸1
- */
- private static final int order_UserTokenFilter = 1 ;//涓庝笅闈�
- private static final int order_DevOfDataSourceNameSetFilter = 1 ;
-
-
- @Bean
- public FilterRegistrationBean<? extends Filter> RegFilter() {
- FilterRegistrationBean<Filter> filterRegistrationBean = new FilterRegistrationBean<>();
- if(this.isDevStage != null && !this.isDevStage.trim().equals("") && this.isDevStage.trim().equalsIgnoreCase("true")){
- filterRegistrationBean.setFilter(new DevOfDataSourceNameSetFilter());
- filterRegistrationBean.addUrlPatterns("/*");//閰嶇疆杩囨护瑙勫垯
- filterRegistrationBean.addInitParameter("dataSourceName",dsName);//璁剧疆init鍙傛暟
- filterRegistrationBean.setName("DevOfDataSourceNameSetFilter");//璁剧疆杩囨护鍣ㄥ悕绉�
- filterRegistrationBean.setOrder(order_DevOfDataSourceNameSetFilter);//鎵ц娆″簭
- }else{
- filterRegistrationBean.setFilter(new UserTokenFilter());
- filterRegistrationBean.addUrlPatterns("/*");//閰嶇疆杩囨护瑙勫垯
- filterRegistrationBean.setName("UserTokenFilter");//璁剧疆杩囨护鍣ㄥ悕绉�
- filterRegistrationBean.setOrder(order_UserTokenFilter);//鎵ц娆″簭
- }
- return filterRegistrationBean;
- }
-
-}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/config/WebListenerConfiguration.java b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/config/WebListenerConfiguration.java
deleted file mode 100644
index d0dd81a..0000000
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/config/WebListenerConfiguration.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.dy.pipIrrDemo.config;
-
-import com.dy.common.webListener.GenerateIdSetSuffixListener;
-import jakarta.servlet.ServletContextListener;
-import org.springframework.boot.web.servlet.ServletListenerRegistrationBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-//@SuppressWarnings("unchecked")//涓嶅姞缂栬緫鏃惰鍛婏細鈥滀娇鐢ㄤ簡鏈粡妫�鏌ユ垨涓嶅畨鍏ㄧ殑鎿嶄綔銆傗��
-public class WebListenerConfiguration {
-
- /**
- * 鍚姩椤哄簭
- */
- //private static final int order_config = 1 ;
- private static final int order_idSetSuffix = 2 ;
-
-// @Bean
-// public ConfigListener getGlConfigListener(){
-// return new ConfigListener() ;
-// }
-//
-// /**
-// * 澶栭儴鎻愪緵Listener
-// * @param listener 澶栭儴鎻愪緵Listener
-// * @return 娉ㄥ唽Bean
-// */
-// @Bean
-// public ServletListenerRegistrationBean<? extends ServletContextListener> regConfigListener(ConfigListener listener) {
-// ServletListenerRegistrationBean<ConfigListener> listenerRegistrationBean = new ServletListenerRegistrationBean<>();
-// listenerRegistrationBean.setListener(listener);
-// listenerRegistrationBean.setOrder(order_config);
-// return listenerRegistrationBean;
-// }
-
- /**
- * 鍐呴儴鎻愪緵listener
- * @return 娉ㄥ唽Bean
- */
- @Bean
- public ServletListenerRegistrationBean<? extends ServletContextListener> reqSsoListener() {
- ServletListenerRegistrationBean<GenerateIdSetSuffixListener> listenerRegistrationBean = new ServletListenerRegistrationBean<>();
- listenerRegistrationBean.setListener(new GenerateIdSetSuffixListener());
- listenerRegistrationBean.setOrder(order_idSetSuffix);
- return listenerRegistrationBean;
- }
-}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/demo/DemoCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/demo/DemoCtrl.java
deleted file mode 100644
index 6b1c16a..0000000
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/demo/DemoCtrl.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.dy.pipIrrDemo.demo;
-
-import com.dy.common.aop.SsoAop;
-import com.dy.common.springUtil.SpringContextUtil;
-import com.dy.common.multiDataSource.DataSourceContext;
-import com.dy.common.webUtil.BaseResponse;
-import com.dy.common.webUtil.BaseResponseUtils;
-import com.dy.common.webUtil.GlException;
-import com.dy.common.webUtil.ResultCodeMsg;
-import com.dy.pipIrrGlobal.pojoBa.BaUser;
-import com.dy.pipIrrGlobal.pojoDemo.DemoTest;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import io.swagger.v3.oas.annotations.enums.ParameterIn;
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.responses.ApiResponses;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.ApplicationContext;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @Tag 鐢ㄦ潵璁剧疆 Controller 鐨勫悕绉板拰鎻忚堪锛岀被浼间簬缁� Postman 鐨� Collections 鍛藉悕锛�
- * @ApiResponses 鍜� @ApiResponse 鐢ㄦ潵閰嶇疆鍝嶅簲锛�
- * @Operation 鐢ㄦ潵璁剧疆鎺ュ彛鍚嶇О鍜屾弿杩帮紱
- * @Parameter 鐢ㄦ潵璁剧疆璇锋眰鍙傛暟鐨勬弿杩般�佹槸鍚﹀繀濉拰绀轰緥銆�
- */
-//鍦ˋPI涓樉绀猴細 Tag 娉ㄨВ, 缁欐暣涓帴鍙ｈ捣浜嗕釜鍚嶅瓧, 鎻忚堪"
-@Tag(name = "娴嬭瘯鎺ュ彛", description = "娴嬭瘯鏁翠釜妗嗘灦鍙繍琛屾��")
-@RestController
-@RequestMapping(path="demo")
-@SuppressWarnings("unchecked")
-public class DemoCtrl {
-
- @Value("${pipIrr.test}")
- public String test ;
-
- @Value("${pipIrr.demo.name}")
- public String name ;
-
- @Autowired
- public DemoSv demoSv;
-
- //鍦ˋPI涓樉绀猴細 Operation 娉ㄨВ璁剧疆鐨勬帴鍙ｅ悕绉�, 鎺ュ彛鎻忚堪
- @Operation(summary = "涓�娴嬭瘯", description = "娴嬭瘯Get璇锋眰銆佸熀浜庨厤缃緱鍒板緱閰嶇疆椤瑰�笺�佸強鎶涘嚭寮傚父娴嬭瘯")
- //鍦ˋPI涓樉绀猴細 缁欐瘡涓帴鍙ｆ彁渚涗竴涓粯璁ょ殑鍝嶅簲, 鐘舵�佺爜鏄� XXXX, 鎻忚堪鏄� "XXXX",Media type鏄�"application/json锛岃繑鍥瀞chema: BaseResponse json
- @Parameters(value = {
- @Parameter(name = "id", description = "瀹炰綋ID", in = ParameterIn.PATH),
- @Parameter(name = "name", description = "濮撳悕", in = ParameterIn.QUERY)
- })
- @ApiResponses(value = {
- @ApiResponse(
- responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
- description = "杩斿洖瀛楃涓�",
- content = {@Content(mediaType = "text/plain",
- schema = @Schema(implementation = String.class))}
- ),
- @ApiResponse(
- responseCode = ResultCodeMsg.RsCode.ERROR_CODE,
- description = "鍙傛暟濉啓閿欒",
- content = @Content
- )
- })
- @GetMapping("info/{id}/")
- //http://127.0.0.1:8000/demo/demo/info/123234234/?name=寮犱笁
- @SsoAop()
- public BaseResponse<String> info(@PathVariable String id, @RequestParam String name) throws GlException{
- if(name == null || name.trim().equals("")){
- return BaseResponseUtils.buildFail(ResultCodeMsg.RsMsg.ERROR_PARAM);
- }
- ApplicationContext sctx = SpringContextUtil.getApplicationContext() ;
- if(sctx == null){
- throw new GlException("鏈幏寰桽pring 涓婁笅鏂�");
- }
- DataSourceContext.set("ym");
- String str = "" + this.test + "\n" + this.name ;
- String count = demoSv.getCount() ;
- str += "\n 鐢ㄦ埛鏁帮細" + count ;
- if(count.equals("0")){
- throw new GlException("娴嬭瘯鎶涘嚭寮傚父");
- }
- return BaseResponseUtils.buildSuccess(str);
- }
-
- @Operation(summary = "浜屾祴璇�", description = "娴嬭瘯寰楀埌瀹炰綋锛屼娇寰楀疄浣撶殑API鍙")
- //鍦ˋPI涓樉绀猴細 缁欐瘡涓帴鍙ｆ彁渚涗竴涓粯璁ょ殑鍝嶅簲, 鐘舵�佺爜鏄� XXXX, 鎻忚堪鏄� "XXXX",Media type鏄�"application/json锛岃繑鍥瀞chema: BaseResponse json
- @ApiResponses(@ApiResponse(
- responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
- description = "杩斿洖鏁版嵁瀹炰綋",
- content = {@Content(mediaType = "application/json",
- schema = @Schema(implementation = BaseResponse.class))}
- ))
- @PostMapping(value = "test", consumes = "application/json")
- //@RequestMapping(value="test", method = RequestMethod.POST, consumes = "application/json")
- //http://127.0.0.1:8000/demo/demo/test/{"id":123456789,"age":12,"name":"test","tel":"1230987654"}
- public BaseResponse<DemoTest> test(@RequestBody DemoTestVo req){
- DemoTest po = new DemoTest() ;
- po.id = System.currentTimeMillis() ;
- po.name = "寮犱笁" ;
- po.phone = "13912345678" ;
-
- return BaseResponseUtils.buildSuccess(po);
- }
- @Operation(summary = "涓夋祴璇�", description = "娴嬭瘯BaUser")
- //鍦ˋPI涓樉绀猴細 缁欐瘡涓帴鍙ｆ彁渚涗竴涓粯璁ょ殑鍝嶅簲, 鐘舵�佺爜鏄� XXXX, 鎻忚堪鏄� "XXXX",Media type鏄�"application/json锛岃繑鍥瀞chema: BaseResponse json
- @ApiResponses(@ApiResponse(
- responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
- description = "杩斿洖鏁版嵁瀹炰綋",
- content = {@Content(mediaType = "application/json",
- schema = @Schema(implementation = BaseResponse.class))}
- ))
- @GetMapping("test1")
- public BaseResponse<BaUser> test1(){
- BaUser po = new BaUser() ;
- po.id = System.currentTimeMillis() ;
- po.userName = "寮犱笁" ;
- po.phone = "13912345678" ;
-
- return BaseResponseUtils.buildSuccess(po);
- }
-
-
-}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/demo/DemoSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/demo/DemoSv.java
deleted file mode 100644
index 4492294..0000000
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/demo/DemoSv.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.dy.pipIrrDemo.demo;
-
-import com.dy.pipIrrGlobal.daoDemo.DemoTestMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-@Service
-public class DemoSv {
- @Autowired
- private DemoTestMapper demoTestDao;
-
- public String getCount(){
- Integer count = this.demoTestDao.queryCount() ;
- return "" + count ;
- }
-
-
- @Transactional
- public int addAuthAndUser() {
- //int n = this.baUserDao.addAuth(auth);
- //return n + i;
- return 2 ;
- }
-
-}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/demo/DemoTestMapper.java b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/demo/DemoTestMapper.java
deleted file mode 100644
index 5ba42b0..0000000
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/demo/DemoTestMapper.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.dy.pipIrrDemo.demo;
-
-import com.alibaba.fastjson2.JSONObject;
-import com.dy.pipIrrGlobal.pojoDemo.DemoTest;
-import com.dy.pipIrrGlobal.pojoDemo.DemoTestAttr;
-import org.apache.commons.lang3.ObjectUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
-import org.mapstruct.Named;
-import org.mapstruct.factory.Mappers;
-
-import java.util.List;
-
-@Mapper
-public interface DemoTestMapper {
- DemoTestMapper INSTANCT = Mappers.getMapper(DemoTestMapper.class);
-
- /**
- * vo杞琾o
- * @param vo
- * @return
- */
- @Mapping(target = "phone", source = "tel")
- @Mapping(target = "createDt", source = "createDt", dateFormat = "yyyy-MM-dd")
- @Mapping(target = "age", source = "age", numberFormat = "#0.00")
- @Mapping(target = "id", ignore = true)
- @Mapping(target = "nickName", defaultValue = "鍒悕")
- @Mapping(target = "attr", qualifiedByName = "attrJsonToObject")
- DemoTest vo2po(DemoTestVo vo);
-
- /**
- *
- * @param vos
- * @return
- */
- List<DemoTest> vos2pos(List<DemoTestVo> vos) ;
-
- /**
- * po杞瑅o
- * @param po
- * @return
- */
- @Mapping(target = "tel", source = "phone")
- @Mapping(target = "attr", qualifiedByName = "attrObjectToJson")
- DemoTestVo po2vo(DemoTest po);
-
- /**
- *
- * @param pos
- * @return
- */
- List<DemoTestVo> pos2vos(List<DemoTest> pos) ;
-
- /**
- * json瀛楃涓茶浆瀵硅薄
- */
- @Named("attrJsonToObject")
- default DemoTestAttr attrJsonToObject(String jsonStr) {
- if (StringUtils.isEmpty(jsonStr)) {
- return null;
- }
- return JSONObject.parseObject(jsonStr, DemoTestAttr.class);
- }
- /**
- * 瀵硅薄杞琷son瀛楃涓�
- */
- @Named("attrObjectToJson")
- default String attrObjectToJson(DemoTestAttr attr) {
- if (ObjectUtils.isEmpty(attr)) {
- return null;
- }
- return JSONObject.toJSONString(attr) ;
- }
-
-}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/demo/DemoTestVo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/demo/DemoTestVo.java
deleted file mode 100644
index 77a205f..0000000
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/demo/DemoTestVo.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.dy.pipIrrDemo.demo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
-import java.util.Date;
-
-@Data
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-@Schema(name = "娴嬭瘯鏁版嵁鍊煎璞�")
-/*
-妯″潡Controller绫绘柟娉曞弬鏁板紩鐢ㄤ簡璇ュ疄浣擄紙@RequestBody锛夛紝妯″潡Schemas API鏂囨。鎵嶄細鍑虹幇璇ュ疄浣撶殑API锛�
-渚嬪鏈疄浣撳湪pipIrr-web-base妯″潡BaseDemoCtrl绫绘柟娉晅est(@RequestBody DemoTest req)
-涓寮曠敤浜嗭紝璇ュ疄浣撴墠浼氬嚭鐜板湪璇ユā鍧楃殑API鏂囨。锛圵EB鐣岄潰锛変腑
- */
-public class DemoTestVo {
- public Long id ;
-
- public String name ;
-
- public String nickName ;
-
- public Integer age ;
-
- public String tel ;
-
- public Date createDt ;
-
- public String address ;
-
- public String attr ;
-
-}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/demo/Test4MapperStruct.java b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/demo/Test4MapperStruct.java
deleted file mode 100644
index 291b79e..0000000
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/demo/Test4MapperStruct.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.dy.pipIrrDemo.demo;
-
-import com.dy.pipIrrGlobal.pojoDemo.DemoTest;
-
-import java.util.Date;
-
-public class Test4MapperStruct {
- public static void main(String[] args) {
- testNormal();
- }
-
-
- public static void testNormal() {
- System.out.println("-----------testNormal-----start1------");
- String attr = "{\"id\":2,\"name\":\"娴嬭瘯123\"}";
- DemoTestVo userVo = DemoTestVo.builder()
- .id(1L)
- .name("寮犱笁")
- .age(18)
- .tel("18600222356")
- .createDt(new Date())
- .address("寮犱笁浣忓潃")
- .attr(attr)
- .build();
- System.out.println("Vo锛�" + userVo);
- DemoTest userPo = DemoTestMapper.INSTANCT.vo2po(userVo);
- System.out.println("Po锛�" + userPo);
- System.out.println("-----------testNormal-----ent1------");
-
- System.out.println("-----------testNormal-----start2------");
- DemoTestVo userVo_ = DemoTestMapper.INSTANCT.po2vo(userPo);
- System.out.println("vo_锛�" + userVo_);
-
- System.out.println("-----------testNormal-----ent2------");
-
- }
-}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/mp/DemoMpSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/mp/DemoMpSv.java
deleted file mode 100644
index 6a0b3e9..0000000
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/mp/DemoMpSv.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.dy.pipIrrDemo.mp;
-
-import com.dy.pipIrrGlobal.daoDemo.DemoMpMapper;
-import com.dy.pipIrrGlobal.pojoDemo.DemoMp;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class DemoMpSv {
-
- @Autowired
- private DemoMpMapper demoMpMapper ;
-
- public DemoMp selectById(Long id){
- return this.demoMpMapper.selectById(id);
- }
-
-
- public List<DemoMp> selectBatchIds(List<Long> ids){
- return this.demoMpMapper.selectBatchIds(ids);
- }
-
- public int insert(DemoMp po){
- return this.demoMpMapper.insert(po) ;
- }
-
- public int updateById(DemoMp po){
- return this.demoMpMapper.updateById(po) ;
- }
-
-}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/role/RoleCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/role/RoleCtrl.java
deleted file mode 100644
index 79a4e91..0000000
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/role/RoleCtrl.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.dy.pipIrrDemo.role;
-
-
-import com.dy.common.webUtil.BaseResponse;
-import com.dy.common.webUtil.BaseResponseUtils;
-import com.dy.pipIrrGlobal.pojoDemo.DemoRole;
-import com.dy.pipIrrGlobal.pojoDemo.DemoUser;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-@Slf4j
-@RestController
-@RequestMapping(path="role")
-@SuppressWarnings("unchecked")
-public class RoleCtrl {
-
- @Autowired
- RoleSv sv ;
-
- @GetMapping("selectAll")
- public BaseResponse<DemoUser> selectAll(){
- try {
- List<DemoRole> list = sv.selectAll() ;
- return BaseResponseUtils.buildSuccess(list);
- } catch (Exception e) {
- log.error("寰楀埌鎵�鏈塪emo鐢ㄦ埛寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage()) ;
- }
- }
-}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/role/RoleSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/role/RoleSv.java
deleted file mode 100644
index 55253b6..0000000
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/role/RoleSv.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.dy.pipIrrDemo.role;
-
-
-import com.dy.pipIrrGlobal.daoDemo.DemoRoleMapper;
-import com.dy.pipIrrGlobal.pojoDemo.DemoRole;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class RoleSv {
- @Autowired
- private DemoRoleMapper demoRoleMapper ;
-
- public List<DemoRole> selectAll() {
- List<DemoRole> list = this.demoRoleMapper.selectAll() ;
- return list ;
- }
-}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/user/UserCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/user/UserCtrl.java
deleted file mode 100644
index 9874d30..0000000
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/user/UserCtrl.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package com.dy.pipIrrDemo.user;
-
-import com.dy.common.mybatis.envm.Deleted;
-import com.dy.common.mybatis.envm.Disabled;
-import com.dy.common.webUtil.BaseResponse;
-import com.dy.common.webUtil.BaseResponseUtils;
-import com.dy.pipIrrGlobal.pojoDemo.DemoUser;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-@Slf4j
-@RestController
-@RequestMapping(path="user")
-@SuppressWarnings("unchecked")
-public class UserCtrl {
-
- UserSv userSv;
-
- @Autowired
- public void setUserSv(UserSv userSv){
- this.userSv = userSv;
- }
-
- @GetMapping("selectById1")
- public BaseResponse<DemoUser> selectById1(){
- try {
- DemoUser po = userSv.selectById1(1L) ;
- return BaseResponseUtils.buildSuccess(po);
- } catch (Exception e) {
- log.error("selectById1", e);
- return BaseResponseUtils.buildException(e.getMessage()) ;
- }
- }
-
-
- @GetMapping("selectById2")
- public BaseResponse<DemoUser> selectById2(){
- try {
- DemoUser po = userSv.selectById2(1L) ;
- return BaseResponseUtils.buildSuccess(po);
- } catch (Exception e) {
- log.error("selectById2", e);
- return BaseResponseUtils.buildException(e.getMessage()) ;
- }
- }
-
-
- @GetMapping("selectById3")
- public BaseResponse<DemoUser> selectById3(){
- try {
- DemoUser po = userSv.selectById3(1L) ;
- return BaseResponseUtils.buildSuccess(po);
- } catch (Exception e) {
- log.error("selectById3", e);
- return BaseResponseUtils.buildException(e.getMessage()) ;
- }
- }
-
-
- @GetMapping("selectById4")
- public BaseResponse<DemoUser> selectById4(){
- try {
- DemoUser po = userSv.selectById4(1L) ;
- return BaseResponseUtils.buildSuccess(po);
- } catch (Exception e) {
- log.error("selectById4", e);
- return BaseResponseUtils.buildException(e.getMessage()) ;
- }
- }
-
-
- @GetMapping("selectById5")
- public BaseResponse<DemoUser> selectById5(){
- try {
- DemoUser po = userSv.selectById5(1L) ;
- return BaseResponseUtils.buildSuccess(po);
- } catch (Exception e) {
- log.error("selectById5", e);
- return BaseResponseUtils.buildException(e.getMessage()) ;
- }
- }
-
-
-
- @GetMapping("insert")
- public BaseResponse<DemoUser> insert(){
- try {
- DemoUser po = new DemoUser();
- po.name = "鐜嬩簲" ;
- po.password = "123456" ;
- po.disabled = Disabled.NO ;
- po.deleted = Deleted.NO ;
- po.roleId = 1L ;
- this.userSv.insert(po) ;
- return BaseResponseUtils.buildSuccess(po);
- } catch (Exception e) {
- log.error("insert", e);
- return BaseResponseUtils.buildException(e.getMessage()) ;
- }
- }
-
-}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/user/UserSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/user/UserSv.java
deleted file mode 100644
index 79c8527..0000000
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/user/UserSv.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.dy.pipIrrDemo.user;
-
-
-import com.dy.pipIrrGlobal.daoDemo.DemoUserMapper;
-import com.dy.pipIrrGlobal.pojoDemo.DemoUser;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service
-public class UserSv {
- @Autowired
- private DemoUserMapper demoUserMapper ;
-
- public int insert(DemoUser user){
- return demoUserMapper.insert(user) ;
- }
-
- public DemoUser selectById1(Long id ) {
- DemoUser user = this.demoUserMapper.selectById1(id) ;
- return user ;
- }
- public DemoUser selectById2(Long id ) {
- DemoUser user = this.demoUserMapper.selectById2(id) ;
- return user ;
- }
- public DemoUser selectById3(Long id ) {
- DemoUser user = this.demoUserMapper.selectById3(id) ;
- return user ;
- }
- public DemoUser selectById4(Long id ) {
- DemoUser user = this.demoUserMapper.selectById4(id) ;
- return user ;
- }
- public DemoUser selectById5(Long id ) {
- DemoUser user = this.demoUserMapper.selectById5(id) ;
- return user ;
- }
-}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/resources/application.yml
deleted file mode 100644
index c03d2cc..0000000
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/resources/application.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-spring:
- profiles:
- include: global, database
-
-#actutor鐨剋eb绔彛
-management:
- server:
- port: ${pipIrr.demo.actutorPort}
-#web鏈嶅姟绔彛锛宼omcat榛樿鏄�8080
-server:
- port: ${pipIrr.demo.webPort}
- servlet:
- context-path: /demo #web璁块棶涓婁笅鏂囪矾寰�
- context-parameters:
- #GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
- idSuffix: ${pipIrr.demo.idSuffix}
- #ConfigListener涓簲鐢�
- #configFileNames: config-global.xml,config-demo.xml
-
-pipIrr:
- demo:
- name: 婕旂ず淇℃伅绯荤粺
- test: 婕旂ず娴嬭瘯
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/resources/log4j2.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/resources/log4j2.yml
deleted file mode 100644
index ca7e35b..0000000
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/resources/log4j2.yml
+++ /dev/null
@@ -1,73 +0,0 @@
-Configuration:
- #status锛岃繖涓敤浜庤缃甽og4j2鑷韩鍐呴儴鐨勪俊鎭緭鍑猴紝鍙互涓嶈缃紝褰撹缃垚trace鏃讹紝浣犱細鐪嬪埌log4j2鍐呴儴鍚勭璇︾粏杈撳嚭锛涘彲浠ヨ缃垚Off(鍏抽棴)鎴朎rror(鍙緭鍑洪敊璇俊鎭�)
- status: Error
-
- Properties: # 瀹氫箟鍏ㄥ眬鍙橀噺
- Property:
- #鏃ュ織鏂囦欢瀛樺偍鐨勭洰褰�
- - name: log.path
- value: ./logs
- #鏃ュ織鏂囦欢瀛樺偍鍚嶇О
- - name: project.name
- value: pipIrrDemo
-
- #瀹氫箟杈撳嚭鍣紝鍙互杈撳嚭鍒版帶鍒跺彴鍜屾枃浠�.
- Appenders:
- #杈撳嚭鍒版帶鍒跺彴
- Console:
- #Appender鍛藉悕
- name: CONSOLE
- target: SYSTEM_OUT
- ThresholdFilter:
- level: debug #杈撳嚭鏃ュ織绾у埆锛岃緭鍑烘棩蹇楁椂锛岄鍏堢敱Loggers.Root.level鎴朙oggers.Logger.level鍒ゆ柇鏄惁杈撳嚭锛岀劧鍚庡啀鐢辨湰level鍒ゆ柇鏄惁杈撳嚭
- onMatch: ACCEPT #onMatch=ACCEPT 澶т簬绛変簬 "level" 閰嶇疆鐨勭瓑绾у湴鏃ュ織杈撳嚭
- onMismatch: DENY #onMismatch=DENY 灏忎簬 "level" 閰嶇疆鐨勭瓑绾у湴鏃ュ織涓嶈緭鍑�
- #鏃ュ織鍐呭鏍峰紡
- PatternLayout:
- #%n-鎹㈣
- #%m-鏃ュ織鍐呭锛岃緭鍑轰唬鐮佷腑鎸囧畾鐨勬棩蹇椾俊鎭�
- #%p-杈撳嚭浼樺厛绾э紝鍗矰EBUG,INFO,WARN,ERROR,FATAL
- #%r-绋嬪簭鍚姩鍒扮幇鍦ㄧ殑姣鏁�
- #%%- 杈撳嚭涓�涓�"%" 瀛楃
- #%t-褰撳墠绾跨▼鍚�
- #%d-鏃ユ湡鍜屾椂闂�, 甯哥敤鐨勬牸寮忔湁%d{DATE},%d{ABSOLUTE},%d{HH:mm:ss,SSS},%d{ddMMyyyyHH:mm:ss,SSS}
- #%l-鍚�%F%L%C%M
- #%F-java婧愭枃浠跺悕
- #%L-java婧愮爜琛屾暟
- #%C-java绫诲悕,%C{1}杈撳嚭鏈�鍚庝竴涓厓绱�
- #%M-java鏂规硶鍚�
- pattern: "%d{yyyy-MM-dd HH:mm:ss,SSS}:%4p %t (%C.%M:%L) - %m%n"
- # 杈撳嚭鍒版枃浠讹紝瓒呰繃10MB褰掓。
- RollingFile:
- - name: ROLLING_FILE
- ignoreExceptions: false
- fileName: ${log.path}/${project.name}.log
- filePattern: "${log.path}/$${date:yyyy-MM}/${project.name}-%d{yyyy-MM-dd}-%i.log.gz"
- ThresholdFilter:
- level: error #杈撳嚭鏃ュ織绾у埆锛岃緭鍑烘棩蹇楁椂锛岄鍏堢敱Loggers.Root.level鎴朙oggers.Logger.level鍒ゆ柇鏄惁杈撳嚭锛岀劧鍚庡啀鐢辨湰level鍒ゆ柇鏄惁杈撳嚭
- onMatch: ACCEPT #onMatch=ACCEPT 澶т簬绛変簬 "level" 閰嶇疆鐨勭瓑绾у湴鏃ュ織杈撳嚭
- onMismatch: DENY #onMismatch=DENY 灏忎簬 "level" 閰嶇疆鐨勭瓑绾у湴鏃ュ織涓嶈緭鍑�
- #鏃ュ織鍐呭鏍峰紡
- PatternLayout:
- pattern: "%d{yyyy-MM-dd HH:mm:ss,SSS}:%4p %t (%C.%M:%L) - %m%n"
- Policies:
- SizeBasedTriggeringPolicy:
- size: "10 MB"
- DefaultRolloverStrategy:
- max: 1000
-
- Loggers:
- Root:
- level: info #鏃ュ織杈撳嚭绾у埆锛屽叡鏈�8涓骇鍒紝鎸夌収浠庝綆鍒伴珮涓猴細all < trace < debug < info < warn < error < fatal < off
- AppenderRef: #Root鐨勫瓙鑺傜偣锛岀敤鏉ユ寚瀹氳鏃ュ織杈撳嚭鍒板摢涓狝ppender.
- - ref: CONSOLE #杈撳嚭鏃ュ織鏃讹紝棣栧厛鐢辨湰level鍒ゆ柇鏄惁杈撳嚭锛岀劧鍚庡啀鐢变笂闈㈢殑Appenders.Console.ThresholdFilter.level鍒ゆ柇鏄惁杈撳嚭
- - ref: ROLLING_FILE #杈撳嚭鏃ュ織鏃讹紝棣栧厛鐢辨湰level鍒ゆ柇鏄惁杈撳嚭锛岀劧鍚庡啀鐢变笂闈㈢殑Appenders.RollingFile.ThresholdFilter.level鍒ゆ柇鏄惁杈撳嚭
- # 涓哄寘閰嶇疆鐗规畩鐨凩og绾у埆锛屾柟渚胯皟璇曪紝
- # 涓嶅彈Loggers.Root.level闄愬埗
- Logger:
- - name: com.dy.pipIrrGlobal.daoDemo
- additivity: false #鍘婚櫎閲嶅鐨刲og
- level: debug #杈撳嚭鏃ュ織绾у埆
- AppenderRef:
- - ref: CONSOLE #杈撳嚭鏃ュ織鏃讹紝棣栧厛鐢辨湰.level鍒ゆ柇鏄惁杈撳嚭锛岀劧鍚庡啀鐢变笂闈㈢殑Appenders.Console.ThresholdFilter.level鍒ゆ柇鏄惁杈撳嚭
- - ref: ROLLING_FILE #杈撳嚭鏃ュ織鏃讹紝棣栧厛鐢辨湰level鍒ゆ柇鏄惁杈撳嚭锛岀劧鍚庡啀鐢变笂闈㈢殑Appenders.RollingFile.ThresholdFilter.level鍒ゆ柇鏄惁杈撳嚭
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/test/java/com/dy/pipIrrDemo/PipIrrWebDemoApplicationTests.java b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/test/java/com/dy/pipIrrDemo/PipIrrWebDemoApplicationTests.java
deleted file mode 100644
index 3ec992d..0000000
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/test/java/com/dy/pipIrrDemo/PipIrrWebDemoApplicationTests.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.dy.pipIrrDemo;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class PipIrrWebDemoApplicationTests {
-
- @Test
- void contextLoads() {
- }
-
-}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/test/java/com/dy/pipIrrDemo/mp/MpTest1.java b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/test/java/com/dy/pipIrrDemo/mp/MpTest1.java
deleted file mode 100644
index d20db9a..0000000
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/test/java/com/dy/pipIrrDemo/mp/MpTest1.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.dy.pipIrrDemo.mp;
-
-import com.dy.common.multiDataSource.DataSourceContext;
-import com.dy.pipIrrGlobal.pojoDemo.DemoMp;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.time.LocalDateTime;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest
-public class MpTest1 {
-
- @Autowired
- private DemoMpSv demoMpSv ;
-
- @Before
- public void setup(){
- DataSourceContext.set("ym");
- }
-
- @Test
- public void insert(){
- DemoMp po = new DemoMp() ;
- po.name = "寮犱笁" ;
- po.age = 20 ;
- po.dt = LocalDateTime.now() ;
- int count = this.demoMpSv.insert(po) ;
- System.out.println("鎻掑叆浜�" + count + "璁板綍");
- }
-
- @Test
- public void updateById(){
- //鎶婁笂闈㈡彃鍏ョ殑璁板綍杩涜鏇存柊
- DemoMp po = new DemoMp() ;
- po.id = 2023110716001900000L ;
- po.name = "鏉庡洓" ;
- po.age = 22 ;
- //po.dt = LocalDateTime.now() ;
- int count = this.demoMpSv.updateById(po);
- System.out.println("鏇存柊浜�" + count + "璁板綍");
- }
-
- @Test
- public void selectById(){
- DemoMp po = this.demoMpSv.selectById(1L) ;
- }
-}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/test/java/com/dy/pipIrrDemo/mp/MpTest2.java b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/test/java/com/dy/pipIrrDemo/mp/MpTest2.java
deleted file mode 100644
index 0136946..0000000
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/test/java/com/dy/pipIrrDemo/mp/MpTest2.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package com.dy.pipIrrDemo.mp;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.dy.common.multiDataSource.DataSourceContext;
-import com.dy.pipIrrGlobal.daoDemo.DemoMpMapper;
-import com.dy.pipIrrGlobal.pojoDemo.DemoMp;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest
-public class MpTest2 {
-
- @Autowired
- private DemoMpMapper demoMpMapper ;
-
- @Before
- public void setup(){
- DataSourceContext.set("ym");
- }
-
- @Test
- public void selectById(){
- DemoMp po = this.demoMpMapper.selectById(2023110716001900000L) ;
- System.out.println(po);
- }
- @Test
- public void selectBatchIds(){
- List<Long> listIds = Arrays.asList(1L, 2L, 2023110716001900000L) ;
- List<DemoMp> poList = this.demoMpMapper.selectBatchIds(listIds) ;
- System.out.println(poList);
- }
- @Test
- public void selectByMap(){
- Map<String, Object > paramMap = new HashMap<>() ;
- paramMap.put("name", "鏉庡洓");
- paramMap.put("age", "22") ;
- List<DemoMp> poList = this.demoMpMapper.selectByMap(paramMap) ;
- System.out.println(poList);
- }
-
- @Test
- public void selectByWrapperLt(){
- QueryWrapper<DemoMp> queryWrapper = new QueryWrapper<>();
- //QueryWrapper<DemoMp> queryWrapper = Wrappers.<DemoMp>query() ;
- queryWrapper.like("name", "鍥�").lt("age", 40) ;
- List<DemoMp> poList = this.demoMpMapper.selectList(queryWrapper) ;
- poList.forEach(System.out::println);
- }
-
- @Test
- public void selectByWrapperBt(){
- QueryWrapper<DemoMp> queryWrapper = new QueryWrapper<>();
- //QueryWrapper<DemoMp> queryWrapper = Wrappers.<DemoMp>query() ;
- queryWrapper.like("name", "鍥�")
- .between("age", 20, 40)
- .isNotNull("dt");
- List<DemoMp> poList = this.demoMpMapper.selectList(queryWrapper) ;
- poList.forEach(System.out::println);
- }
-
- @Test
- public void selectByWrapperOr(){
- QueryWrapper<DemoMp> queryWrapper = new QueryWrapper<>();
- //QueryWrapper<DemoMp> queryWrapper = Wrappers.<DemoMp>query() ;
- queryWrapper.like("name", "鍥�")
- .or()
- .between("age", 20, 40)
- .isNotNull("dt")
- .orderByAsc("id")
- .orderByAsc("age");
- List<DemoMp> poList = this.demoMpMapper.selectList(queryWrapper) ;
- poList.forEach(System.out::println);
- }
-
- @Test
- public void selectByWrapperOr1(){
- QueryWrapper<DemoMp> queryWrapper = new QueryWrapper<>();
- //QueryWrapper<DemoMp> queryWrapper = Wrappers.<DemoMp>query() ;
- queryWrapper.likeLeft("name", "鍥�")
- .and(wq->wq.between("age", 20, 40).or().isNotNull("dt"))
- .orderByAsc("id")
- .orderByAsc("age");
- List<DemoMp> poList = this.demoMpMapper.selectList(queryWrapper) ;
- poList.forEach(System.out::println);
- }
-
- @Test
- public void selectByWrapperOr2(){
- QueryWrapper<DemoMp> queryWrapper = new QueryWrapper<>();
- //QueryWrapper<DemoMp> queryWrapper = Wrappers.<DemoMp>query() ;
- queryWrapper.likeLeft("name", "鍥�")
- .and(wq->wq.between("age", 20, 40).isNotNull("dt"))
- .orderByAsc("id")
- .orderByAsc("age");
- List<DemoMp> poList = this.demoMpMapper.selectList(queryWrapper) ;
- poList.forEach(System.out::println);
- }
-
- @Test
- public void selectByWrapperOr3(){
- QueryWrapper<DemoMp> queryWrapper = new QueryWrapper<>();
- //QueryWrapper<DemoMp> queryWrapper = Wrappers.<DemoMp>query() ;
- queryWrapper.likeLeft("name", "鍥�")
- .or(wq->wq.lt("age", 100).gt("age", 10).isNotNull("dt"))
- .orderByAsc("id")
- .orderByAsc("age");
- List<DemoMp> poList = this.demoMpMapper.selectList(queryWrapper) ;
- poList.forEach(System.out::println);
- }
-
- @Test
- public void selectByWrapperOr4(){
- QueryWrapper<DemoMp> queryWrapper = new QueryWrapper<>();
- //QueryWrapper<DemoMp> queryWrapper = Wrappers.<DemoMp>query() ;
- queryWrapper.nested(wq->wq.lt("age", 50).or().isNotNull("dt"))
- .likeLeft("name", "鍥�")
- .orderByAsc("id")
- .orderByAsc("age");
- List<DemoMp> poList = this.demoMpMapper.selectList(queryWrapper) ;
- poList.forEach(System.out::println);
- }
-
-
- @Test
- public void selectByWrapperAnd(){
- QueryWrapper<DemoMp> queryWrapper = new QueryWrapper<>();
- //QueryWrapper<DemoMp> queryWrapper = Wrappers.<DemoMp>query() ;
- queryWrapper.likeLeft("name", "鍥�")
- .and(wq->wq.between("age", 20, 40))
- .isNotNull("dt")
- .orderByAsc("id")
- .orderByAsc("age");
- List<DemoMp> poList = this.demoMpMapper.selectList(queryWrapper) ;
- poList.forEach(System.out::println);
- }
-
-
- @Test
- public void selectByWrapperIn(){
- QueryWrapper<DemoMp> queryWrapper = new QueryWrapper<>();
- //QueryWrapper<DemoMp> queryWrapper = Wrappers.<DemoMp>query() ;
- queryWrapper.in("age", Arrays.asList(38, 45))
- .orderByAsc("id")
- .orderByAsc("age");
- List<DemoMp> poList = this.demoMpMapper.selectList(queryWrapper) ;
- poList.forEach(System.out::println);
- }
-
- @Test
- public void selectByWrapperLimit(){
- QueryWrapper<DemoMp> queryWrapper = new QueryWrapper<>();
- //QueryWrapper<DemoMp> queryWrapper = Wrappers.<DemoMp>query() ;
- queryWrapper.in("age", Arrays.asList(38, 45)).last("limit 1")
- .orderByAsc("id")
- .orderByAsc("age");
- List<DemoMp> poList = this.demoMpMapper.selectList(queryWrapper) ;
- poList.forEach(System.out::println);
- }
-
- @Test
- public void selectByWrapperLimitSupper(){
- QueryWrapper<DemoMp> queryWrapper = new QueryWrapper<>();
- //QueryWrapper<DemoMp> queryWrapper = Wrappers.<DemoMp>query() ;
- queryWrapper.select("id", "name").in("age", Arrays.asList(38, 45)).last("limit 1")
- .orderByAsc("id")
- .orderByAsc("age");
- List<DemoMp> poList = this.demoMpMapper.selectList(queryWrapper) ;
- poList.forEach(System.out::println);
- }
-
-}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java
index 32ae257..90767c5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java
@@ -165,4 +165,24 @@
}
return array;
}
+
+ /**
+ * 鏍规嵁鎺у埗鍣ㄧ紪鍙风墿鐞嗗垹闄ゆ帶鍒�
+ *2024-6-7
+ * @param controllerId
+ * @return
+ */
+ public Integer deleteControllerByIdTwo(Long controllerId) {
+ return prControllerMapper.deleteByPrimaryKey(controllerId);
+ }
+
+ /**
+ * 鏍规嵁涓婚敭鏌ヨ鎺у埗鍣ㄥ垪琛�
+ *2024-6-7
+ * @param controllerId
+ * @return
+ */
+ public PrController getByControllerId(Long controllerId) {
+ return prControllerMapper.selectByPrimaryKey(controllerId);
+ }
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideCtrl.java
index 167cecd..389bf86 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideCtrl.java
@@ -213,13 +213,15 @@
@PostMapping(path = "update", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
- public BaseResponse<Boolean> update(@RequestBody @Valid PrDivide po, BindingResult bindingResult){
+ public BaseResponse<Boolean> update(@RequestBody @Valid DtoDivide po, BindingResult bindingResult){
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
// 鎺ユ敹鏉戠紪鍙凤紙涓婚敭锛�
- Long villageId = po.getVillageid();
+ Long villageId = po.getVillageId();
+
+ PrDivide prDivide = DtoToDividePojo.INSTANCT.po2vo(po);
if (villageId!=null){
/**
@@ -231,14 +233,14 @@
}
Long countryId = Long.parseLong(map_districts.get("countryId").toString());
Long townId = Long.parseLong(map_districts.get("townId").toString());
- po.setCountyid(countryId);
- po.setTownid(townId);
+ prDivide.setCountyid(countryId);
+ prDivide.setTownid(townId);
}
Date operateTime = new Date();
- po.setOperatedt(operateTime);
+ prDivide.setOperatedt(operateTime);
- Integer rec = Optional.ofNullable(divideSv.updateByPrimaryKey(po)).orElse(0);
+ Integer rec = Optional.ofNullable(divideSv.updateByPrimaryKey(prDivide)).orElse(0);
if(rec == 0) {
return BaseResponseUtils.buildFail("鍒嗘按鎴夸慨鏀瑰け璐�");
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DtoDivide.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DtoDivide.java
index 996457b..06269f7 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DtoDivide.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DtoDivide.java
@@ -18,6 +18,8 @@
public class DtoDivide {
public static final long serialVersionUID = 1L;
+ @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ private Long id;
/**
* 鎵�鍦ㄦ潙
*/
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DtoToDividePojo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DtoToDividePojo.java
index 9fbdc5e..a608212 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DtoToDividePojo.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DtoToDividePojo.java
@@ -16,6 +16,7 @@
public interface DtoToDividePojo {
DtoToDividePojo INSTANCT = Mappers.getMapper(DtoToDividePojo.class);
+ @Mapping(target = "id", source = "id")
@Mapping(target = "villageid", source = "villageId")
@Mapping(target = "blockid", source = "blockId")
@Mapping(target = "name", source = "name")
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/DtoIntakeController.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/DtoIntakeController.java
index c49197c..570adb8 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/DtoIntakeController.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/DtoIntakeController.java
@@ -36,7 +36,7 @@
* 澶囨敞淇℃伅
*/
@Schema(description = "澶囨敞", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @Length(message = "澶囨敞闀垮害灏忎簬{max}瀛�", min = 1, max = 200)
+ @Length(message = "澶囨敞闀垮害灏忎簬{max}瀛�", max = 200)
private String remarks;
/**
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java
index 252376c..fe3ca1a 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java
@@ -113,17 +113,18 @@
if (rec_addController == 0) {
return BaseResponseUtils.buildFail(ProjectResultCode.BIND_FAIL.getMessage());
}
+// if (remarks != null || remarks !=""){
+// // 淇敼缁戝畾璁板綍
+// PrIntakeController prIntakeController = new PrIntakeController();
+// prIntakeController.setRemarks(remarks);
+// prIntakeController.setIntakeid(intakeId);
+//
+// Integer rec = Optional.ofNullable(intakeControllerSv.updateBindRecord(prIntakeController)).orElse(0);
+// if (rec == 0) {
+// return BaseResponseUtils.buildFail(ProjectResultCode.BIND_FAIL.getMessage());
+// }
+// }
-
- // 淇敼缁戝畾璁板綍
- PrIntakeController prIntakeController = new PrIntakeController();
- prIntakeController.setRemarks(remarks);
- prIntakeController.setIntakeid(intakeId);
-
- Integer rec = Optional.ofNullable(intakeControllerSv.updateBindRecord(prIntakeController)).orElse(0);
- if (rec == 0) {
- return BaseResponseUtils.buildFail(ProjectResultCode.BIND_FAIL.getMessage());
- }
// 鏍规嵁娴佹氮鎺у埗鍣ㄧ紪鍙峰垹闄ゆ祦娴帶鍒跺櫒璁板綍
intakeControllerSv.deleteTrampController(trampControllerId);
@@ -176,13 +177,23 @@
Date operateTime = new Date();
prIntakeController.setOperatedt(operateTime);
prIntakeController.setOperatetype((byte) 2);
+ prIntakeController.setRemarks("瑙ｇ粦");
Integer rec = Optional.ofNullable(intakeControllerSv.addRecord(prIntakeController)).orElse(0);
if (rec == 0) {
return BaseResponseUtils.buildFail(ProjectResultCode.BIND_FAIL.getMessage());
}
-
- // 鍒犻櫎鎺у埗鍣ㄥ閿�
- Integer rec_deleteIntakeId = Optional.ofNullable(controllerSv.deleteIntakeId(po.getControllerId())).orElse(0);
+ //娣诲姞鍒版祦娴帶鍒跺櫒
+ PrController ControllerList = controllerSv.getByControllerId(po.getControllerId());
+ PrControllerTramp prControllerTramp = new PrControllerTramp();
+ prControllerTramp.setRtuAddr(ControllerList.getRtuAddr());
+ prControllerTramp.setProtocol(ControllerList.getProtocol());
+ prControllerTramp.setFindDt(new Date());
+ Integer rec_addControllerTramp = Optional.ofNullable(intakeControllerSv.addTrampController(prControllerTramp)).orElse(0);
+ if (rec_addControllerTramp == 0) {
+ return BaseResponseUtils.buildFail(ProjectResultCode.ADD_TRAMP_CONTROLLER_FAIL.getMessage());
+ }
+ // 鍒犻櫎鎺у埗鍣�
+ Integer rec_deleteIntakeId = Optional.ofNullable(controllerSv.deleteControllerByIdTwo(po.getControllerId())).orElse(0);
if (rec_deleteIntakeId == 0) {
return BaseResponseUtils.buildFail(ProjectResultCode.BIND_FAIL.getMessage());
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java
index 7e7def7..3d9cbf5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java
@@ -177,12 +177,13 @@
* 鎵ц鎴愬姛
* 鏇存敼铏氭嫙鍗＄姸鎬侊細鏄惁浣跨敤涓�佹渶鍚庢搷浣溿�佹渶鍚庢搷浣滄椂闂�
*/
- //SeVirtualCard virtualCard = new SeVirtualCard();
- //virtualCard.setId(vcId);
- //virtualCard.setInUse((byte) 1);
- //virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
- //virtualCard.setLastOperateTime(new Date());
- //seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
+// SeVirtualCard virtualCard = new SeVirtualCard();
+// virtualCard.setId(vcId);
+// virtualCard.setInUse((byte) 1);
+// virtualCard.setIntakeId(intakeId);
+// virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
+// virtualCard.setLastOperateTime(new Date());
+// seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
// 鍥炶皟杩斿洖鐨勫唴瀹�
//Data myData = (Data)response_CallBack.getContent();
@@ -254,6 +255,7 @@
//SeVirtualCard virtualCard = new SeVirtualCard();
//virtualCard.setId(vcId);
//virtualCard.setInUse((byte) 1);
+ //virtualCard.setIntakeId(intakeId);
//virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
//virtualCard.setLastOperateTime(new Date());
//seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
@@ -285,6 +287,7 @@
SeVirtualCard virtualCard = new SeVirtualCard();
virtualCard.setId(vcId);
virtualCard.setInUse((byte) 1);
+ virtualCard.setIntakeId(intakeId);
virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
virtualCard.setLastOperateTime(new Date());
seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
@@ -398,13 +401,12 @@
* 鎵ц鎴愬姛
* 鏇存敼铏氭嫙鍗＄姸鎬侊細鏄惁浣跨敤涓�佹渶鍚庢搷浣溿�佹渶鍚庢搷浣滄椂闂�
*/
- //Long vcId = seVirtualCardMapper.getVcIdByNum(vcNum);
- //SeVirtualCard virtualCard = new SeVirtualCard();
- //virtualCard.setId(vcId);
+ //SeVirtualCard virtualCard = seVirtualCardMapper.getVcCardByNum(vcNum);
//virtualCard.setInUse((byte) 0);
- //virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
+ //virtualCard.setIntakeId(null);
+ //virtualCard.setLastOperate(LastOperateENUM.CLOSE_VALVE.getCode());
//virtualCard.setLastOperateTime(new Date());
- //seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
+ //seVirtualCardMapper.updateByPrimaryKey(virtualCard);
// 鍥炶皟杩斿洖鐨勫唴瀹�
Data myData = (Data)response_CallBack.getContent();
@@ -463,13 +465,13 @@
rmCommandHistory.setResult((byte)0);
commandSv.updateCommandResult(rmCommandHistory);
- //Long vcId = seVirtualCardMapper.getVcIdByNum(vcNum);
- //SeVirtualCard virtualCard = new SeVirtualCard();
- //virtualCard.setId(vcId);
+
+ //SeVirtualCard virtualCard = seVirtualCardMapper.getVcCardByNum(vcNum);
//virtualCard.setInUse((byte) 0);
- //virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
+ //virtualCard.setIntakeId(null);
+ //virtualCard.setLastOperate(LastOperateENUM.CLOSE_VALVE.getCode());
//virtualCard.setLastOperateTime(new Date());
- //seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
+ //seVirtualCardMapper.updateByPrimaryKey(virtualCard);
return BaseResponseUtils.buildFail(RemoteResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage());
}
@@ -487,13 +489,12 @@
* 鎵ц鎴愬姛
* 鏇存敼铏氭嫙鍗＄姸鎬侊細鏄惁浣跨敤涓�佹渶鍚庢搷浣溿�佹渶鍚庢搷浣滄椂闂�
*/
- Long vcId = seVirtualCardMapper.getVcIdByNum(vcNum);
- SeVirtualCard virtualCard = new SeVirtualCard();
- virtualCard.setId(vcId);
+ SeVirtualCard virtualCard = seVirtualCardMapper.getVcCardByNum(vcNum);
virtualCard.setInUse((byte) 0);
- virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
+ virtualCard.setIntakeId(null);
+ virtualCard.setLastOperate(LastOperateENUM.CLOSE_VALVE.getCode());
virtualCard.setLastOperateTime(new Date());
- seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
+ seVirtualCardMapper.updateByPrimaryKey(virtualCard);
// 鍥炶皟杩斿洖鐨勫唴瀹�
Data myData = (Data)response_CallBack.getContent();
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardCtrl.java
index 66a999b..68b7405 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardCtrl.java
@@ -15,6 +15,7 @@
import com.dy.pipIrrSell.clientCard.LastOperateENUM;
import com.dy.pipIrrSell.recharge.DtoRecharge;
import com.dy.pipIrrSell.recharge.RechargeCtrl;
+import com.dy.pipIrrSell.recharge.RechargeSv;
import com.dy.pipIrrSell.result.SellResultCode;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
@@ -48,6 +49,8 @@
private final ActiveCardSv activeCardSv;
private final ClientCardSv clientCardSv;
private final RechargeCtrl rechargeCtrl;
+ private final RechargeSv rechargeSv;
+
//@Value("${projectCode.ym}")
//private Integer projectCode;
@@ -223,6 +226,12 @@
}
Map map = new HashMap();
+ if(amount != null && amount > 0) {
+ Long rechargeId = rechargeSv.selectIdByCardId(cardId);
+ map.put("orderNumber",rechargeId+"");//杩斿洖鍏呭�糏D
+ }else {
+ map.put("orderNumber",rec+"");//杩斿洖寮�鍗D
+ }
//map.put("projectCode", projectCode);
map.put("projectCode", Constant.projectCode_ym);
map.put("cardNum", cardNum);
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeSv.java
index ce11f65..f3138c9 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeSv.java
@@ -8,6 +8,7 @@
import com.dy.pipIrrGlobal.voSe.VoRecharge;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
+import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -97,4 +98,13 @@
return po.getId();
}
+ /**
+ * 鏍规嵁姘村崱id鑾峰彇鏈�杩戜竴鏉″厖鍊艰褰昳d
+ * @param cardId
+ * @return
+ */
+ public Long selectIdByCardId(Long cardId){
+ SeRecharge seRecharge = seRechargeMapper.selectByCardId(cardId);
+ return seRecharge.getId();
+ }
}
diff --git a/pipIrr-platform/pipIrr-web/pom.xml b/pipIrr-platform/pipIrr-web/pom.xml
index 2d260be..1f1dd86 100644
--- a/pipIrr-platform/pipIrr-web/pom.xml
+++ b/pipIrr-platform/pipIrr-web/pom.xml
@@ -19,7 +19,6 @@
<modules>
<module>pipIrr-mwTest-web</module>
- <module>pipIrr-web-demo</module>
<module>pipIrr-web-sso</module>
<module>pipIrr-web-base</module>
<module>pipIrr-web-remote</module>
diff --git "a/pipIrr-platform/\346\226\207\346\241\243/\345\220\204\347\263\273\347\273\237\351\203\250\347\275\262/\345\230\211\345\263\252\345\205\263.txt" "b/pipIrr-platform/\346\226\207\346\241\243/\345\220\204\347\263\273\347\273\237\351\203\250\347\275\262/\345\230\211\345\263\252\345\205\263.txt"
new file mode 100644
index 0000000..956b05b
--- /dev/null
+++ "b/pipIrr-platform/\346\226\207\346\241\243/\345\220\204\347\263\273\347\273\237\351\203\250\347\275\262/\345\230\211\345\263\252\345\205\263.txt"
@@ -0,0 +1,2 @@
+http://8.140.179.55:8077
+18602657034 瀵嗙爜锛欰BC123
\ No newline at end of file
--
Gitblit v1.8.0