From 22d552c5f0960b0cfe54ff345c3f69f47f0e9c12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Sat, 19 Aug 2023 21:31:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/JournalismConller.java     | 39 +++++++++++++++++++
 .../jh/work/mapper/WorkJournalismMapper.java  |  7 ++++
 .../work/service/IWorkJournalismService.java  |  7 ++++
 .../impl/WorkJournalismServiceImpl.java       | 10 +++++
 .../mapper/work/WorkJournalismMapper.xml      |  8 ++++
 5 files changed, 71 insertions(+)
 create mode 100644 yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/JournalismConller.java

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<WorkJournalism> selectWorkJournalismList(WorkJournalism workJournalism);
 
+    /**
+     * 查询集团新闻列表
+     *
+     * @return 集团新闻集合
+     */
+    public List<WorkJournalism> 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<WorkJournalism> selectWorkJournalismList(WorkJournalism workJournalism);
 
+    /**
+     * 查询集团新闻列表
+     *
+     * @return 集团新闻集合
+     */
+    public List<WorkJournalism> 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<WorkJournalism> selectBgscreenWorkJournalismList(){
+        return workJournalismMapper.selectBgscreenWorkJournalismList();
+    }
     /**
      * 查询集团新闻统计
      *
      * @param workJournalism 集团新闻
      * @return 集团新闻集合
      */
+    @Override
     public Map<String,Object> findWorkJournalismGroupStatus(WorkJournalism workJournalism){
         List<Map<String, Object>> dataList = workJournalismMapper.findWorkJournalismGroupStatus(workJournalism);
         Map<String, Object> 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
     </select>
 
+    <select id="selectBgscreenWorkJournalismList" resultMap="WorkJournalismResult">
+        select id, title, main_image, intro, type, source, open_url, read_num, status_flag, top_flag, files, sort_num, is_del, create_user, create_date, create_by, create_time, update_by, update_time, remark from work_journalism
+            where is_del=0
+            and status_flag=2
+        order by top_flag desc, sort_num asc, create_date desc
+        limit 0,4
+    </select>
+
     <select id="findWorkJournalismGroupStatus" parameterType="WorkJournalism" resultType="map">
         select status_flag as statusFlag, count(id) as total from work_journalism
         <where>