From 4d2d38aadd899bffa3bce198b5ecec1d310efaf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=B9=8F?= Date: Thu, 30 Oct 2025 16:29:41 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E6=96=87=E7=AB=A0=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=8A=A0=E9=A1=B9=E7=9B=AE=E6=88=AA=E5=9B=BE=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/AppBlogArticleController.java | 56 ++++++++++--------- .../com/ruoyi/office/mapper/TtFileMapper.java | 8 +++ .../ruoyi/office/service/ITtFileService.java | 8 +++ .../service/impl/TtFileServiceImpl.java | 11 ++++ .../com/ruoyi/app/domain/AppBlogArticle.java | 12 ++++ 5 files changed, 70 insertions(+), 25 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppBlogArticleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppBlogArticleController.java index 1401f13..76fb569 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppBlogArticleController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppBlogArticleController.java @@ -9,36 +9,40 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.office.domain.TtFile; +import com.ruoyi.office.service.ITtFileService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.List; /** * 文章Controller - * + * * @author ruoyi * @date 2024-04-07 */ @RestController @RequestMapping("/app/article") -public class AppBlogArticleController extends BaseController -{ +public class AppBlogArticleController extends BaseController { @Autowired private IAppBlogArticleService appBlogArticleService; @Resource private AppBlogArticleMapper appBlogArticleMapper; + @Resource + private ITtFileService fileService; + /** * 查询文章列表 */ @GetMapping("/list") - public TableDataInfo list(AppBlogArticle appBlogArticle) - { + public TableDataInfo list(AppBlogArticle appBlogArticle) { startPage(); List list = appBlogArticleService.selectAppBlogArticleList(appBlogArticle); return getDataTable(list); @@ -50,8 +54,7 @@ public class AppBlogArticleController extends BaseController @PreAuthorize("@ss.hasPermi('app:article:export')") @Log(title = "文章", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, AppBlogArticle appBlogArticle) - { + public void export(HttpServletResponse response, AppBlogArticle appBlogArticle) { List list = appBlogArticleService.selectAppBlogArticleList(appBlogArticle); ExcelUtil util = new ExcelUtil(AppBlogArticle.class); util.exportExcel(response, list, "文章数据"); @@ -62,14 +65,20 @@ public class AppBlogArticleController extends BaseController */ @PreAuthorize("@ss.hasPermi('app:article:query')") @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { + public AjaxResult getInfo(@PathVariable("id") Long id) { return success(appBlogArticleService.selectAppBlogArticleById(id)); } + @GetMapping(value = "/app/{id}") - public AjaxResult appGetInfo(@PathVariable("id") Long id) - { - return success(appBlogArticleService.selectAppBlogArticleById(id)); + public AjaxResult appGetInfo(@PathVariable("id") Long id) { + AppBlogArticle appBlogArticle = appBlogArticleService.selectAppBlogArticleById(id); + List list = new ArrayList<>(); + List picList = fileService.selectTtFileByCodeName(appBlogArticle.getTitle()); + for (TtFile ttFile : picList) { + list.add(ttFile.getFileUrl()); + } + appBlogArticle.setPicList(list); + return success(appBlogArticle); } /** @@ -78,8 +87,7 @@ public class AppBlogArticleController extends BaseController @PreAuthorize("@ss.hasPermi('app:article:add')") @Log(title = "文章", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody AppBlogArticle appBlogArticle) - { + public AjaxResult add(@RequestBody AppBlogArticle appBlogArticle) { return toAjax(appBlogArticleService.insertAppBlogArticle(appBlogArticle)); } @@ -89,25 +97,24 @@ public class AppBlogArticleController extends BaseController @PreAuthorize("@ss.hasPermi('app:article:edit')") @Log(title = "文章", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody AppBlogArticle appBlogArticle) - { + public AjaxResult edit(@RequestBody AppBlogArticle appBlogArticle) { return toAjax(appBlogArticleService.updateAppBlogArticle(appBlogArticle)); } + /** * 点赞+1 */ @PutMapping("/app/zan") - public AjaxResult zan(@RequestBody AppBlogArticle appBlogArticle) - { - return toAjax( appBlogArticleMapper.zan(appBlogArticle.getId())); + public AjaxResult zan(@RequestBody AppBlogArticle appBlogArticle) { + return toAjax(appBlogArticleMapper.zan(appBlogArticle.getId())); } + /** * 游览+1 */ @PutMapping("/app/lookAddNumber") - public AjaxResult lookAddNumber(@RequestBody AppBlogArticle appBlogArticle) - { - return toAjax( appBlogArticleMapper.lookAddNumber(appBlogArticle.getId())); + public AjaxResult lookAddNumber(@RequestBody AppBlogArticle appBlogArticle) { + return toAjax(appBlogArticleMapper.lookAddNumber(appBlogArticle.getId())); } /** @@ -115,9 +122,8 @@ public class AppBlogArticleController extends BaseController */ @PreAuthorize("@ss.hasPermi('app:article:remove')") @Log(title = "文章", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(appBlogArticleService.deleteAppBlogArticleByIds(ids)); } } diff --git a/ruoyi-office/src/main/java/com/ruoyi/office/mapper/TtFileMapper.java b/ruoyi-office/src/main/java/com/ruoyi/office/mapper/TtFileMapper.java index f4fc2a1..2e07e55 100644 --- a/ruoyi-office/src/main/java/com/ruoyi/office/mapper/TtFileMapper.java +++ b/ruoyi-office/src/main/java/com/ruoyi/office/mapper/TtFileMapper.java @@ -58,4 +58,12 @@ public interface TtFileMapper * @return 结果 */ public int deleteTtFileByFileIds(Long[] fileIds); + + /** + * 根据 codeName 查询文件管理列表 + * + * @param codeName codeName + * @return 文件管理集合 + */ + public List selectTtFileByCodeName(String codeName); } diff --git a/ruoyi-office/src/main/java/com/ruoyi/office/service/ITtFileService.java b/ruoyi-office/src/main/java/com/ruoyi/office/service/ITtFileService.java index 96a45cb..3f37ee8 100644 --- a/ruoyi-office/src/main/java/com/ruoyi/office/service/ITtFileService.java +++ b/ruoyi-office/src/main/java/com/ruoyi/office/service/ITtFileService.java @@ -58,4 +58,12 @@ public interface ITtFileService * @return 结果 */ public int deleteTtFileByFileId(Long fileId); + + /** + * 根据 codeName 查询文件管理列表 + * + * @param codeName codeName + * @return 文件管理集合 + */ + public List selectTtFileByCodeName(String codeName); } diff --git a/ruoyi-office/src/main/java/com/ruoyi/office/service/impl/TtFileServiceImpl.java b/ruoyi-office/src/main/java/com/ruoyi/office/service/impl/TtFileServiceImpl.java index 9331825..fdd076f 100644 --- a/ruoyi-office/src/main/java/com/ruoyi/office/service/impl/TtFileServiceImpl.java +++ b/ruoyi-office/src/main/java/com/ruoyi/office/service/impl/TtFileServiceImpl.java @@ -119,4 +119,15 @@ public class TtFileServiceImpl implements ITtFileService { return ttFileMapper.deleteTtFileByFileId(fileId); } + /** + * 根据 codeName 查询文件管理列表 + * + * @param codeName codeName + * @return 文件管理集合 + */ + @Override + public List selectTtFileByCodeName(String codeName) { + return ttFileMapper.selectTtFileByCodeName(codeName); + } + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppBlogArticle.java b/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppBlogArticle.java index c034104..fb6f6f3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppBlogArticle.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppBlogArticle.java @@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import java.util.List; + /** * 文章对象 app_blog_article * @@ -75,6 +77,8 @@ public class AppBlogArticle extends BaseEntity @Excel(name = "权重") private Long weight; + private List picList; + public String getOrderType() { return orderType; } @@ -217,6 +221,14 @@ public class AppBlogArticle extends BaseEntity return delFlag; } + public List getPicList() { + return picList; + } + + public void setPicList(List picList) { + this.picList = picList; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)