From e1b8b0074833ab58420c930cc737c107625d98d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E4=BA=AE?= <fltoo@qq.com>
Date: Thu, 11 Sep 2025 13:48:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=90=8E=E7=AB=AF=E5=92=8C?=
 =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/MaterialScreenController.java  | 22 ++++++++++++-----
 .../service/MaterialScreenService.java        |  4 +++-
 .../impl/MaterialScreenServiceImpl.java       | 24 ++++++++-----------
 3 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/bonus-business/src/main/java/com/bonus/business/controller/MaterialScreenController.java b/bonus-business/src/main/java/com/bonus/business/controller/MaterialScreenController.java
index 68f02e8..fac9fa3 100644
--- a/bonus-business/src/main/java/com/bonus/business/controller/MaterialScreenController.java
+++ b/bonus-business/src/main/java/com/bonus/business/controller/MaterialScreenController.java
@@ -1,21 +1,24 @@
 package com.bonus.business.controller;
 
-import com.bonus.business.domain.TbProduct;
 import com.bonus.business.domain.TbPromotionMaterial;
 import com.bonus.business.service.MaterialScreenService;
-import com.bonus.business.service.ProductScreenService;
+import com.bonus.common.core.controller.BaseController;
 import com.bonus.common.core.domain.AjaxResult;
+import com.bonus.common.core.page.TableDataInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
- * 产品大屏
+ * 物料大屏
  */
 @RestController
 @RequestMapping("/screen/material/")
-public class MaterialScreenController {
+public class MaterialScreenController extends BaseController {
 
     @Autowired
     private MaterialScreenService service;
@@ -26,8 +29,15 @@ public class MaterialScreenController {
      */
 
     @PostMapping("/getMaterialList")
-    public AjaxResult getMaterialList(TbPromotionMaterial o ){
-       return service.getMaterialList(o) ;
+    public TableDataInfo getMaterialList(TbPromotionMaterial o){
+        try {
+            startPage();
+            List<TbPromotionMaterial> list = service.getMaterialList(o);
+            return getDataTable(list);
+        } catch (Exception e) {
+            logger.error(e.getMessage(), e);
+            return getDataTable(new ArrayList<>());
+        }
     }
 
 }
diff --git a/bonus-business/src/main/java/com/bonus/business/service/MaterialScreenService.java b/bonus-business/src/main/java/com/bonus/business/service/MaterialScreenService.java
index e8b7e7b..beac6f7 100644
--- a/bonus-business/src/main/java/com/bonus/business/service/MaterialScreenService.java
+++ b/bonus-business/src/main/java/com/bonus/business/service/MaterialScreenService.java
@@ -4,12 +4,14 @@ import com.bonus.business.domain.TbProduct;
 import com.bonus.business.domain.TbPromotionMaterial;
 import com.bonus.common.core.domain.AjaxResult;
 
+import java.util.List;
+
 public interface MaterialScreenService {
     /**
      * 查询展示中心
      * @param o
      * @return
      */
-    AjaxResult getMaterialList(TbPromotionMaterial o);
+    List<TbPromotionMaterial> getMaterialList(TbPromotionMaterial o);
 
 }
diff --git a/bonus-business/src/main/java/com/bonus/business/service/impl/MaterialScreenServiceImpl.java b/bonus-business/src/main/java/com/bonus/business/service/impl/MaterialScreenServiceImpl.java
index c454395..551984e 100644
--- a/bonus-business/src/main/java/com/bonus/business/service/impl/MaterialScreenServiceImpl.java
+++ b/bonus-business/src/main/java/com/bonus/business/service/impl/MaterialScreenServiceImpl.java
@@ -32,21 +32,17 @@ public class MaterialScreenServiceImpl implements MaterialScreenService {
 
 
     @Override
-    public AjaxResult getMaterialList(TbPromotionMaterial o) {
-        try{
-            List<TbPromotionMaterial> list = mapper.getMaterialList(o);
-            if(StringUtils.isNotEmpty(list)){
-                list.forEach(vo->{
-                    vo.setImage(minioConfig.getUrl()+"/"+minioConfig.getBucketName()+vo.getImage());
-                    vo.setFilePath(minioConfig.getUrl()+"/"+minioConfig.getBucketName()+vo.getFilePath());
-                });
-            }
-        return AjaxResult.success(list);
-        }catch (Exception e){
-            log.error(e.toString());
+    public List<TbPromotionMaterial> getMaterialList(TbPromotionMaterial o) {
+
+        List<TbPromotionMaterial> list = mapper.getMaterialList(o);
+        if (StringUtils.isNotEmpty(list)) {
+            list.forEach(vo -> {
+                vo.setImage(minioConfig.getUrl() + "/" + minioConfig.getBucketName() + vo.getImage());
+                vo.setFilePath(minioConfig.getUrl() + "/" + minioConfig.getBucketName() + vo.getFilePath());
+            });
         }
-        return AjaxResult.success(new ArrayList<TbPromotionMaterial>());
+        return list;
+
     }
 
-
 }