From 0e4d3d7aa8fe8193560d2ab7e433ae541d745a52 Mon Sep 17 00:00:00 2001
From: yf001217 <834502597@qq.com>
Date: Fri, 26 Jun 2026 17:27:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E5=AE=A3=E4=BC=A0=E5=9B=BE?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nflg/wms/common/pojo/qo/AdvertisementRequst.java   | 10 +++++-----
 .../wms/repository/mapper/AdvertisementMapper.java     |  4 ++--
 .../wms/repository/service/IAdvertisementService.java  |  4 ++--
 .../service/impl/AdvertisementServiceImpl.java         |  4 ++--
 .../src/main/resources/mapper/AdvertisementMapper.xml  | 10 +++++-----
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/AdvertisementRequst.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/AdvertisementRequst.java
index 31766c54..c29c51fc 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/AdvertisementRequst.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/AdvertisementRequst.java
@@ -1,6 +1,6 @@
 package com.nflg.wms.common.pojo.qo;
 
-import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 
@@ -10,12 +10,12 @@ public class AdvertisementRequst {
     /**
      * 广告类型
      */
-    @NotBlank
-    private String type;
+    @NotNull
+    private Long type;
 
     /**
      * 广告位置
      */
-    @NotBlank
-    private String position;
+    @NotNull
+    private Long position;
 }
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/AdvertisementMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/AdvertisementMapper.java
index 755520f2..f3e0e8e4 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/AdvertisementMapper.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/AdvertisementMapper.java
@@ -18,9 +18,9 @@ import java.util.List;
 public interface AdvertisementMapper extends BaseMapper<Advertisement> {
 
 
-    Advertisement getByType(String type, String position);
+    Advertisement getByType(Long type, Long position);
 
     IPage<AdvertisementListVO> getList(IPage<?> page);
 
-    List<AdvertisementListVO> getVersions(String type, String position);
+    List<AdvertisementListVO> getVersions(Long type, Long position);
 }
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IAdvertisementService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IAdvertisementService.java
index 19626c4a..0a3aeae4 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IAdvertisementService.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IAdvertisementService.java
@@ -21,13 +21,13 @@ import java.util.List;
  */
 public interface IAdvertisementService extends IService<Advertisement> {
 
-    AdvertisementVO getByType(String type, String position);
+    AdvertisementVO getByType(Long type, Long position);
 
     void save(AdvertisementSaveRequest request);
 
     IPage<AdvertisementListVO> getList(PageQO request);
 
-    List<AdvertisementListVO> getVersions(String type, String position);
+    List<AdvertisementListVO> getVersions(Long type, Long position);
 
     void enable(EnableBatchQO request);
 }
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/AdvertisementServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/AdvertisementServiceImpl.java
index 1ecc00c1..d1783f27 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/AdvertisementServiceImpl.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/AdvertisementServiceImpl.java
@@ -32,7 +32,7 @@ import java.util.Objects;
 public class AdvertisementServiceImpl extends ServiceImpl<AdvertisementMapper, Advertisement> implements IAdvertisementService {
 
     @Override
-    public AdvertisementVO getByType(String type, String position) {
+    public AdvertisementVO getByType(Long type, Long position) {
         Advertisement ad = baseMapper.getByType(type, position);
         if (Objects.isNull(ad)) {
             return null;
@@ -76,7 +76,7 @@ public class AdvertisementServiceImpl extends ServiceImpl<AdvertisementMapper, A
     }
 
     @Override
-    public List<AdvertisementListVO> getVersions(String type, String position) {
+    public List<AdvertisementListVO> getVersions(Long type, Long position) {
         return baseMapper.getVersions(type, position);
     }
 
diff --git a/nflg-wms-repository/src/main/resources/mapper/AdvertisementMapper.xml b/nflg-wms-repository/src/main/resources/mapper/AdvertisementMapper.xml
index 5f4cedaa..5051e86c 100644
--- a/nflg-wms-repository/src/main/resources/mapper/AdvertisementMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/AdvertisementMapper.xml
@@ -5,9 +5,9 @@
     <select id="getByType" resultType="com.nflg.wms.repository.entity.Advertisement">
         SELECT ad.*
         FROM qms_advertisement ad
-        INNER JOIN dictionary_item di1 ON ad.type = di1.id
-        INNER JOIN dictionary_item di2 ON ad.position = di2.id
-        where di1.code = #{type} AND di2.code=#{position} and ad.enable
+        WHERE ad.type = #{type}
+          AND ad.position = #{position}
+          AND ad.enable
         ORDER BY CAST(SUBSTRING(ad.version, 2) AS INTEGER) DESC
         LIMIT 1
     </select>
@@ -38,8 +38,8 @@
         FROM qms_advertisement ad
         INNER JOIN dictionary_item di1 ON ad.type=di1.id
         INNER JOIN dictionary_item di2 ON ad.position=di2.id
-        WHERE di1.code = #{type}
-          AND di2.code = #{position}
+        WHERE ad.type = #{type}
+          AND ad.position = #{position}
         ORDER BY CAST(SUBSTRING(ad.version, 2) AS INTEGER) DESC,
                  ad.create_time DESC,
                  ad.id DESC