1.材质证件跟踪增加excel导出功能

2.修正材质证件跟踪主键格式
3.优化作业计划执行划线和切割查询条件
4.优化数据库连接

src/main/java/com/dsic/gj_erp/config/DynamicDataSourceConfig.java

@@ -10,12 +10,12 @@ import javax.sql.DataSource;
 
 @Configuration
 public class DynamicDataSourceConfig {
-    @Primary
+//    @Primary
-    @Bean("masterDataSource")
+//    @Bean("masterDataSource")
-    @ConfigurationProperties("spring.datasource.master")
+//    @ConfigurationProperties("spring.datasource.master")
-    public DataSource masterDataSource() {
+//    public DataSource masterDataSource() {
-        return DataSourceBuilder.create().build();
+//        return DataSourceBuilder.create().build();
-    }
+//    }
 
     @Bean("jiuzhouDataSource")
     @ConfigurationProperties("spring.datasource.jiuzhou")

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.setMinimumIdle(40);
-        dataSource.setMaxLifetime(1800000);
+        dataSource.setMaxLifetime(300000);
         dsInitializer.setDataSource(dataSource);
         ResourceDatabasePopulator dbPopulator = new ResourceDatabasePopulator();
         dsInitializer.setDatabasePopulator(dbPopulator);

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);
     }
 

src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java

@@ -45,7 +45,7 @@ public class ZyjhService extends ServiceImpl<DmYdjhMapper,DmYdjh> {
     }
 
     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<DmYdjhMapper,DmYdjh> {
         LambdaUpdateWrapper<DmYdjh> wrapper = new LambdaUpdateWrapper<DmYdjh>()
                 .eq(DmYdjh::getDcCh,dto.getDcCh())
                 .eq(DmYdjh::getDcPl,dto.getDcPl())
-                .eq(DmYdjh::getZyq1,dto.getZyq())
+                .eq(DmYdjh::getZyq1,dto.getZyq());
-                .ge(DmYdjh::getZt,32);
 
         String pgrq = DateUtil.date().toString("yyyy/MM/dd HH:mm:ss");
         switch (dto.getZt()){
@@ -118,13 +117,16 @@ public class ZyjhService extends ServiceImpl<DmYdjhMapper,DmYdjh> {
                 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;
         }