diff --git a/src/main/java/com/project/information/application/ProductLineApplicationService.java b/src/main/java/com/project/information/application/ProductLineApplicationService.java index 3632dc3..7e287f4 100644 --- a/src/main/java/com/project/information/application/ProductLineApplicationService.java +++ b/src/main/java/com/project/information/application/ProductLineApplicationService.java @@ -5,6 +5,7 @@ import com.project.information.domain.dto.ProductLineDTO; import com.project.information.domain.param.ProductLineParam; import java.util.List; +import java.util.Optional; public interface ProductLineApplicationService { Result save(ProductLineDTO dto) throws Exception; @@ -14,4 +15,6 @@ public interface ProductLineApplicationService { Result rename(ProductLineDTO dto) throws Exception; Result delete(Long id) throws Exception; + + String searchLineNameById(Long subLineId); } diff --git a/src/main/java/com/project/information/application/impl/ProductLineApplicationServiceImpl.java b/src/main/java/com/project/information/application/impl/ProductLineApplicationServiceImpl.java index c64f1a9..aa4e5a0 100644 --- a/src/main/java/com/project/information/application/impl/ProductLineApplicationServiceImpl.java +++ b/src/main/java/com/project/information/application/impl/ProductLineApplicationServiceImpl.java @@ -3,8 +3,10 @@ package com.project.information.application.impl; import com.project.base.domain.result.Result; import com.project.information.application.ProductLineApplicationService; import com.project.information.domain.dto.ProductLineDTO; +import com.project.information.domain.entity.ProductLineEntity; import com.project.information.domain.param.ProductLineParam; import com.project.information.domain.service.GetTreeListProductLineDomainService; +import com.project.information.domain.service.ProductLineBaseService; import com.project.information.domain.service.SaveProductLineDomainService; import com.project.information.domain.service.UpdateProductLineDomainService; import org.springframework.beans.factory.annotation.Autowired; @@ -20,6 +22,9 @@ public class ProductLineApplicationServiceImpl implements ProductLineApplication @Autowired private GetTreeListProductLineDomainService treeListProductLineDomainService; + @Autowired + private ProductLineBaseService productLineBaseService; + @Autowired private UpdateProductLineDomainService updateProductLineDomainService; @Override @@ -41,4 +46,14 @@ public class ProductLineApplicationServiceImpl implements ProductLineApplication public Result delete(Long id) throws Exception { return updateProductLineDomainService.delete(id); } + + @Override + public String searchLineNameById(Long subLineId) { + return productLineBaseService.lambdaQuery() + .eq(ProductLineEntity::getId , subLineId) + .select(ProductLineEntity::getName) + .oneOpt() + .map(ProductLineEntity::getName) + .orElse(""); + } } diff --git a/src/main/java/com/project/task/domain/service/impl/NotifyTaskDomainServiceImpl.java b/src/main/java/com/project/task/domain/service/impl/NotifyTaskDomainServiceImpl.java index 4c4ff9e..1eaf4a3 100644 --- a/src/main/java/com/project/task/domain/service/impl/NotifyTaskDomainServiceImpl.java +++ b/src/main/java/com/project/task/domain/service/impl/NotifyTaskDomainServiceImpl.java @@ -10,8 +10,7 @@ import com.github.tingyugetc520.ali.dingtalk.bean.message.DtCorpConversationMsgS import com.github.tingyugetc520.ali.dingtalk.bean.message.DtMessage; import com.github.tingyugetc520.ali.dingtalk.error.DtErrorException; import com.project.ding.config.DingProperties; -import com.project.information.domain.entity.ProductLineEntity; -import com.project.information.domain.service.ProductLineBaseService; +import com.project.information.application.ProductLineApplicationService; import com.project.task.domain.dto.TaskDTO; import com.project.task.domain.entity.TaskEntity; import com.project.task.domain.entity.TaskUserEntity; @@ -39,7 +38,7 @@ public class NotifyTaskDomainServiceImpl implements NotifyTaskDomainService { @Autowired private DtService dtService; @Autowired - private ProductLineBaseService productLineBaseService; + private ProductLineApplicationService productLineApplicationService; @Autowired private DingProperties dingTalkProperties; @@ -91,12 +90,7 @@ public class NotifyTaskDomainServiceImpl implements NotifyTaskDomainService { } //获取子产品线名称 - String subLineName = productLineBaseService.lambdaQuery() - .eq(ProductLineEntity::getId , taskDTO.getSubLineId()) - .select(ProductLineEntity::getName) - .oneOpt() - .map(ProductLineEntity::getName) - .orElse(""); + String subLineName = productLineApplicationService.searchLineNameById(taskDTO.getSubLineId()); StringBuilder markdown = new StringBuilder(); markdown.append(String.format("### 【%s】已经开始,请按时完成\n\n" , taskDTO.getName())) @@ -143,9 +137,13 @@ public class NotifyTaskDomainServiceImpl implements NotifyTaskDomainService { if (CollUtil.isEmpty(userIds)) { return; } + + //获取子产品线名称 + String subLineName = productLineApplicationService.searchLineNameById(taskDTO.getSubLineId()); + StringBuilder markdown = new StringBuilder(); markdown.append(String.format("### 【%s】即将结束,请按时完成\n\n" , taskDTO.getName())) - .append(String.format("产品线:%s\n\n" , taskDTO.getLineName())) + .append(String.format("产品线:%s\n\n" , subLineName)) .append(String.format("开考时间:%s\n\n" ,sdf.format(taskDTO.getStartTime()))) .append(String.format("截止时间:%s\n\n" , sdf.format(taskDTO.getEndTime()))) .append(String.format("注意事项:%s" , taskDTO.getNote())); diff --git a/src/main/java/com/project/task/domain/service/impl/SearchTaskDomainServiceImpl.java b/src/main/java/com/project/task/domain/service/impl/SearchTaskDomainServiceImpl.java index 5f93e32..3e7598e 100644 --- a/src/main/java/com/project/task/domain/service/impl/SearchTaskDomainServiceImpl.java +++ b/src/main/java/com/project/task/domain/service/impl/SearchTaskDomainServiceImpl.java @@ -10,6 +10,7 @@ import com.project.base.domain.result.Result; import com.project.base.domain.result.ResultCodeEnum; import com.project.base.domain.utils.PageConverter; import com.project.ding.domain.dto.UserDTO; +import com.project.information.application.ProductLineApplicationService; import com.project.information.domain.entity.ProductLineEntity; import com.project.information.domain.service.ProductLineBaseService; import com.project.task.domain.dto.TaskDTO; @@ -36,7 +37,7 @@ public class SearchTaskDomainServiceImpl implements SearchTaskDomainService { @Autowired private TaskUserBaseService taskUserBaseService; @Autowired - private ProductLineBaseService productLineBaseService; + private ProductLineApplicationService productLineApplicationService; @Override public Result> search(TaskParam param) throws Exception { @@ -87,12 +88,7 @@ public class SearchTaskDomainServiceImpl implements SearchTaskDomainService { }).toList(); //获取子产品线名称 - String subLineName = productLineBaseService.lambdaQuery() - .eq(ProductLineEntity::getId , dto.getSubLineId()) - .select(ProductLineEntity::getName) - .oneOpt() - .map(ProductLineEntity::getName) - .orElse(""); + String subLineName = productLineApplicationService.searchLineNameById(dto.getSubLineId()); dto.setSubLineName(subLineName);