From f647391f51c3619b3b1b6202a6bf1258ebbce5ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Wed, 17 Apr 2024 11:13:18 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=A4=9A=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90=E5=85=BC=E5=AE=B9=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/dsic/gj_erp/GjErpApplication.java         | 4 +---
 src/main/java/com/dsic/gj_erp/config/JapConfig.java         | 4 +++-
 .../com/dsic/gj_erp/config/MyBatisPlusConfigJiuZhou.java    | 4 ++--
 .../com/dsic/gj_erp/config/MyPhysicalNamingStrategy.java    | 2 +-
 src/main/java/com/dsic/gj_erp/jiuzhoumapper/SljhMapper.java | 1 +
 src/main/resources/jiuzhoumappers/SljhMapper.xml            | 6 ++++++
 6 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 src/main/resources/jiuzhoumappers/SljhMapper.xml

diff --git a/src/main/java/com/dsic/gj_erp/GjErpApplication.java b/src/main/java/com/dsic/gj_erp/GjErpApplication.java
index 54a88a5..bf6f0ff 100644
--- a/src/main/java/com/dsic/gj_erp/GjErpApplication.java
+++ b/src/main/java/com/dsic/gj_erp/GjErpApplication.java
@@ -25,9 +25,7 @@ import java.util.Properties;
 @EnableAsync
 @EnableMPP
 @SpringBootApplication(exclude = {
-        DataSourceAutoConfiguration.class,
-        HibernateJpaAutoConfiguration.class,
-        DataSourceTransactionManagerAutoConfiguration.class} )
+        DataSourceAutoConfiguration.class} )
 @EnableSwagger2
 @EnableTransactionManagement
 public class GjErpApplication {
diff --git a/src/main/java/com/dsic/gj_erp/config/JapConfig.java b/src/main/java/com/dsic/gj_erp/config/JapConfig.java
index b87d107..7870e2e 100644
--- a/src/main/java/com/dsic/gj_erp/config/JapConfig.java
+++ b/src/main/java/com/dsic/gj_erp/config/JapConfig.java
@@ -54,7 +54,9 @@ public class JapConfig {
     @Bean
     public PlatformTransactionManager manTransactionManager() { //4
         EntityManagerFactory factory = manEntityManagerFactory().getObject();
-        return new JpaTransactionManager(factory);
+        JpaTransactionManager jpaTransactionManager = new JpaTransactionManager(factory);
+        System.out.println(jpaTransactionManager.isNestedTransactionAllowed());
+        return jpaTransactionManager;
     }
 
     @Bean
diff --git a/src/main/java/com/dsic/gj_erp/config/MyBatisPlusConfigJiuZhou.java b/src/main/java/com/dsic/gj_erp/config/MyBatisPlusConfigJiuZhou.java
index 3b8bd63..3b0ebfd 100644
--- a/src/main/java/com/dsic/gj_erp/config/MyBatisPlusConfigJiuZhou.java
+++ b/src/main/java/com/dsic/gj_erp/config/MyBatisPlusConfigJiuZhou.java
@@ -33,9 +33,9 @@ public class MyBatisPlusConfigJiuZhou {
         configuration.setMapUnderscoreToCamelCase(true);
         sqlSessionFactory.setConfiguration(configuration);
 
-        sqlSessionFactory.setTypeAliasesPackage("com.dsic.gj_erp.bean");
+        sqlSessionFactory.setTypeAliasesPackage("com.dsic.gj_erp.bean.jiuzhou");
         sqlSessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver().
-                getResources("classpath:mappers/*/*.xml"));
+                getResources("classpath:jiuzhoumappers/*.xml"));
         sqlSessionFactory.setPlugins(new PaginationInterceptor());
         sqlSessionFactory.setGlobalConfig(globalConfig(mppSqlInjector));
 
diff --git a/src/main/java/com/dsic/gj_erp/config/MyPhysicalNamingStrategy.java b/src/main/java/com/dsic/gj_erp/config/MyPhysicalNamingStrategy.java
index 4e2707c..e9baa95 100644
--- a/src/main/java/com/dsic/gj_erp/config/MyPhysicalNamingStrategy.java
+++ b/src/main/java/com/dsic/gj_erp/config/MyPhysicalNamingStrategy.java
@@ -19,7 +19,7 @@ public class MyPhysicalNamingStrategy implements PhysicalNamingStrategy {
 
     @Override
     public Identifier toPhysicalTableName(Identifier name, JdbcEnvironment jdbcEnvironment) {
-        return name;
+        return Identifier.toIdentifier(StringUtils.camelToUnderline(name.getText()));
     }
 
     @Override
diff --git a/src/main/java/com/dsic/gj_erp/jiuzhoumapper/SljhMapper.java b/src/main/java/com/dsic/gj_erp/jiuzhoumapper/SljhMapper.java
index 1185f7b..410a2ea 100644
--- a/src/main/java/com/dsic/gj_erp/jiuzhoumapper/SljhMapper.java
+++ b/src/main/java/com/dsic/gj_erp/jiuzhoumapper/SljhMapper.java
@@ -4,4 +4,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.dsic.gj_erp.bean.jiuzhou.Sljh;
 
 public interface SljhMapper extends BaseMapper<Sljh> {
+
 }
diff --git a/src/main/resources/jiuzhoumappers/SljhMapper.xml b/src/main/resources/jiuzhoumappers/SljhMapper.xml
new file mode 100644
index 0000000..cb9f505
--- /dev/null
+++ b/src/main/resources/jiuzhoumappers/SljhMapper.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dsic.gj_erp.jiuzhoumapper.SljhMapper">
+
+
+</mapper>