From 1783725b734797072806a569da85a9d5a94b6086 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 10 Sep 2021 10:02:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E5=8D=97=E8=AF=A6=E6=83=85=E9=98=B2?= =?UTF-8?q?=E6=AD=A2=E6=8A=A5=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/GuideController.java | 2 +- .../epmet/service/GuideCollectionService.java | 10 +++++++++ .../java/com/epmet/service/GuideService.java | 3 ++- .../impl/GuideCollectionServiceImpl.java | 22 +++++++++++++++++++ .../epmet/service/impl/GuideServiceImpl.java | 15 ++++++++----- 5 files changed, 45 insertions(+), 7 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideController.java index c9b9ccfead..88d8115216 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideController.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideController.java @@ -164,7 +164,7 @@ public class GuideController { public Result guideDetail(@LoginUser TokenDto tokenDto, @RequestBody GuideFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); formDTO.setCustomerId(tokenDto.getCustomerId()); - GuideDetailResultDTO result = guideService.guideDetail(formDTO); + GuideDetailResultDTO result = guideService.guideDetail(tokenDto, formDTO); return new Result().ok(result); } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCollectionService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCollectionService.java index a4acb0b6e4..bd2e97c482 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCollectionService.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCollectionService.java @@ -104,4 +104,14 @@ public interface GuideCollectionService extends BaseService { /** * 指南详情 * + * @Param tokenDto * @Param formDTO * @Return {@link GuideDetailResultDTO} * @Author zhaoqifeng * @Date 2021/9/7 14:12 */ - GuideDetailResultDTO guideDetail(GuideFormDTO formDTO); + GuideDetailResultDTO guideDetail(TokenDto tokenDto, GuideFormDTO formDTO); /** * @Description 收藏列表 diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCollectionServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCollectionServiceImpl.java index 382a9db1ce..ef0696fa12 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCollectionServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCollectionServiceImpl.java @@ -132,4 +132,26 @@ public class GuideCollectionServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(GuideCollectionEntity::getGuideId, guideId); + wrapper.eq(GuideCollectionEntity::getUserId, tokenDto.getUserId()); + wrapper.eq(GuideCollectionEntity::getApp, tokenDto.getApp()); + wrapper.eq(GuideCollectionEntity::getCustomerId, tokenDto.getCustomerId()); + GuideCollectionEntity entity = baseDao.selectOne(wrapper); + return ConvertUtils.sourceToTarget(entity, GuideCollectionDTO.class); + } + } \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java index 6bfbb59e41..d93f21b2af 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java @@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.form.PageFormDTO; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetErrorCode; @@ -42,10 +43,7 @@ import com.epmet.entity.GuideEntity; import com.epmet.entity.GuideExternalLinkEntity; import com.epmet.entity.GuideModuleEntity; import com.epmet.feign.GovOrgOpenFeignClient; -import com.epmet.service.GuideAttachmentService; -import com.epmet.service.GuideExternalLinkService; -import com.epmet.service.GuideModuleService; -import com.epmet.service.GuideService; +import com.epmet.service.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.apache.commons.collections4.CollectionUtils; @@ -77,6 +75,8 @@ public class GuideServiceImpl extends BaseServiceImpl imp private GuideAttachmentService guideAttachmentService; @Resource private GuideExternalLinkService guideExternalLinkService; + @Resource + private GuideCollectionService guideCollectionService; @Override public PageData page(Map params) { @@ -373,7 +373,7 @@ public class GuideServiceImpl extends BaseServiceImpl imp * @Date 2021/9/7 14:12 */ @Override - public GuideDetailResultDTO guideDetail(GuideFormDTO formDTO) { + public GuideDetailResultDTO guideDetail(TokenDto tokenDto, GuideFormDTO formDTO) { //获取指南详情 GuideDetailResultDTO result = baseDao.getGuideDetail(formDTO.getCustomerId(), formDTO.getGuideId()); if (null == result) { @@ -385,6 +385,11 @@ public class GuideServiceImpl extends BaseServiceImpl imp result.setAttachmentList(guideAttachmentService.getByGuideId(formDTO.getGuideId())); //获取指南外链地址 result.setExternalLinks(guideExternalLinkService.getByGuideId(formDTO.getGuideId())); + //是否收藏 + result.setCollectionFlag(NumConstant.ZERO_STR); + if (null != guideCollectionService.getCollection(tokenDto, formDTO.getGuideId())) { + result.setCollectionFlag(NumConstant.ONE_STR); + } return result; }