From b8b6ca5dcece9853c2c0c1794f13b27e150b9289 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Thu, 2 Jan 2025 11:32:31 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=9D=90=E8=B4=A8=E8=AF=81=E4=BB=B6=E8=B7=9F?= =?UTF-8?q?=E8=B8=AA=E5=A2=9E=E5=8A=A0excel=E5=AF=BC=E5=87=BA=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=202.=E4=BF=AE=E6=AD=A3=E6=9D=90=E8=B4=A8=E8=AF=81?= =?UTF-8?q?=E4=BB=B6=E8=B7=9F=E8=B8=AA=E4=B8=BB=E9=94=AE=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=203.=E4=BC=98=E5=8C=96=E4=BD=9C=E4=B8=9A=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=88=92=E7=BA=BF=E5=92=8C=E5=88=87=E5=89=B2?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=204.=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=BF=9E=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dsic/gj_erp/config/DynamicDataSourceConfig.java | 12 ++++++------ src/main/java/com/dsic/gj_erp/config/JapConfig.java | 10 ++++++---- .../dsic/gj_erp/config/MyBatisPlusConfigMaster.java | 4 ++-- .../com/dsic/gj_erp/service/zyjh/ZyjhService.java | 12 +++++++----- 4 files changed, 21 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/dsic/gj_erp/config/DynamicDataSourceConfig.java b/src/main/java/com/dsic/gj_erp/config/DynamicDataSourceConfig.java index 7ba5509..d705f01 100644 --- a/src/main/java/com/dsic/gj_erp/config/DynamicDataSourceConfig.java +++ b/src/main/java/com/dsic/gj_erp/config/DynamicDataSourceConfig.java @@ -10,12 +10,12 @@ import javax.sql.DataSource; @Configuration public class DynamicDataSourceConfig { - @Primary - @Bean("masterDataSource") - @ConfigurationProperties("spring.datasource.master") - public DataSource masterDataSource() { - return DataSourceBuilder.create().build(); - } +// @Primary +// @Bean("masterDataSource") +// @ConfigurationProperties("spring.datasource.master") +// public DataSource masterDataSource() { +// return DataSourceBuilder.create().build(); +// } @Bean("jiuzhouDataSource") @ConfigurationProperties("spring.datasource.jiuzhou") 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 4fd436a..40bd37e 100644 --- a/src/main/java/com/dsic/gj_erp/config/JapConfig.java +++ b/src/main/java/com/dsic/gj_erp/config/JapConfig.java @@ -12,6 +12,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.jdbc.DataSourceBuilder; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; import org.springframework.core.env.Environment; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; import org.springframework.jdbc.datasource.init.DataSourceInitializer; @@ -41,6 +42,7 @@ public class JapConfig { return new DataSourceProperties(); } + @Primary @Bean("jpaDataSource") public DataSource jpaDataSource() { DataSourceProperties manDataSourceProperties = japDataSourceProperties(); @@ -91,12 +93,12 @@ public class JapConfig { public DataSourceInitializer manDataSourceInitializer() {//6 DataSourceInitializer dsInitializer = new DataSourceInitializer(); HikariDataSource dataSource = (HikariDataSource) jpaDataSource(); - dataSource.setConnectionTimeout(30000); + dataSource.setConnectionTimeout(10000); dataSource.setIdleTimeout(60000); - dataSource.setMaximumPoolSize(200); + dataSource.setMaximumPoolSize(2000); dataSource.setLeakDetectionThreshold(60000); - dataSource.setMinimumIdle(20); - dataSource.setMaxLifetime(1800000); + dataSource.setMinimumIdle(40); + dataSource.setMaxLifetime(300000); dsInitializer.setDataSource(dataSource); ResourceDatabasePopulator dbPopulator = new ResourceDatabasePopulator(); dsInitializer.setDatabasePopulator(dbPopulator); diff --git a/src/main/java/com/dsic/gj_erp/config/MyBatisPlusConfigMaster.java b/src/main/java/com/dsic/gj_erp/config/MyBatisPlusConfigMaster.java index ac21bae..83d63bb 100644 --- a/src/main/java/com/dsic/gj_erp/config/MyBatisPlusConfigMaster.java +++ b/src/main/java/com/dsic/gj_erp/config/MyBatisPlusConfigMaster.java @@ -24,7 +24,7 @@ import javax.sql.DataSource; public class MyBatisPlusConfigMaster { @Primary @Bean("masterSqlSessionFactory") - public SqlSessionFactory masterSqlSessionFactory(@Qualifier("masterDataSource") DataSource dataSource, MppSqlInjector mppSqlInjector) throws Exception { + public SqlSessionFactory masterSqlSessionFactory(@Qualifier("jpaDataSource") DataSource dataSource, MppSqlInjector mppSqlInjector) throws Exception { MybatisSqlSessionFactoryBean sqlSessionFactory = new MybatisSqlSessionFactoryBean(); sqlSessionFactory.setDataSource(dataSource); @@ -47,7 +47,7 @@ public class MyBatisPlusConfigMaster { @Primary @Bean(name = "masterTransactionManager") - public DataSourceTransactionManager masterTransactionManager(@Qualifier("masterDataSource") DataSource dataSource) { + public DataSourceTransactionManager masterTransactionManager(@Qualifier("jpaDataSource") DataSource dataSource) { return new DataSourceTransactionManager(dataSource); } diff --git a/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java b/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java index 5bb3ea5..59686fa 100644 --- a/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java +++ b/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java @@ -45,7 +45,7 @@ public class ZyjhService extends ServiceImpl { } public String getMpDhsjDhh(){ - String date=DateUtil.date().toString("yyyyMMdd"); + String date=DateUtil.date().toString("yyMMdd"); Object xh = redisTemplate.opsForHash().get(MPDHSJ_KEY, date); if(ObjUtil.isEmpty(xh)){ redisTemplate.opsForHash().put(MPDHSJ_KEY, date,0); @@ -107,8 +107,7 @@ public class ZyjhService extends ServiceImpl { LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper() .eq(DmYdjh::getDcCh,dto.getDcCh()) .eq(DmYdjh::getDcPl,dto.getDcPl()) - .eq(DmYdjh::getZyq1,dto.getZyq()) - .ge(DmYdjh::getZt,32); + .eq(DmYdjh::getZyq1,dto.getZyq()); String pgrq = DateUtil.date().toString("yyyy/MM/dd HH:mm:ss"); switch (dto.getZt()){ @@ -118,13 +117,16 @@ public class ZyjhService extends ServiceImpl { break; case "42": case "52": + wrapper.ge(DmYdjh::getZt,32); if ("HXPG".equals(dto.getZxZtName())){ wrapper.set(DmYdjh::getHxpgrq,pgrq).set(DmYdjh::getHxpgry,dto.getForemanId()).set(DmYdjh::getZt,"51"); - wrapper.lt(DmYdjh::getZt,51);//仅处理未派工的数据 + wrapper.isNull(DmYdjh::getHxpgrq).isNull(DmYdjh::getHxpgry); + //wrapper.lt(DmYdjh::getZt,51);//仅处理未派工的数据 } if ("QGPG".equals(dto.getZxZtName())){ wrapper.set(DmYdjh::getQgpgrq,pgrq).set(DmYdjh::getQgpgry,dto.getForemanId()).set(DmYdjh::getZt,"61"); - wrapper.lt(DmYdjh::getZt,61);//仅处理未派工的数据 + wrapper.eq(DmYdjh::getZt,"52").isNull(DmYdjh::getQgpgrq).isNull(DmYdjh::getQgpgry); + //wrapper.lt(DmYdjh::getZt,61);//仅处理未派工的数据 } break; }