From 0be32a3805e1430b82b5bded8bd23946e274fa84 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 06 十一月 2024 14:27:35 +0800
Subject: [PATCH] 优化虚拟卡占用逻辑，占用时写入取水口编号，解除占用时清空虚拟卡编号；工单使用的4个表
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 47 insertions(+), 12 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java
index e3a25ec..35c8b85 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java
@@ -329,19 +329,20 @@
* 濡傛灉鏄紑鍏抽榾锛氭洿鏀硅櫄鎷熷崱鐘舵�侊細鏄惁浣跨敤涓�佹渶鍚庢搷浣溿�佹渶鍚庢搷浣滄椂闂�
* 鏇存柊鎵ц缁撴灉銆佽繑鍥炵粨鏋滄椂闂淬�佺粨鏋滃唴瀹�
* 杩斿洖鍥炶皟鍐呭
+ * ***************************** 铏氭嫙鍗′娇鐢ㄧ姸鎬佷笉渚濊禆寮�鍏抽榾鎰忔効锛屼緷璧栧紑鍏抽榾鎴愬姛涓庡惁
*/
- if (comType != null) {
- SeVirtualCard virtualCard = new SeVirtualCard();
- virtualCard.setId(vcId);
- if (comType == 1) {
- virtualCard.setInUse((byte) 1);
- } else {
- virtualCard.setInUse((byte) 0);
- }
- virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
- virtualCard.setLastOperateTime(new Date());
- seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
- }
+ //if (comType != null) {
+ // SeVirtualCard virtualCard = new SeVirtualCard();
+ // virtualCard.setId(vcId);
+ // if (comType == 1) {
+ // virtualCard.setInUse((byte) 1);
+ // } else {
+ // virtualCard.setInUse((byte) 0);
+ // }
+ // virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
+ // virtualCard.setLastOperateTime(new Date());
+ // seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
+ //}
// 濡傛灉鏄紑鍙戝懡浠わ紙92-骞冲彴寮�闃�锛�91-灏忕▼搴忓紑闃�锛夛紝杩斿洖缁撴灉涓坊鍔犻榾鎺у櫒鍦板潃銆佽櫄鎷熷崱缂栧彿銆佽鍗曞彿
//if(commandCode.equals("92") || commandCode.equals("97")) {
@@ -353,11 +354,45 @@
JSONObject job_data = job_response.getJSONObject("content").getJSONObject("data");
if(!job_data.getBoolean("success")) {
// 寮�鍏抽榾澶辫触
+
+ // 寮�闃�澶辫触鍒欒В闄ゅ崰鐢紝鍏抽榾澶辫触鍒欏崰鐢�
+ if (comType != null) {
+ SeVirtualCard virtualCard = new SeVirtualCard();
+ virtualCard.setId(vcId);
+ if (comType == 1) {
+ virtualCard.setInUse((byte) 0);
+ virtualCard.setIntakeId(null);
+ } else {
+ virtualCard.setInUse((byte) 1);
+ virtualCard.setIntakeId(intakeId);
+ }
+ virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
+ virtualCard.setLastOperateTime(new Date());
+ seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
+ }
+
response_CallBack.setCode("10003");
response_CallBack.setMsg(CommandResultCode.OPEN_CLOSE_FAIL.getMessage());
response_CallBack.setSuccess(false);
}else {
// 寮�鍏抽榾鎴愬姛
+
+ // 寮�闃�鎴愬姛鍒欏崰鐢紝鍏抽榾鎴愬姛涓嶅崰鐢�
+ if (comType != null) {
+ SeVirtualCard virtualCard = new SeVirtualCard();
+ virtualCard.setId(vcId);
+ if (comType == 1) {
+ virtualCard.setInUse((byte) 1);
+ virtualCard.setIntakeId(intakeId);
+ } else {
+ virtualCard.setInUse((byte) 0);
+ virtualCard.setIntakeId(null);
+ }
+ virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
+ virtualCard.setLastOperateTime(new Date());
+ seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
+ }
+
job_data.remove("success");
job_data.put("intakeId", intakeId);
job_data.put("rtuAddr", rtuAddr);
--
Gitblit v1.8.0