From 203223860baa19deb6860eb2ba3181910d662980 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 17 四月 2025 14:22:59 +0800
Subject: [PATCH] 1. 轮灌组被终止时灌溉时长为实际数值。2. 计划历史表按照创建时间倒排序。3. 发布计划时判断是否同项目下未完成计划，是否其他项目下使用了本计划的轮灌组且计划未完成。4. 根据计划ID获取计划最新状态。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/DataSourceSingleAspect.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/DataSourceSingleAspect.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/DataSourceSingleAspect.java
index 860bfcc..1f7c680 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/DataSourceSingleAspect.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/DataSourceSingleAspect.java
@@ -33,24 +33,24 @@
DataSourceSingle dataSource = method.getAnnotation(DataSourceSingle.class);
if (Objects.nonNull(dataSource) && !StringUtils.isNullOrEmpty(dataSource.value())) {
- log.info("鏁版嵁婧愭寚瀹氫负" + dataSource.value());
+ //log.info("鏁版嵁婧愭寚瀹氫负" + dataSource.value());
//寮哄埗杞垚鏂规硶涓婇厤缃殑鏁版嵁婧愶紝鏇挎崲鎺塂ataSourceContext涓繚瀛樼殑鏁版嵁婧�
DataSourceContext.set(dataSource.value());
}else{
String datasourceName = SpringContextUtil.getApplicationContext().getEnvironment().getProperty("spring.datasource.names") ;
if(!StringUtils.isNullOrEmpty(datasourceName)){
- log.info("鏍规嵁閰嶇疆鏁版嵁婧愪负" + datasourceName);
+ //log.info("鏍规嵁閰嶇疆鏁版嵁婧愪负" + datasourceName);
DataSourceContext.set(datasourceName);
}else{
log.error("鏁版嵁婧愭湭鎸囧畾");
}
}
try {
- log.info("鏁版嵁搴撴搷浣滃紑濮�" + dataSource.value());
+ //log.info("鏁版嵁搴撴搷浣滃紑濮�" + dataSource.value());
return point.proceed();
} finally {
// 閿�姣佹暟鎹簮 鍦ㄦ墽琛屾柟娉曚箣鍚�
- log.info("鏁版嵁婧愭搷浣滃畬姣�" + dataSource.value());
+ //log.info("鏁版嵁婧愭搷浣滃畬姣�" + dataSource.value());
DataSourceContext.remove();
}
}
--
Gitblit v1.8.0