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/singleDataSource/DruidDataSourceConfig.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/singleDataSource/DruidDataSourceConfig.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/singleDataSource/DruidDataSourceConfig.java
new file mode 100644
index 0000000..962fe3e
--- /dev/null
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/singleDataSource/DruidDataSourceConfig.java
@@ -0,0 +1,28 @@
+package com.dy.common.singleDataSource;
+
+import com.alibaba.druid.pool.DruidDataSource;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import javax.sql.DataSource;
+import java.sql.SQLException;
+
+@Configuration
+public class DruidDataSourceConfig {
+
+ //缂栧啓鏂规硶,娉ㄥ叆DruidDataSource
+ //杩樻湁璇存槑涓�涓嬩负浠�涔堟垜浠敞鍏ヨ嚜宸辩殑DataSource , 榛樿鐨凥iKariDatasource澶辨晥?
+ //1. 榛樿鐨勬暟鎹簮 濡傞厤缃�? @ConditionalOnMissingBean({ DataSource.class, XADataSource.class })
+ // 瑙ｈ閫氳繃@ConditionalOnMissingBean({ DataSource.class}) 鍒ゆ柇濡傛灉瀹瑰櫒鏈塂ataSource Bean 灏变笉娉ㄥ叆榛樿鐨凥iKariDatasource
+ @ConfigurationProperties("spring.datasource")
+ @Bean
+ public DataSource dataSource() throws SQLException {
+ //1. 閰嶇疆浜� @ConfigurationProperties("spring.datasource")
+ // 灏卞彲浠ヨ鍙栧埌application.yml鐨勯厤缃�
+ //2. 鎴戜滑灏变笉闇�瑕佽皟鐢―ruidDataSource 瀵硅薄鐨剆etXxx, 浼氳嚜鍔ㄥ叧鑱�
+
+ DruidDataSource druidDataSource = new DruidDataSource();
+ return druidDataSource;
+ }
+}
--
Gitblit v1.8.0