diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/JournalismConller.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/JournalismConller.java new file mode 100644 index 00000000..a1bdfa3b --- /dev/null +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/JournalismConller.java @@ -0,0 +1,39 @@ +package com.yanzhu.jh.bigscreen.web.controller; + +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.yanzhu.jh.work.service.IWorkJournalismService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 集团新闻Conller + */ +@RestController +@RequestMapping("/bgscreen/journalism") +public class JournalismConller extends BaseController { + + @Autowired + IWorkJournalismService workJournalismService; + + /** + * 查询集团新闻列表 + * @return TableDataInfo + */ + @GetMapping("/getJournalismList") + public TableDataInfo getJournalismList(){ + return getDataTable(workJournalismService.selectBgscreenWorkJournalismList()); + } + + /** + * 查询集团新闻详情 + * @return AjaxResult + */ + @GetMapping("/getJournalismInfo") + public AjaxResult getJournalismInfo(Long id){ + return success(workJournalismService.selectWorkJournalismById(id)); + } +} diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/mapper/WorkJournalismMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/mapper/WorkJournalismMapper.java index 93ce34d3..427b05d0 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/mapper/WorkJournalismMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/mapper/WorkJournalismMapper.java @@ -29,6 +29,13 @@ public interface WorkJournalismMapper */ public List selectWorkJournalismList(WorkJournalism workJournalism); + /** + * 查询集团新闻列表 + * + * @return 集团新闻集合 + */ + public List selectBgscreenWorkJournalismList(); + /** * 查询集团新闻统计 * diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/IWorkJournalismService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/IWorkJournalismService.java index 5306c487..b48c8c98 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/IWorkJournalismService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/IWorkJournalismService.java @@ -29,6 +29,13 @@ public interface IWorkJournalismService */ public List selectWorkJournalismList(WorkJournalism workJournalism); + /** + * 查询集团新闻列表 + * + * @return 集团新闻集合 + */ + public List selectBgscreenWorkJournalismList(); + /** * 查询集团新闻统计 * diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/impl/WorkJournalismServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/impl/WorkJournalismServiceImpl.java index d01e6416..29838931 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/impl/WorkJournalismServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/impl/WorkJournalismServiceImpl.java @@ -49,12 +49,22 @@ public class WorkJournalismServiceImpl implements IWorkJournalismService return workJournalismMapper.selectWorkJournalismList(workJournalism); } + /** + * 查询集团新闻列表 + * + * @return 集团新闻集合 + */ + @Override + public List selectBgscreenWorkJournalismList(){ + return workJournalismMapper.selectBgscreenWorkJournalismList(); + } /** * 查询集团新闻统计 * * @param workJournalism 集团新闻 * @return 集团新闻集合 */ + @Override public Map findWorkJournalismGroupStatus(WorkJournalism workJournalism){ List> dataList = workJournalismMapper.findWorkJournalismGroupStatus(workJournalism); Map dataMap = new HashMap<>(); diff --git a/yanzhu-jh/src/main/resources/mapper/work/WorkJournalismMapper.xml b/yanzhu-jh/src/main/resources/mapper/work/WorkJournalismMapper.xml index 7715e664..f4b79e86 100644 --- a/yanzhu-jh/src/main/resources/mapper/work/WorkJournalismMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/work/WorkJournalismMapper.xml @@ -48,6 +48,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by top_flag desc, sort_num asc, create_date desc + +