From 98fd519b7384c91ea6d33c00c3cdba1795b22e53 Mon Sep 17 00:00:00 2001
From: SZH <szh_hello@163.com>
Date: Mon, 27 Jun 2022 19:05:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigOne.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigOne.java b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigOne.java
index df4e0b5..230546c 100644
--- a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigOne.java
+++ b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigOne.java
@@ -13,14 +13,18 @@
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.Resource;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import org.springframework.core.io.support.ResourcePatternResolver;
import org.springframework.stereotype.Repository;
import javax.sql.DataSource;
+import java.util.ArrayList;
+import java.util.Arrays;
@Configuration
-@MapperScan(basePackages = "com.gkhy.safePlatform",sqlSessionTemplateRef = "sqlTemplate1",annotationClass =
+@MapperScan(basePackages = {"com.gkhy.safePlatform.emergency","com.gkhy.safePlatform.goalManage"},
+ sqlSessionTemplateRef = "sqlTemplate1",annotationClass =
Repository.class)
public class MyBatisConfigOne {
@@ -44,7 +48,18 @@
MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean();
factoryBean.setDataSource(dataSource);
ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
- factoryBean.setMapperLocations(resolver.getResources("classpath*:config/mapper/**/**Mapper.xml"));
+
+ //-------------------
+ Resource[] rs1 = resolver.getResources("classpath*:config/mapper/emergency/**Mapper.xml");
+ Resource[] rs2 = resolver.getResources("classpath*:config/mapper/goalManage/**Mapper.xml");
+ ArrayList<Resource> resourceArrayList = new ArrayList<>(Arrays.asList(rs1));
+ resourceArrayList.addAll(new ArrayList<>(Arrays.asList(rs2)));
+ Resource[] resourceArray = new Resource[resourceArrayList.size()];
+ resourceArrayList.toArray(resourceArray);
+ factoryBean.setMapperLocations(resourceArray);
+ //-------------------
+
+// factoryBean.setMapperLocations(resolver.getResources("classpath*:config/mapper/**/**Mapper.xml"));
//设置分页插件
Interceptor[] plugins = {mybatisPlusInterceptor};
factoryBean.setPlugins(plugins);
--
Gitblit v1.9.2