From 1236c24184f84a0ab8c4a45037a98b38801d865f Mon Sep 17 00:00:00 2001 From: SjS Date: Fri, 25 Apr 2025 11:20:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=B9=BF=E5=91=8A=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/bst/ad/mapper/AdMapper.xml | 8 +--- .../com/ruoyi/bst/ad/service/AdConverter.java | 9 ++--- .../bst/ad/service/impl/AdConverterImpl.java | 39 ++++++++----------- .../bst/ad/service/impl/AdServiceImpl.java | 9 +++-- .../ruoyi/bst/agreement/domain/Agreement.java | 17 +++++++- .../bst/agreement/mapper/AgreementMapper.xml | 4 ++ .../com/ruoyi/web/app/AppAdController.java | 1 + .../java/com/ruoyi/web/bst/AdController.java | 1 - 8 files changed, 47 insertions(+), 41 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 f7ec54b..a1fd87c 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.audit_status = #{query.auditStatus} and bad.url_type = #{query.urlType} ${@com.ruoyi.framework.util.DataScopeUtil@dataScope( null, @@ -98,13 +99,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND deleted = 0 - - insert into bst_ad diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/ad/service/AdConverter.java b/ruoyi-service/src/main/java/com/ruoyi/bst/ad/service/AdConverter.java index 67b4a1c..504462d 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/ad/service/AdConverter.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/ad/service/AdConverter.java @@ -8,11 +8,8 @@ import java.util.List; public interface AdConverter { - AdQuery toAdQueryByCreate(Ad ad); - - AdQuery toAdAdminVO(); - - AdQuery toAdStoreVO(); - Ad toPoByCreate(Ad ad); + + Ad toPoByUpdate(Ad ad); + } 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 b7852a1..160b934 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 @@ -12,28 +12,6 @@ import org.springframework.stereotype.Service; @Service public class AdConverterImpl implements AdConverter { - @Override - public AdQuery toAdQueryByCreate(Ad ad) { - AdQuery query = new AdQuery(); - query.setAreaId(ad.getAreaId()); - query.setBelong(ad.getBelong()); - return query; - } - - @Override - public AdQuery toAdAdminVO() { - AdQuery query = new AdQuery(); - query.setBelong(AdBlong.ADMIN.getCode()); - return query; - } - - @Override - public AdQuery toAdStoreVO() { - AdQuery query = new AdQuery(); - query.setUserId(SecurityUtils.getUserId()); - query.setBelong(AdBlong.STORE.getCode()); - return query; - } @Override public Ad toPoByCreate(Ad data) { @@ -51,4 +29,21 @@ public class AdConverterImpl implements AdConverter { return po; } + @Override + public Ad toPoByUpdate(Ad data) { + if (data == null) { + return null; + } + Ad po = new Ad(); + // 基础信息 + po.setAdId(data.getAdId()); + po.setAreaId(data.getAreaId()); + po.setType(data.getType()); + po.setPicture(data.getPicture()); + po.setBelong(data.getBelong()); + po.setUrl(data.getUrl()); + po.setUrlType(data.getUrlType()); + 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 c226752..712962c 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 @@ -156,14 +156,17 @@ public class AdServiceImpl implements AdService @Override public List toAppVOList(AdQuery adQuery) { List list = new ArrayList<>(); - UserVO user = userService.selectUserById(adQuery.getUserId()); // 查询所属运营区的广告 - List areaAdVOList = adMapper.selectAdByAreaId(user.getAreaId()); + UserVO user = userService.selectUserById(adQuery.getUserId()); + adQuery.setAreaId(user.getAreaId()); + List areaAdVOList = adMapper.selectAdList(adQuery); if (areaAdVOList != null) { list.addAll(areaAdVOList); } // 查询管理员发布的广告 - List adminAdVOList = adMapper.selectAdList(adConverter.toAdAdminVO()); + AdQuery query = new AdQuery(); + query.setBelong(AdBlong.ADMIN.getCode()); + List adminAdVOList = adMapper.selectAdList(query); if (adminAdVOList != null) { list.addAll(adminAdVOList); } diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/domain/Agreement.java b/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/domain/Agreement.java index 996e211..9041385 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/domain/Agreement.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/domain/Agreement.java @@ -4,9 +4,13 @@ import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.interfaces.LogBizParam; +import com.ruoyi.common.core.validate.ValidGroup; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + /** * 协议对象 bst_agreement * @@ -26,10 +30,12 @@ public class Agreement extends BaseEntity implements LogBizParam @Excel(name = "运营区ID") @ApiModelProperty("运营区ID") + @NotNull(message = "运营区ID不能为空",groups = {ValidGroup.Create.class}) private Long areaId; @Excel(name = "标题") @ApiModelProperty("标题") + @NotBlank(message = "标题不能为空",groups = {ValidGroup.Create.class}) private String title; @Excel(name = "简介") @@ -38,12 +44,19 @@ public class Agreement extends BaseEntity implements LogBizParam @Excel(name = "内容详情") @ApiModelProperty("内容详情") + @NotBlank(message = "内容详情不能为空",groups = {ValidGroup.Create.class}) private String content; - @Excel(name = "协议类型:0-公告 1-免责协议 2-安全协议") - @ApiModelProperty("协议类型:0-公告 1-免责协议 2-安全协议") + @Excel(name = "协议类型:0-公告 1-租赁协议 ") + @ApiModelProperty("协议类型:0-公告 1-租赁协议 ") + @NotBlank(message = "协议类型不能为空",groups = {ValidGroup.Create.class}) private String agreementType; + + @Excel(name = "内容类型:1-模板 2-正文") + @ApiModelProperty("内容类型:1-模板 2-正文") + private String contentType; + @Excel(name = "展示时间") @ApiModelProperty("展示时间") private Integer duration; diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/mapper/AgreementMapper.xml b/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/mapper/AgreementMapper.xml index 5bff8d0..674d65e 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/mapper/AgreementMapper.xml +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/mapper/AgreementMapper.xml @@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bag.title, bag.brief, bag.content, + bag.content_type, bag.agreement_type, bag.duration, bag.create_time, @@ -86,6 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" brief, content, agreement_type, + content_type, duration, create_time, update_time, @@ -97,6 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{brief}, #{content}, #{agreementType}, + #{contentType}, #{duration}, #{createTime}, #{updateTime}, @@ -256,6 +259,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" brief = #{data.brief}, content = #{data.content}, agreement_type = #{data.agreementType}, + content_type = #{data.contentType}, duration = #{data.duration}, create_time = #{data.createTime}, update_time = #{data.updateTime}, 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 5580be6..3c87e63 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 @@ -27,6 +27,7 @@ public class AppAdController extends BaseController { public AjaxResult getAd(AdQuery query) { query.setUserId(getUserId()); query.setAuditStatus(AdVerifyStatus.PASSED.getCode()); + query.setDeleted(false); return success(adService.toAppVOList(query)); } 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 1855c3e..7955c55 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 @@ -66,7 +66,6 @@ public class AdController extends BaseController startPage(); startOrderBy(); query.setScope(true); - query.setUserId(getUserId()); query.setDeleted(false); return getDataTable(adService.selectAdList(query)); }