This commit is contained in:
parent
f1f404c45b
commit
0462d36d97
|
@ -231,7 +231,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
|
|||
switch (Constant.ProjectPlace.getByFlag(projectPlace)) {
|
||||
case TSINGTAO:
|
||||
case BAOTOU: { // 包头、青岛
|
||||
logger.error("包头、青岛");
|
||||
logger.info("包头、青岛");
|
||||
if (resourceDTO.getInfoList().isEmpty()) {
|
||||
List<ResourceDTO> resourceDTOS = resourceDao.selectDTOPage(resourceDTO, (pageNum - 1) * pageSize, pageSize, orderField, orderType);
|
||||
resultPage.setRecords(resourceDTOS);
|
||||
|
@ -255,7 +255,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
|
|||
break;
|
||||
case TSINGTAO_XHA: {
|
||||
if ("基础设施".equals(resourceDTO.getType())) { // 基础设施
|
||||
logger.error("西海岸基础设施");
|
||||
logger.info("西海岸基础设施");
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
CompletableFuture cloud =
|
||||
CompletableFuture.runAsync(() -> { // 云脑专网
|
||||
|
@ -341,7 +341,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
|
|||
});
|
||||
CompletableFuture.allOf(cloud, local);
|
||||
} else {
|
||||
logger.error("西海岸基普通");
|
||||
logger.info("西海岸基普通");
|
||||
if (resourceDTO.getInfoList().isEmpty()) {
|
||||
List<ResourceDTO> resourceDTOS = resourceDao.selectDTOPage(resourceDTO, (pageNum - 1) * pageSize, pageSize, orderField, orderType);
|
||||
resultPage.setRecords(resourceDTOS);
|
||||
|
|
Loading…
Reference in New Issue