From 29eab346b55c74fb1ed3212ff7dcb0c24c7662fa Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 15 五月 2025 11:22:31 +0800
Subject: [PATCH] 示范区项目，虚拟卡表的占用状态及剩余金额需要设置成默认值，即不占用，不减费。修改原来的实现，增加设备剩余金额为默认值10000，配置项名称也做了达意修改。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/config/VirtualCardSetDefaultInterceptor.java | 28 ++++++++++---
pipIrr-platform/pipIrr-global/src/main/resources/application-common-web.yml | 6 ++-
pipIrr-platform/pipIrr-global/src/main/resources/application-common-web(233服务器).yml | 6 ++-
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd9AVo.java | 17 ++++++++
pipIrr-platform/pipIrr-global/src/main/resources/application-common-web(121服务器).yml | 6 ++-
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/config/MyBatisGlConfig.java | 9 ++--
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealIcRemainMoney.java | 2
7 files changed, 56 insertions(+), 18 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd9AVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd9AVo.java
index 68d956a..38d2a03 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd9AVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd9AVo.java
@@ -36,4 +36,21 @@
return sb.toString() ;
}
+ public String toStr(boolean showBase){
+ StringBuffer sb = new StringBuffer() ;
+ if(showBase){
+ sb.append(comName + " : \n") ;
+ sb.append("鎺у埗鍣ㄧ被鍨� : ") ;
+ sb.append(CommonV202404.ctrlDevType(controllerType)) ;
+ sb.append("\n") ;
+ sb.append("椤圭洰缂栧彿 : ") ;
+ sb.append(projectNo == null?"鏈煡":projectNo) ;
+ sb.append("\n") ;
+ }
+ sb.append("骞寸敤姘撮噺 : ") ;
+ sb.append(maxAmountYear == null?"鏈煡":maxAmountYear) ;
+ sb.append("\n") ;
+ return sb.toString() ;
+ }
+
}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/config/MyBatisGlConfig.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/config/MyBatisGlConfig.java
index aec8541..023e3d3 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/config/MyBatisGlConfig.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/config/MyBatisGlConfig.java
@@ -19,16 +19,17 @@
@Autowired
private List<SqlSessionFactory> sqlSessionFactoryList;
- @Value("${common.virtual_card_disable_set_inuse:false}")
- private Boolean disableSetInUse;
+ @Value("${virtual_card_set_default:false}")
+ private Boolean virtualCardTbProSetDefault;
+
/**
* 鏍规嵁閰嶇疆鏂囦欢閰嶇疆锛岄厤缃嫤鎴櫒
*/
@PostConstruct
public void addMyInterceptor() {
for (SqlSessionFactory sqlSessionFactory : sqlSessionFactoryList) {
- if (disableSetInUse != null && disableSetInUse.booleanValue()) {
- sqlSessionFactory.getConfiguration().addInterceptor(new VirtualCardInUseInterceptor());
+ if (virtualCardTbProSetDefault != null && virtualCardTbProSetDefault.booleanValue()) {
+ sqlSessionFactory.getConfiguration().addInterceptor(new VirtualCardSetDefaultInterceptor());
}
}
}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/config/VirtualCardInUseInterceptor.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/config/VirtualCardSetDefaultInterceptor.java
similarity index 71%
rename from pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/config/VirtualCardInUseInterceptor.java
rename to pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/config/VirtualCardSetDefaultInterceptor.java
index 5f0a2e4..52e637e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/config/VirtualCardInUseInterceptor.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/config/VirtualCardSetDefaultInterceptor.java
@@ -1,10 +1,5 @@
package com.dy.pipIrrGlobal.config;
-/**
- * @Author: liurunyu
- * @Date: 2025/4/27 9:19
- * @Description
- */
import com.dy.pipIrrGlobal.pojoSe.SeVirtualCard;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.executor.Executor;
@@ -14,10 +9,18 @@
import org.apache.ibatis.plugin.Intercepts;
import org.apache.ibatis.plugin.Invocation;
import org.apache.ibatis.plugin.Signature;
+
import java.lang.reflect.Method;
/**
- * 鎷︽埅铏氭嫙鍗¤〃鐨勬洿鏂版搷浣滐紝浣夸笉鑳借缃崰鐢ㄧ姸鎬佹搷浣溿��
+ * @Author: liurunyu
+ * @Date: 2025/5/15 11:10
+ * @Description
+ */
+/**
+ * 鎷︽埅铏氭嫙鍗¤〃鐨勬洿鏂版搷浣滐紝浣�:
+ * 瀛楁in_use鎰忎负鍗犵敤鐘舵�侊紝褰撲负true鏃剁粺涓�璁剧疆鍊间负0
+ * 瀛楁money鎰忎负鍓╀綑閲戦锛屽綋涓簍rue鏃剁粺涓�璁剧疆鍊间负10000
*/
@Intercepts({
@Signature(
@@ -30,11 +33,12 @@
)
})
@Slf4j
-public class VirtualCardInUseInterceptor implements Interceptor {
+public class VirtualCardSetDefaultInterceptor implements Interceptor {
static int MAPPED_STATEMENT_INDEX = 0;
static int PARAMETER_INDEX = 1;
static String BASE_FIELD_SET_PRIMARY_KEY_FUNTION_SETINUSE = "setInUse";
+ static String BASE_FIELD_SET_PRIMARY_KEY_FUNTION_SETMONEY = "setMoney";
@Override
public Object intercept(Invocation invocation) throws Throwable {
@@ -53,6 +57,16 @@
if (setInUse != null) {
setInUse.invoke(entity, (byte)0);
}
+
+ Method setMoney = null;
+ try {
+ setMoney = entityClass.getMethod(BASE_FIELD_SET_PRIMARY_KEY_FUNTION_SETMONEY, Double.class);
+ } catch (Exception e) {
+ //褰揺ntityClass娌℃湁setMoney鏂规硶鏃讹紝浼氭姏鍑哄紓甯�
+ }
+ if (setMoney != null) {
+ setMoney.invoke(entity, 10000.00D);
+ }
invocation.getArgs()[PARAMETER_INDEX] = entity;
}
}
diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-common-web\050121\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-common-web\050121\346\234\215\345\212\241\345\231\250\051.yml"
index f0d89cb..1fa5dc0 100644
--- "a/pipIrr-platform/pipIrr-global/src/main/resources/application-common-web\050121\346\234\215\345\212\241\345\231\250\051.yml"
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/application-common-web\050121\346\234\215\345\212\241\345\231\250\051.yml"
@@ -3,7 +3,9 @@
# 121鏈嶅姟鍣細mq,yq,hlj,gz,lz,jc
spring_main_datasource_names: mq,yq,hlj,gz,lz,jc
- # 铏氭嫙鍗¤〃瀛楁in_use鎰忎负鍗犵敤鐘舵�侊紝褰撲负true鏃剁粺涓�璁剧疆鍊间负0
+ # 铏氭嫙鍗¤〃:
+ # 瀛楁in_use鎰忎负鍗犵敤鐘舵�侊紝褰撲负true鏃剁粺涓�璁剧疆鍊间负0
+ # 瀛楁money鎰忎负鍓╀綑閲戦锛屽綋涓簍rue鏃剁粺涓�璁剧疆鍊间负10000
# 233鏈嶅姟鍣細false
# 121鏈嶅姟鍣細true
- virtual_card_disable_set_inuse: true
\ No newline at end of file
+ virtual_card_set_default: true
\ No newline at end of file
diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-common-web\050233\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-common-web\050233\346\234\215\345\212\241\345\231\250\051.yml"
index f274f98..0731d32 100644
--- "a/pipIrr-platform/pipIrr-global/src/main/resources/application-common-web\050233\346\234\215\345\212\241\345\231\250\051.yml"
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/application-common-web\050233\346\234\215\345\212\241\345\231\250\051.yml"
@@ -3,7 +3,9 @@
# 121鏈嶅姟鍣細mq,yq,hlj,gz,lz,jc
spring_main_datasource_names: ym,mj,sp,test
- # 铏氭嫙鍗¤〃瀛楁in_use鎰忎负鍗犵敤鐘舵�侊紝褰撲负true鏃剁粺涓�璁剧疆鍊间负0
+ # 铏氭嫙鍗¤〃:
+ # 瀛楁in_use鎰忎负鍗犵敤鐘舵�侊紝褰撲负true鏃剁粺涓�璁剧疆鍊间负0
+ # 瀛楁money鎰忎负鍓╀綑閲戦锛屽綋涓簍rue鏃剁粺涓�璁剧疆鍊间负10000
# 233鏈嶅姟鍣細false
# 121鏈嶅姟鍣細true
- virtual_card_disable_set_inuse: false
\ No newline at end of file
+ virtual_card_set_default: false
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-common-web.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-common-web.yml
index 4bc3dd2..0731d32 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-common-web.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-common-web.yml
@@ -3,7 +3,9 @@
# 121鏈嶅姟鍣細mq,yq,hlj,gz,lz,jc
spring_main_datasource_names: ym,mj,sp,test
- # 铏氭嫙鍗¤〃瀛楁in_use鎰忎负鍗犵敤鐘舵�侊紝褰撲负true鏃剁粺涓�璁剧疆鍊间负0
+ # 铏氭嫙鍗¤〃:
+ # 瀛楁in_use鎰忎负鍗犵敤鐘舵�侊紝褰撲负true鏃剁粺涓�璁剧疆鍊间负0
+ # 瀛楁money鎰忎负鍓╀綑閲戦锛屽綋涓簍rue鏃剁粺涓�璁剧疆鍊间负10000
# 233鏈嶅姟鍣細false
# 121鏈嶅姟鍣細true
- virtual_card_disable_set_inuse: false
+ virtual_card_set_default: false
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealIcRemainMoney.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealIcRemainMoney.java
index cac382a..97bba93 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealIcRemainMoney.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealIcRemainMoney.java
@@ -49,7 +49,7 @@
}
this.doDeal(sv, dV1, vo);
}catch (Exception e){
- log.error("淇濆瓨鍙栨按鍙ｆ棩鐢ㄦ按閲忓拰婕忔崯閲忔暟鎹椂鍙戠敓寮傚父", e);
+ log.error("淇濆瓨IC鍗″墿浣欓噾棰濇椂鍙戠敓寮傚父", e);
}
}
}
--
Gitblit v1.8.0