From c39ebc6929077845c588a7ea8b0fbaa4188a5e1a Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期二, 11 六月 2024 16:52:39 +0800
Subject: [PATCH] 修改 平台远程开阀接口 数据库添加传入取水口ID字段 平台远程关阀接口 给取水口字段赋null 完善代码
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVirtualCardMapper.xml | 7 +++++++
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java | 43 ++++++++++++++++++++++---------------------
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeVirtualCardMapper.java | 7 +++++++
3 files changed, 36 insertions(+), 21 deletions(-)
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..dbecf43 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
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 aab717c..6a719e6 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVirtualCardMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVirtualCardMapper.xml
@@ -196,6 +196,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}
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();
--
Gitblit v1.8.0