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 { + } 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 @@ + + + + + +