From c19de84fa332a00c651f28e3a52292fd14f143a1 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 23 九月 2025 17:30:07 +0800
Subject: [PATCH] 陆常丽反应软件系统财务对账时而数据不准确，分析源码，找到bug原因是，财务对账统计只有用户点击后才会触发统计功能，把历史上及当天进行了统计，如果当天统计时未下班，例如是中午触发统计了，而下午又进行了充值售水，但下班后未再点击触发对账统计，那么今天的对账统计完成了但数据不对。编写自动任务，在下半夜进行对账统计。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/ProtocolCache.java | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/ProtocolCache.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/ProtocolCache.java
index c076537..81bc5b7 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/ProtocolCache.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/ProtocolCache.java
@@ -19,17 +19,35 @@
* 鍦ㄥ崟绾跨▼鐜涓繍琛�
* 閫氳繃鍗忚椹卞姩鐨勭被鍚嶏紝寰楀埌绫诲崟渚�
* @param protocolName 鍗忚鍚嶇О
+ * @param protocolVersion 鍗忚鐗堟湰鍙�
* @return 椹卞姩
* @throws Exception 寮傚父
*/
- public static Driver getDriver(String protocolName) throws Exception{
- Driver dri = drivers.get(protocolName);
+ public static Driver getDriver(String protocolName, short protocolVersion) throws Exception{
+ Driver dri = drivers.get(protocolName + protocolVersion) ;
if(dri == null){
- AnnotationDriverVo vo = driverMap.get(protocolName) ;
+ AnnotationDriverVo vo = driverMap.get(protocolName + protocolVersion) ;
if(vo != null && vo.clazz != null){
dri = (Driver)vo.clazz.getDeclaredConstructor().newInstance();
- //dri = (Driver)vo.clazz.newInstance() ;
- drivers.put(protocolName, dri) ;
+ drivers.put(protocolName + protocolVersion, dri) ;
+ }
+ }
+ return dri ;
+ }
+ /**
+ * 鍦ㄥ崟绾跨▼鐜涓繍琛�
+ * 閫氳繃鍗忚椹卞姩鐨勭被鍚嶏紝寰楀埌绫诲崟渚�
+ * @param protocolNameVersion 鍗忚鍚嶇О鍜岀増鏈彿
+ * @return 椹卞姩
+ * @throws Exception 寮傚父
+ */
+ public static Driver getDriver(String protocolNameVersion) throws Exception{
+ Driver dri = drivers.get(protocolNameVersion) ;
+ if(dri == null){
+ AnnotationDriverVo vo = driverMap.get(protocolNameVersion) ;
+ if(vo != null && vo.clazz != null){
+ dri = (Driver)vo.clazz.getDeclaredConstructor().newInstance();
+ drivers.put(protocolNameVersion, dri) ;
}
}
return dri ;
@@ -79,6 +97,18 @@
return onLineMap;
}
+ protected AnnotationDriverVo getAnnotationDriver(String protocolName, Short protocolVersion){
+ return driverMap.get(protocolName + "" + protocolVersion) ;
+ }
+
+ protected static AnnotationPrefixedDataAvailableVo getAnnotationPrefixedDataAvailable(String protocolName, Short protocolVersion){
+ return prefixedDataAvailableMap.get(protocolName + "" + protocolVersion) ;
+ }
+
+ protected static AnnotationOnLineVo getAnnotationOnLine(String protocolName, Short protocolVersion){
+ return onLineMap.get(protocolName + "" + protocolVersion) ;
+ }
+
/*
public static void main(String[] args){
HashMap<String, Integer> mp = new HashMap<>() ;
--
Gitblit v1.8.0