From 00223ce39c94a01f9094b9847418269858d054c1 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 16 Jul 2021 14:06:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E9=A2=98=E7=AE=A1=E7=90=86-=E7=83=AD?= =?UTF-8?q?=E9=97=A8=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/SpecialSubjectService.java | 3 ++- .../service/impl/SpecialSubjectServiceImpl.java | 16 +++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/SpecialSubjectService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/SpecialSubjectService.java index 933c7856ce..42b1831117 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/SpecialSubjectService.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/SpecialSubjectService.java @@ -30,6 +30,7 @@ import com.epmet.dto.result.WorkSpecialSubjectResultDTO; import com.epmet.entity.SpecialSubjectEntity; import java.util.List; +import java.util.Map; /** * 专题表 @@ -103,7 +104,7 @@ public interface SpecialSubjectService extends BaseService * 热门标签列表 * @author zhaoqifeng * @date 2021/7/15 15:35 - * @param customerId + * @param formDTO * @return java.util.List */ List hotSubjectTagList(HotSubjectTagFormDTO formDTO); diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java index 23523ebe9d..a4cff4251e 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java @@ -23,39 +23,37 @@ 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.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dao.SpecialSubjectDao; import com.epmet.dto.SpecialSubjectDTO; -import com.epmet.dto.form.HotSubjectTagFormDTO; -import com.epmet.dto.result.TagInfoResultDTO; import com.epmet.dto.TagCustomerDTO; -import com.epmet.dto.form.AddSpecialSubjectFormDTO; -import com.epmet.dto.form.DelSpecialSubjectFormDTO; -import com.epmet.dto.form.QuerySpecialSubFormDTO; -import com.epmet.dto.form.StaffInfoFromDTO; +import com.epmet.dto.form.*; import com.epmet.dto.result.AddSpecialSubjectResultDTO; import com.epmet.dto.result.MineResultDTO; +import com.epmet.dto.result.TagInfoResultDTO; import com.epmet.dto.result.WorkSpecialSubjectResultDTO; import com.epmet.entity.SpecialSubjectEntity; -import com.epmet.redis.TagRedis; import com.epmet.feign.GovOrgOpenFeignClient; +import com.epmet.redis.TagRedis; import com.epmet.service.SpecialSubjectService; -import org.apache.commons.collections4.CollectionUtils; import com.epmet.service.TagCustomerService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream;