diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java index 0a5bf8c..c9e535c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java @@ -62,6 +62,9 @@ public class RiskReportFacade { @Autowired private BasicConfigService basicConfigService; + @Autowired + private AccessPermissionFacade accessPermissionFacade; + @Autowired private AutoMatchFacade autoMatchFacade; @@ -274,6 +277,10 @@ public class RiskReportFacade { basicQuery.setYn(YnEnums.YES.getId()); basicQuery.setTypeId("b7ea005c-dfac-4c2a-bdae-25239b3f44fd"); + List permissionsModelList = accessPermissionFacade.findAccessPerminssionByUserId(userId); + + String permission = permissionsModelList.get(0).getAreaPermission(); + System.out.println("permission======"+permission); String parentId = ""; if (StringUtils.isNotEmpty(countRequest.getProvinceId())) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java index 1658a0b..d50a556 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java @@ -29,7 +29,9 @@ import org.apache.http.message.BasicNameValuePair; import org.apache.http.util.EntityUtils; import org.joda.time.DateTime; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.data.domain.Sort; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Service; import javax.print.attribute.standard.DateTimeAtCompleted; @@ -92,6 +94,10 @@ public class SyncDataTaskService { @Autowired private AntenatalExaminationService antenatalExaminationService; + @Autowired + @Qualifier("commonThreadPool") + private ThreadPoolTaskExecutor commonThreadPool; + /** * 该方法是区域或者单体医院部署的把数据定时往某个环境上传 * (如往线上环境上传,mongo_sync_url就配置相应的线上的接收地址) @@ -176,7 +182,7 @@ public class SyncDataTaskService { end = list.size(); } final List tempList = list.subList(i, end); - new Thread(new Runnable() { + commonThreadPool.execute(new Runnable() { @Override public void run() { if (CollectionUtils.isNotEmpty(tempList)) @@ -196,7 +202,7 @@ public class SyncDataTaskService { } } } - }).start(); + }); } } }catch(Exception ex){