From a7f7aaefc7dad6580ada55ae1e5c5b378c00b2f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?=
<14103883+leaf-phos@user.noreply.gitee.com>
Date: Sat, 26 Apr 2025 18:41:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=BF=E5=91=8A=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/ruoyi/bst/ad/mapper/AdMapper.xml | 1 +
.../com/ruoyi/bst/ad/service/AdService.java | 1 -
.../bst/ad/service/impl/AdConverterImpl.java | 2 ++
.../bst/ad/service/impl/AdServiceImpl.java | 23 ++----------
.../com/ruoyi/web/app/AppAdController.java | 36 +++++++++++++++++--
.../java/com/ruoyi/web/bst/AdController.java | 10 ++++++
6 files changed, 48 insertions(+), 25 deletions(-)
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/ad/mapper/AdMapper.xml b/ruoyi-service/src/main/java/com/ruoyi/bst/ad/mapper/AdMapper.xml
index a1fd87c..40eb974 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/ad/mapper/AdMapper.xml
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/ad/mapper/AdMapper.xml
@@ -59,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and bad.picture = #{query.picture}
and bad.url like concat('%',#{query.url},'%')
and bad.deleted = #{query.deleted}
+ and bad.deleted = false
and bad.audit_status = #{query.auditStatus}
and bad.url_type = #{query.urlType}
${@com.ruoyi.framework.util.DataScopeUtil@dataScope(
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/ad/service/AdService.java b/ruoyi-service/src/main/java/com/ruoyi/bst/ad/service/AdService.java
index 2acf942..5f6655f 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/ad/service/AdService.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/ad/service/AdService.java
@@ -68,7 +68,6 @@ public interface AdService
AdVO selectOne(AdQuery adQuery);
- List toAppVOList(AdQuery adQuery);
public int logicalDel(List adIds);
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/ad/service/impl/AdConverterImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/ad/service/impl/AdConverterImpl.java
index 158ba95..a7fc5ae 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/ad/service/impl/AdConverterImpl.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/ad/service/impl/AdConverterImpl.java
@@ -28,6 +28,7 @@ public class AdConverterImpl implements AdConverter {
po.setUrl(data.getUrl());
po.setUrlType(data.getUrlType());
+ po.setAuditStatus(data.getAuditStatus());
return po;
}
@@ -48,6 +49,7 @@ public class AdConverterImpl implements AdConverter {
po.setPicture(data.getPicture());
po.setUrl(data.getUrl());
po.setUrlType(data.getUrlType());
+ po.setAuditStatus(data.getAuditStatus());
return po;
}
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/ad/service/impl/AdServiceImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/ad/service/impl/AdServiceImpl.java
index 4d0c6df..387c003 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/ad/service/impl/AdServiceImpl.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/ad/service/impl/AdServiceImpl.java
@@ -81,6 +81,7 @@ public class AdServiceImpl implements AdService {
if (ad.getBelong().equals(AdBlong.STORE.getCode())) {
AreaVO area = areaService.selectAreaById(ad.getAreaId());
ad.setStoreId(area.getUserId());
+
// 条件查询广告
AdQuery query = new AdQuery();
query.setAreaId(ad.getAreaId());
@@ -108,7 +109,7 @@ public class AdServiceImpl implements AdService {
}
}
AreaVO area = areaService.selectAreaById(ad.getAreaId());
- if (area.getUserId() != null) {
+ if (area != null && area.getUserId() != null) {
ad.setStoreId(area.getUserId());
}
ad.setUpdateTime(DateUtils.getNowDate());
@@ -143,26 +144,6 @@ public class AdServiceImpl implements AdService {
}
- @Override
- public List toAppVOList(AdQuery adQuery) {
- List list = new ArrayList<>();
- // 查询所属运营区的广告
- UserVO user = userService.selectUserById(adQuery.getUserId());
- adQuery.setAreaId(user.getAreaId());
- List areaAdVOList = adMapper.selectAdList(adQuery);
- if (areaAdVOList != null) {
- list.addAll(areaAdVOList);
- }
- // 查询管理员发布的广告
- AdQuery query = new AdQuery();
- query.setBelong(AdBlong.ADMIN.getCode());
- List adminAdVOList = adMapper.selectAdList(query);
- if (adminAdVOList != null) {
- list.addAll(adminAdVOList);
- }
- return list;
- }
-
@Override
public int logicalDel(List adIds) {
return adMapper.logicalDel(adIds);
diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/app/AppAdController.java b/ruoyi-web/src/main/java/com/ruoyi/web/app/AppAdController.java
index 88cb761..f5ce738 100644
--- a/ruoyi-web/src/main/java/com/ruoyi/web/app/AppAdController.java
+++ b/ruoyi-web/src/main/java/com/ruoyi/web/app/AppAdController.java
@@ -1,7 +1,11 @@
package com.ruoyi.web.app;
import com.ruoyi.bst.ad.domain.AdQuery;
+import com.ruoyi.bst.ad.domain.AdVO;
+import com.ruoyi.bst.ad.domain.enums.AdBlong;
import com.ruoyi.bst.ad.domain.enums.AdVerifyStatus;
+import com.ruoyi.common.core.domain.vo.UserVO;
+import com.ruoyi.system.user.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -14,6 +18,9 @@ import com.ruoyi.common.core.domain.AjaxResult;
import io.swagger.annotations.ApiOperation;
+import java.util.ArrayList;
+import java.util.List;
+
@RestController
@RequestMapping("/app/ad")
public class AppAdController extends BaseController {
@@ -21,14 +28,37 @@ public class AppAdController extends BaseController {
@Autowired
private AdService adService;
+ @Autowired
+ private UserService userService;
+
@ApiOperation("获取广告")
@GetMapping
@Anonymous
public AjaxResult getAd(AdQuery query) {
- query.setUserId(getUserId());
query.setAuditStatus(AdVerifyStatus.PASSED.getCode());
- query.setDeleted(false);
- return success(adService.toAppVOList(query));
+
+ List list = new ArrayList<>();
+
+ // 查询所属运营区的广告
+ UserVO user = userService.selectUserById(getUserId());
+ if (user.getAreaId() != null) {
+ query.setAreaId(user.getAreaId());
+ query.setBelong(AdBlong.STORE.getCode());
+ List areaAdVOList = adService.selectAdList(query);
+ if (areaAdVOList != null) {
+ list.addAll(areaAdVOList);
+ }
+ }
+
+ // 查询管理员发布的广告
+ query.setAreaId(null);
+ query.setBelong(AdBlong.ADMIN.getCode());
+ List adminAdVOList = adService.selectAdList(query);
+ if (adminAdVOList != null) {
+ list.addAll(adminAdVOList);
+ }
+
+ return success(list);
}
}
diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/bst/AdController.java b/ruoyi-web/src/main/java/com/ruoyi/web/bst/AdController.java
index 4ee53a9..28579c1 100644
--- a/ruoyi-web/src/main/java/com/ruoyi/web/bst/AdController.java
+++ b/ruoyi-web/src/main/java/com/ruoyi/web/bst/AdController.java
@@ -99,6 +99,11 @@ public class AdController extends BaseController
@PostMapping
public AjaxResult add(@Validated(ValidGroup.Create.class) @RequestBody Ad ad)
{
+ if (isSysAdmin()) {
+ ad.setAuditStatus("2");
+ } else {
+ ad.setAuditStatus("1");
+ }
ad = adConverter.toPoByCreate(ad);
return toAjax(adService.insertAd(ad));
}
@@ -115,6 +120,11 @@ public class AdController extends BaseController
if (!adValidator.canEdit(ad.getAdId())){
return AjaxResult.error("您没有权限修改id为" + ad.getAdId() + "的广告信息");
}
+ if (isSysAdmin()) {
+ ad.setAuditStatus("2");
+ } else {
+ ad.setAuditStatus("1");
+ }
adConverter.toPoByUpdate(ad);
return toAjax(adService.updateAd(ad));
}