diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/CommonArticleListFormDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/CommonArticleListFormDTO.java index a0cb76ed86..26d9294031 100644 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/CommonArticleListFormDTO.java +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/CommonArticleListFormDTO.java @@ -1,8 +1,10 @@ package com.epmet.dto.form; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; import lombok.Data; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; /** @@ -20,10 +22,16 @@ public class CommonArticleListFormDTO implements Serializable { * */ public interface ArticleBannerInternalGroup{} + /** + * 烟台需求:周边疫情 就业服务 警民互动 物业通知 党务公开 居务公开 财务公开 以上标签在实时动态里写死吧 + * + */ + public interface YanTaiShowGroup extends CustomerClientShowGroup { + } /** * 网格Id * */ - @NotBlank(message = "网格Id不能为空" , groups = {ArticleBannerInternalGroup.class}) + @NotBlank(message = "网格Id不能为空" , groups = {ArticleBannerInternalGroup.class,YanTaiShowGroup.class}) private String gridId; /** @@ -34,6 +42,7 @@ public class CommonArticleListFormDTO implements Serializable { /** * 标签名称(高级配置里的参数) * */ + @NotNull(message = "标签名称不能为空",groups = YanTaiShowGroup.class) private String tagName; /** * 排除的标签名称(高级配置里的参数) @@ -44,4 +53,8 @@ public class CommonArticleListFormDTO implements Serializable { */ private Integer isTop; + @NotNull(message = "pageNo不能为空", groups = YanTaiShowGroup.class) + private Integer pageNo; + @NotNull(message = "pageSize不能为空", groups = YanTaiShowGroup.class) + private Integer pageSize; } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java index 611c9d2b79..a984a8a42a 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java @@ -331,6 +331,21 @@ public class ArticleController { return new Result>().ok(articleService.getLatestArticleList(commonArticleListFormDTO)); } + /** + * @param formDTO + * @return 烟台钉钉应用:实时动态周边疫情 就业服务 警民互动 物业通知 党务公开 居务公开 财务公开 以上标签在实时动态里写死吧 + * 包括最新活动 + */ + @PostMapping("article-list-ytding") + public Result> pageArticleListByTagName(@RequestBody CommonArticleListFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, CommonArticleListFormDTO.YanTaiShowGroup.class); + return new Result>().ok(articleService.pageArticleListByTagName(formDTO.getPageNo(), + formDTO.getPageSize(), + formDTO.getGridId(), + formDTO.getTagName())); + } + + /** * @param articlePageFormDTO * @return List diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleDao.java index 3a549dfa61..fa4b20576e 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleDao.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleDao.java @@ -167,4 +167,15 @@ public interface ArticleDao extends BaseDao { List subjectList(@Param("pidList")List pidList); List selectAllArticle(ArticleListFormDTO formDTO); + + /** + * 根据标签名,查询文章列表 + * @param gridId + * @param tagName + * @param customerId + * @return + */ + List pageArticleListByTagName(@Param("gridId")String gridId, + @Param("tagName")String tagName, + @Param("customerId")String customerId); } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java index dca18d0bb7..d9374b1263 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java @@ -278,4 +278,18 @@ public interface ArticleService extends BaseService { * @param currentOperUserId */ void delete(List articleIds,String customerId,String currentOperUserId); + + /** + * 烟台钉钉居民端:需求来源:烟台钉钉应用:实时动态周边疫情 就业服务 警民互动 物业通知 党务公开 居务公开 财务公开 以上标签在实时动态里写死吧 + * + * @param pageNo + * @param pageSize + * @param gridId + * @param tagName + * @return + */ + PageData pageArticleListByTagName(Integer pageNo, + Integer pageSize, + String gridId, + String tagName); } \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java index b0e780209a..7c447cc0f4 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java @@ -42,10 +42,7 @@ import com.epmet.commons.tools.scan.param.TextTaskDTO; import com.epmet.commons.tools.scan.result.SyncScanResult; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.security.user.LoginUserUtil; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.utils.DateUtils; -import com.epmet.commons.tools.utils.Result; -import com.epmet.commons.tools.utils.ScanContentUtils; +import com.epmet.commons.tools.utils.*; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.constant.*; import com.epmet.dao.*; @@ -2007,5 +2004,23 @@ public class ArticleServiceImpl extends BaseServiceImpl pageArticleListByTagName(Integer pageNo, Integer pageSize, String gridId, String tagName) { + PageHelper.startPage(pageNo, pageSize); + List list = baseDao.pageArticleListByTagName( + gridId, + tagName, + EpmetRequestHolder.getLoginUserCustomerId()); + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal()); + } } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml index 379e7fbbc1..9da11a42fb 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml @@ -506,4 +506,36 @@ ORDER BY a.publish_date DESC, a.updated_time DESC + +