From d36f914aa36526a70a62cf13d9d17b81e16d1332 Mon Sep 17 00:00:00 2001
From: xuelijun <977662702@qq.com>
Date: Mon, 28 Jul 2025 17:51:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=A8=A1=E5=9D=972?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tashow-module/tashow-module-product/pom.xml   | 10 +++---
 .../product/ProductServerApplication.java     |  2 --
 .../product/controller/ProdController.java    |  9 +++--
 .../cloud/product/mapper/ProdMapper.java      |  2 +-
 .../cloud/product/service/ProdService.java    |  2 +-
 .../product/service/impl/ProdServiceImpl.java |  4 +--
 .../mapper/product/CategoryMapper.xml         | 35 -------------------
 .../resources/mapper/product/ProdMapper.xml   |  6 ++--
 8 files changed, 16 insertions(+), 54 deletions(-)
 delete mode 100644 tashow-module/tashow-module-product/src/main/resources/mapper/product/CategoryMapper.xml

diff --git a/tashow-module/tashow-module-product/pom.xml b/tashow-module/tashow-module-product/pom.xml
index 2096593..24b9ddb 100644
--- a/tashow-module/tashow-module-product/pom.xml
+++ b/tashow-module/tashow-module-product/pom.xml
@@ -42,11 +42,11 @@
             <version>2.2.20</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.github.jsqlparser</groupId>
-            <artifactId>jsqlparser</artifactId>
-            <version>4.5</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.github.jsqlparser</groupId>-->
+<!--            <artifactId>jsqlparser</artifactId>-->
+<!--            <version>4.5</version>-->
+<!--        </dependency>-->
 
         <!-- EasyExcel 核心库 -->
         <dependency>
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/ProductServerApplication.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/ProductServerApplication.java
index 969623d..d74f92c 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/ProductServerApplication.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/ProductServerApplication.java
@@ -10,8 +10,6 @@ import org.springframework.scheduling.annotation.EnableScheduling;
  * 应用服务启动类
  */
 @SpringBootApplication
-@EnableScheduling
-@MapperScan("com.tashow.cloud.product.mapper")
 public class ProductServerApplication {
 
     public static void main(String[] args) {
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdController.java
index 79aeea8..c4f4e03 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdController.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdController.java
@@ -66,12 +66,11 @@ public class ProdController {
         return success(BeanUtils.toBean(prod, ProdRespVO.class));
     }
 
+    @PermitAll
     @GetMapping("/page")
     @Operation(summary = "获得商品分页")
-    @PreAuthorize("@ss.hasPermission('tashow-module-product:prod:query')")
-    @PermitAll
-    public CommonResult<PageResult<ProdRespVO>> getProdPage(@Valid ProdPageReqVO pageReqVO) {
-        PageResult<ProdDO> pageResult = prodService.getProdPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, ProdRespVO.class));
+    public CommonResult<PageResult<List<ProdDO>>> getProdPage(@Valid ProdPageReqVO pageReqVO) {
+        PageResult<List<ProdDO>> pageResult = prodService.getProdPage(pageReqVO);
+        return success(pageResult);
     }
 }
\ No newline at end of file
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdMapper.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdMapper.java
index ce403c8..71e94bb 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdMapper.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdMapper.java
@@ -17,6 +17,6 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ProdMapper extends BaseMapperX<ProdDO> {
 
-//     PageResult<ProdDO> getProdPage1(ProdPageReqVO reqVO);
+     PageResult<List<ProdDO>> getProdPageList(ProdPageReqVO reqVO);
 
 }
\ No newline at end of file
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdService.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdService.java
index 7550b55..37bf98b 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdService.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdService.java
@@ -52,6 +52,6 @@ public interface ProdService {
      * @param pageReqVO 分页查询
      * @return 商品分页
      */
-    PageResult<ProdDO> getProdPage(ProdPageReqVO pageReqVO);
+    PageResult<List<ProdDO>> getProdPage(ProdPageReqVO pageReqVO);
 
 }
\ No newline at end of file
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdServiceImpl.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdServiceImpl.java
index c2eb3ee..c6e2156 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdServiceImpl.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdServiceImpl.java
@@ -68,8 +68,8 @@ public class ProdServiceImpl implements ProdService {
     }
 
     @Override
-    public PageResult<ProdDO> getProdPage(ProdPageReqVO pageReqVO) {
-        return null;// prodMapper.getProdPage1(pageReqVO);
+    public PageResult<List<ProdDO>> getProdPage(ProdPageReqVO pageReqVO) {
+        return prodMapper.getProdPageList(pageReqVO);
     }
 
 }
\ No newline at end of file
diff --git a/tashow-module/tashow-module-product/src/main/resources/mapper/product/CategoryMapper.xml b/tashow-module/tashow-module-product/src/main/resources/mapper/product/CategoryMapper.xml
deleted file mode 100644
index c1a9fc1..0000000
--- a/tashow-module/tashow-module-product/src/main/resources/mapper/product/CategoryMapper.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<!--
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.tashow.cloud.product.mapper.CategoryMapper">
-	<resultMap id="BaseResultMap" type="com.tashow.cloud.product.domain.Category">
-		<id property="categoryId" column="category_id" />
-		<result property="shopId" column="shop_id" />
-		<result property="parentId" column="parent_id" />
-		<result property="categoryName" column="category_name" />
-		<result property="icon" column="icon" />
-		<result property="pic" column="pic" />
-		<result property="describe" column="describe" />
-		<result property="tag" column="tag" />
-		<result property="seq" column="seq" />
-		<result property="status" column="status" />
-		<result property="createTime" column="create_time" />
-		<result property="creator" column="creator" />
-		<result property="grade" column="grade" />
-		<result property="updateTime" column="update_time" />
-		<result property="updater" column="updater" />
-	</resultMap>
-
-  <select id="listByParentId" resultType="com.tashow.cloud.product.domain.Category">
-  	select category_id,icon,category_name,`seq`,`status`,pic from tz_category where parent_id = #{parentId} and `status` = 1 order by seq
-  </select>
-
-
-
-
-
-  <select id="tableCategory" resultType="com.tashow.cloud.product.domain.Category">
-  	select category_id ,parent_id ,category_name,pic,seq,status from tz_category where shop_id = #{shopId} order by seq
-  </select>
-</mapper>
--->
diff --git a/tashow-module/tashow-module-product/src/main/resources/mapper/product/ProdMapper.xml b/tashow-module/tashow-module-product/src/main/resources/mapper/product/ProdMapper.xml
index 144eef5..2d68480 100644
--- a/tashow-module/tashow-module-product/src/main/resources/mapper/product/ProdMapper.xml
+++ b/tashow-module/tashow-module-product/src/main/resources/mapper/product/ProdMapper.xml
@@ -8,7 +8,7 @@
         代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
         文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
      -->
-<!--    <select id="getProdPage1" resultType="com.tashow.cloud.product.dto.ProdDO">-->
-<!--        select * from tz_prod-->
-<!--    </select>-->
+    <select id="getProdPageList" resultType="java.util.List">
+        select * from tz_prod
+    </select>
 </mapper>
\ No newline at end of file