支部园地风采、支部园地宣传置顶首页轮播

ruoyi-admin/src/main/java/com/ruoyi/web/controller/branch/TBranchDemeanorController.java

@@ -1,7 +1,12 @@
 package com.ruoyi.web.controller.branch;
 
+import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.branch.domain.TBranchPublicize;
+import com.ruoyi.branch.domain.TFile;
+import com.ruoyi.branch.service.ITFileService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -34,6 +39,32 @@ public class TBranchDemeanorController extends BaseController
     @Autowired
     private ITBranchDemeanorService tBranchDemeanorService;
 
+    @Autowired
+    private ITFileService fileService;
+
+    /**
+     * 查询首页置顶图片轮播
+     */
+    @PreAuthorize("@ss.hasPermi('branch:publicize:list')")
+    @GetMapping("/listProfiles")
+    public AjaxResult listProfiles()
+    {
+        TBranchDemeanor tBranchDemeanor = new TBranchDemeanor();
+        tBranchDemeanor.setIsPinned("1");
+        List<TBranchDemeanor> tBranchDemeanors = tBranchDemeanorService.selectTBranchDemeanorList(tBranchDemeanor);
+        List<TFile> fileList = new ArrayList<>();
+        for (TBranchDemeanor BranchDemeanor : tBranchDemeanors) {
+            TFile tFile = new TFile();
+            tFile.setTableName("branchDemeanor");
+            tFile.setTableId(BranchDemeanor.getDemeanorId());
+            List<TFile> tFiles = fileService.selectTFileList(tFile);
+            if (tFiles != null) {
+                fileList.add(tFiles.get(0));
+            }
+        }
+        return AjaxResult.success(fileList);
+    }
+
     /**
      * 查询支部园地风采列表
      */

ruoyi-admin/src/main/java/com/ruoyi/web/controller/branch/TBranchPublicizeController.java

@@ -1,7 +1,11 @@
 package com.ruoyi.web.controller.branch;
 
+import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.branch.domain.TFile;
+import com.ruoyi.branch.service.ITFileService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -34,6 +38,32 @@ public class TBranchPublicizeController extends BaseController
     @Autowired
     private ITBranchPublicizeService tBranchPublicizeService;
 
+    @Autowired
+    private ITFileService fileService;
+
+    /**
+     * 查询首页置顶图片轮播
+     */
+    @PreAuthorize("@ss.hasPermi('branch:publicize:list')")
+    @GetMapping("/listProfiles")
+    public AjaxResult listProfiles()
+    {
+        TBranchPublicize tBranchPublicize = new TBranchPublicize();
+        tBranchPublicize.setIsPinned("1");
+        List<TBranchPublicize> tBranchPublicizes = tBranchPublicizeService.selectTBranchPublicizeList(tBranchPublicize);
+        List<TFile> fileList = new ArrayList<>();
+        for (TBranchPublicize branchPublicize : tBranchPublicizes) {
+            TFile tFile = new TFile();
+            tFile.setTableName("branchPublicize");
+            tFile.setTableId(branchPublicize.getPublicizeId());
+            List<TFile> tFiles = fileService.selectTFileList(tFile);
+            if (tFiles != null) {
+                fileList.add(tFiles.get(0));
+            }
+        }
+        return AjaxResult.success(fileList);
+    }
+
     /**
      * 查询支部园地宣传列表
      */

ruoyi-ui/src/api/branch/demeanor.js

@@ -1,5 +1,13 @@
 import request from '@/utils/request'
 
+// 查询首页置顶图片轮播
+export function listDemeanorProfiles() {
+  return request({
+    url: '/branch/demeanor/listProfiles',
+    method: 'get'
+  })
+}
+
 // 查询支部园地风采列表
 export function listDemeanor(query) {
   return request({

ruoyi-ui/src/api/branch/publicize.js

@@ -1,5 +1,13 @@
 import request from '@/utils/request'
 
+// 查询首页置顶图片轮播
+export function listPublicizeProfiles() {
+  return request({
+    url: '/branch/publicize/listProfiles',
+    method: 'get'
+  })
+}
+
 // 查询支部园地宣传列表
 export function listPublicize(query) {
   return request({

ruoyi-ui/src/views/index.vue

@@ -1,23 +1,21 @@
 <template>
   <div class="app-container home">
-
     <el-row :gutter="20">
       <el-col :xs="12" :sm="12" :md="12" :lg="12">
         <el-carousel height="350px" style="margin-bottom: 20px;">
-          <el-carousel-item v-for="item in urls" :key="item">
-            <el-image :src="item"></el-image>
+          <el-carousel-item v-for="item in publicizeUrls" :key="item">
+            <el-image :src="item" style="width: 100%; height: 100%;"></el-image>
           </el-carousel-item>
         </el-carousel>
       </el-col>
       <el-col :xs="12" :sm="12" :md="12" :lg="12">
         <el-carousel height="350px" style="margin-bottom: 20px;">
-          <el-carousel-item v-for="item in urls" :key="item">
-            <el-image :src="item"></el-image>
+          <el-carousel-item v-for="item in demeanorUrls" :key="item">
+            <el-image :src="item" style="width: 100%; height: 100%;"></el-image>
           </el-carousel-item>
         </el-carousel>
       </el-col>
     </el-row>
-
     <el-row :gutter="20">
       <el-col :xs="24" :sm="24" :md="12" :lg="8">
         <el-card class="update-log">
@@ -69,21 +67,38 @@
 import BrithChart from "./dashboard/BrithChart";
 import DemeanorChart from "./dashboard/DemeanorChart";
 import NoticeChart from "./dashboard/NoticeChart";
+import { listPublicizeProfiles } from "@/api/branch/publicize";
+import { listDemeanorProfiles } from "@/api/branch/demeanor";
 
 export default {
   name: "Index",
   components: { BrithChart, NoticeChart, DemeanorChart },
   data() {
     return {
-      urls: [
-        'https://p5.img.cctvpic.com/photoworkspace/contentimg/2023/06/08/2023060807144929248.jpg',
-        'https://p1.img.cctvpic.com/photoworkspace/contentimg/2023/06/08/2023060821005989847.jpg',
-        'https://p4.img.cctvpic.com/photoAlbum/page/performance/img/2022/6/23/1655955351125_157.jpg'
-      ],
+      // 支部园地宣传图片
+      publicizeUrls: [],
+      // 支部园地风采图片
+      demeanorUrls: [],
       // 版本号
       version: "3.8.5",
     };
   },
+  created() {
+    /** 查询支部园地宣传图片 */
+    listPublicizeProfiles().then(response => {
+      let profiles = response.data;
+      for (let i = 0; i < profiles.length; i++) {
+        this.publicizeUrls.push(process.env.VUE_APP_BASE_API + profiles[i].url);
+      }
+    });
+    /** 查询支部园地风采图片 */
+    listDemeanorProfiles().then(response => {
+      let profiles = response.data;
+      for (let i = 0; i < profiles.length; i++) {
+        this.demeanorUrls.push(process.env.VUE_APP_BASE_API + profiles[i].url);
+      }
+    });
+  },
   methods: {
   }
 };