diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/SynProjectCollectionTask.java b/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/SynProjectCollectionTask.java index 451c3f6..9c64cec 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/SynProjectCollectionTask.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/SynProjectCollectionTask.java @@ -124,18 +124,18 @@ public class SynProjectCollectionTask { ProjectListReq req = new ProjectListReq(); req.setPageNumber(1); req.setPageSize(BizConst.MAX_EXPORT_COUNT); - List projects = approveService.list(Wrappers.lambdaQuery(GovBizProjectApprove.class) - .eq(GovBizProjectApprove::getDeleted,Boolean.FALSE) - .eq(StringUtils.isNotBlank(projId),GovBizProjectApprove::getBaseProjId,projId) - .isNotNull(GovBizProjectApprove::getBaseReviewCommentsFile) - .isNull(GovBizProjectApprove::getBaseReviewCommentsFilePdf)); + List projects = applyService.list(Wrappers.lambdaQuery(GovBizProjectApply.class) + .eq(GovBizProjectApply::getDeleted,Boolean.FALSE) + .eq(StringUtils.isNotBlank(projId),GovBizProjectApply::getBaseProjId,projId) + .isNotNull(GovBizProjectApply::getBaseProjBasisFile) + .isNull(GovBizProjectApply::getBaseProjBasisFilePdf)); if(CollUtil.isEmpty(projects)){ log.info("没有项目归集 任务终止"); return; } - for(GovBizProjectApprove project : projects){ + for(GovBizProjectApply project : projects){ //开始转换PDF convertPdfVo(project.getBaseProjId()); } diff --git a/pmapi/src/main/resources/application-pre.yml b/pmapi/src/main/resources/application-pre.yml index a88ca1e..a5f5613 100644 --- a/pmapi/src/main/resources/application-pre.yml +++ b/pmapi/src/main/resources/application-pre.yml @@ -52,7 +52,7 @@ spring: # 是允许连接在连接池中空闲的最长时间 minimum-idle: 10 # 配置最大池大小 - maximum-pool-size: 20 + maximum-pool-size: 200 # 是允许连接在连接池中空闲的最长时间(以毫秒为单位) idle-timeout: 60000 # 池中连接关闭后的最长生命周期(以毫秒为单位) diff --git a/pmapi/src/main/resources/application-prod.yml b/pmapi/src/main/resources/application-prod.yml index 26a9510..da31812 100644 --- a/pmapi/src/main/resources/application-prod.yml +++ b/pmapi/src/main/resources/application-prod.yml @@ -52,7 +52,7 @@ spring: # 是允许连接在连接池中空闲的最长时间 minimum-idle: 10 # 配置最大池大小 - maximum-pool-size: 20 + maximum-pool-size: 200 # 是允许连接在连接池中空闲的最长时间(以毫秒为单位) idle-timeout: 60000 # 池中连接关闭后的最长生命周期(以毫秒为单位) diff --git a/pmapi/src/test/java/com/ningdatech/pmapi/projectCollection/ProjectCollectionTest.java b/pmapi/src/test/java/com/ningdatech/pmapi/projectCollection/ProjectCollectionTest.java index 4f6abe3..f99cf0f 100644 --- a/pmapi/src/test/java/com/ningdatech/pmapi/projectCollection/ProjectCollectionTest.java +++ b/pmapi/src/test/java/com/ningdatech/pmapi/projectCollection/ProjectCollectionTest.java @@ -75,7 +75,9 @@ public class ProjectCollectionTest extends AppTests { @Test public void test(){ - List baseProjIds = Lists.newArrayList("33110000020210100194","33110000020220100194"); + List baseProjIds = Lists.newArrayList("33110000020110100001", + "33110000020210200202","33110000020220100223", + "33110000020210100201","3311000000002022200138"); for(String baseProjId : baseProjIds){ GovBizProjectBaseinfo baseinfo = baseinfoService.getOne(Wrappers.lambdaQuery(GovBizProjectBaseinfo.class) .eq(GovBizProjectBaseinfo::getBaseProjId, baseProjId)