From 6849ec1281a1a45639d6d28eef771eac63e389d2 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 11 六月 2025 16:32:44 +0800
Subject: [PATCH] 1、表阀一体协议，关阀失败数据解析修改； 2、RTU状态处理逻辑修改，每条81上报数据都要保存。
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardCtrl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
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 68b7405..76ad104 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
@@ -5,9 +5,9 @@
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.common.webUtil.ResultCodeMsg;
+import com.dy.pipIrrGlobal.daoBa.BaSettingsMapper;
import com.dy.pipIrrGlobal.pojoSe.SeActiveCard;
import com.dy.pipIrrGlobal.pojoSe.SeClientCard;
-import com.dy.pipIrrGlobal.util.Constant;
import com.dy.pipIrrGlobal.voSe.VoActiveCard;
import com.dy.pipIrrSell.cardOperate.enums.OperateTypeENUM;
import com.dy.pipIrrSell.clientCard.CardStateENUM;
@@ -50,6 +50,7 @@
private final ClientCardSv clientCardSv;
private final RechargeCtrl rechargeCtrl;
private final RechargeSv rechargeSv;
+ private final BaSettingsMapper baSettingsMapper;
//@Value("${projectCode.ym}")
@@ -232,8 +233,10 @@
}else {
map.put("orderNumber",rec+"");//杩斿洖寮�鍗D
}
- //map.put("projectCode", projectCode);
- map.put("projectCode", Constant.projectCode_ym);
+ String projectNo = baSettingsMapper.getItemValue("projectNo");
+ Integer projectNo1 = Integer.valueOf(projectNo);
+ String projectNo3 = String.format("%02x", projectNo1);
+ map.put("projectNo", projectNo3);
map.put("cardNum", cardNum);
return BaseResponseUtils.buildSuccess(map) ;
}
--
Gitblit v1.8.0