From ab1eda6c040cf7935325e31bd061521f8c239fd8 Mon Sep 17 00:00:00 2001
From: sunjiabei <sjb3125@163.com>
Date: Mon, 18 Aug 2025 17:30:43 +0800
Subject: [PATCH] =?UTF-8?q?8=E6=9C=8818=E6=97=A5=EF=BC=88=E6=96=B0?=
 =?UTF-8?q?=EF=BC=89=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demo/config/SqlServer1DataSourceConfig.java    | 44 +++++++++++-----------
 .../sqlServiceMapper/HistoryRecordMapper.xml       | 39 +++++++++++++++++++
 2 files changed, 61 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/example/demo/config/SqlServer1DataSourceConfig.java b/src/main/java/com/example/demo/config/SqlServer1DataSourceConfig.java
index 02a2d32..0ee5b15 100644
--- a/src/main/java/com/example/demo/config/SqlServer1DataSourceConfig.java
+++ b/src/main/java/com/example/demo/config/SqlServer1DataSourceConfig.java
@@ -29,28 +29,28 @@ public class SqlServer1DataSourceConfig {
         return DataSourceBuilder.create().type(HikariDataSource.class).build();
     }
 
-//    /**
-//     * 定义 SQL Server 的 SqlSessionFactory
-//     */
-//    @Bean(name = "sqlserver1SqlSessionFactory")
-//    public SqlSessionFactory sqlserver1SqlSessionFactory(@Qualifier("sqlserver1DataSource") DataSource dataSource,
-//                                                         @Qualifier("globalConfiguration1") org.apache.ibatis.session.Configuration globalConfiguration) throws Exception {
-//        log.info("Initializing SQL Server SqlSessionFactory...");
-//        SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean();
-//        sessionFactory.setDataSource(dataSource);
-//        sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath:mapper/sqlserver/*.xml"));
-//        sessionFactory.setConfiguration(globalConfiguration);
-//        return sessionFactory.getObject();
-//    }
-//
-//    /**
-//     * 定义 SQL Server 的 SqlSessionTemplate
-//     */
-//    @Bean(name = "sqlserver1SqlSessionTemplate")
-//    public SqlSessionTemplate sqlserver1SqlSessionTemplate(@Qualifier("sqlserver1SqlSessionFactory") SqlSessionFactory sqlSessionFactory) {
-//        log.info("Initializing SQL Server SqlSessionTemplate...");
-//        return new SqlSessionTemplate(sqlSessionFactory);
-//    }
+    /**
+     * 定义 SQL Server 的 SqlSessionFactory
+     */
+    @Bean(name = "sqlserver1SqlSessionFactory")
+    public SqlSessionFactory sqlserver1SqlSessionFactory(@Qualifier("sqlserver1DataSource") DataSource dataSource,
+                                                         @Qualifier("globalConfiguration1") org.apache.ibatis.session.Configuration globalConfiguration) throws Exception {
+        log.info("Initializing SQL Server SqlSessionFactory...");
+        SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean();
+        sessionFactory.setDataSource(dataSource);
+        sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath:mapper/sqlServiceMapper/*.xml"));
+        sessionFactory.setConfiguration(globalConfiguration);
+        return sessionFactory.getObject();
+    }
+
+    /**
+     * 定义 SQL Server 的 SqlSessionTemplate
+     */
+    @Bean(name = "sqlserver1SqlSessionTemplate")
+    public SqlSessionTemplate sqlserver1SqlSessionTemplate(@Qualifier("sqlserver1SqlSessionFactory") SqlSessionFactory sqlSessionFactory) {
+        log.info("Initializing SQL Server SqlSessionTemplate...");
+        return new SqlSessionTemplate(sqlSessionFactory);
+    }
 
     /**
      * 定义全局 MyBatis 配置
diff --git a/src/main/resources/sqlServiceMapper/HistoryRecordMapper.xml b/src/main/resources/sqlServiceMapper/HistoryRecordMapper.xml
index c1f5eac..4f7c390 100644
--- a/src/main/resources/sqlServiceMapper/HistoryRecordMapper.xml
+++ b/src/main/resources/sqlServiceMapper/HistoryRecordMapper.xml
@@ -6,5 +6,44 @@
     </select>
 
     <select id="getNewHistoryRecord" resultType="com.example.demo.domain.vo.coin.HistoryRecord">
+        SELECT
+        -- 主表字段（hwhcGold库）
+        ui.Name AS name,
+        ugr.jwcode AS jwcode,
+        (ugr.buy_jb + ugr.free + ugr.core_jb) AS num,
+        -- 关联表字段（其他库，例如db2库的user_info表）
+        ugt.remark_cn AS updateType,  -- 假设从其他库获取更新类型
+        ugr.buy_jb AS permanentGold,
+        ugr.free AS freeGold,
+        ugr.core_jb AS taskGold,
+        ugr.cz_user AS operator,
+        ugr.cz_time AS createTime,
+        ugr.cz_bz AS remark
+        FROM
+        -- 主表：hwhcGold库的user_gold_records
+        [hwhcGold].[dbo].[user_gold_records] ugr
+        LEFT JOIN
+        -- 关联表：user_info
+        [hwerp].[dbo].[UserInfo] ui
+        ON ugr.jwcode = ui.Jwcode  -- 关联条件：精网号
+        LEFT JOIN
+        -- 关联表
+        [hwhcGold].[dbo].[user_gold_typeInfo] ugt
+        ON ugr.gtype = ugt.id  -- 关联条件：精网号
+        <where>
+            <if test="startTime != null">
+                AND ugr.cz_time &gt;= #{startTime}
+            </if>
+            <if test="endTime != null">
+                AND ugr.cz_time &lt;= #{endTime}
+            </if>
+            <if test="jwcode != null">
+                AND ugr.jwcode = #{jwcode}  -- 支持按精网号筛选
+            </if>
+            <if test="name != null">
+                AND ugr.name = #{name}  -- 支持按姓名筛选
+            </if>
+        </where>
+        ORDER BY ugr.cz_time DESC
     </select>
 </mapper>
\ No newline at end of file