diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/ad/domain/enums/AdStatus.java b/ruoyi-service/src/main/java/com/ruoyi/bst/ad/domain/enums/AdStatus.java index 34e16c3..92ad3dc 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/ad/domain/enums/AdStatus.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/ad/domain/enums/AdStatus.java @@ -1,5 +1,6 @@ package com.ruoyi.bst.ad.domain.enums; +import com.ruoyi.bst.device.domain.enums.DeviceStatus; import com.ruoyi.common.utils.collection.CollectionUtils; import lombok.AllArgsConstructor; import lombok.Getter; @@ -16,5 +17,14 @@ public enum AdStatus { private final String code; private final String name; + // 允许禁用的广告状态 + public static List canDisable() { + return CollectionUtils.map(AdStatus::getCode, ENABLE); + } + + // 允许启用的广告状态 + public static List canEnable() { + return CollectionUtils.map(AdStatus::getCode, DISABLE); + } } 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 14a95ca..21cee27 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 @@ -5,6 +5,7 @@ import java.util.List; import com.ruoyi.bst.ad.domain.AdVerifyDTO; import com.ruoyi.bst.ad.domain.enums.AdBelong; +import com.ruoyi.bst.ad.domain.enums.AdStatus; import com.ruoyi.bst.ad.domain.enums.AdVerifyStatus; import com.ruoyi.bst.ad.service.AdConverter; import com.ruoyi.bst.area.domain.AreaVO; @@ -174,14 +175,18 @@ public class AdServiceImpl implements AdService { public int enable(Long adId) { AdVO ad = this.selectAdByAdId(adId); ServiceUtil.assertion(ad == null, "当前广告信息不存在", adId); - ServiceUtil.assertion(!DeviceStatus.canEnable().contains(ad.getStatus()), "广告%s当前状态不允许启用", adId); + ServiceUtil.assertion(!AdStatus.canEnable().contains(ad.getStatus()), "广告%s当前状态不允许启用", adId); + // 更新广告状态 + return 1; } @Override public int disable(Long adId) { AdVO ad = this.selectAdByAdId(adId); ServiceUtil.assertion(ad == null, "当前广告信息不存在", adId); - ServiceUtil.assertion(!DeviceStatus.canDisable().contains(ad.getStatus()), "广告%s当前状态不允许启用", adId); + ServiceUtil.assertion(!AdStatus.canDisable().contains(ad.getStatus()), "广告%s当前状态不允许启用", adId); + // 更新广告状态 + return 1; } } diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/app/AppAgreementController.java b/ruoyi-web/src/main/java/com/ruoyi/web/app/AppAgreementController.java index e3f4500..f2f2c7d 100644 --- a/ruoyi-web/src/main/java/com/ruoyi/web/app/AppAgreementController.java +++ b/ruoyi-web/src/main/java/com/ruoyi/web/app/AppAgreementController.java @@ -2,10 +2,12 @@ package com.ruoyi.web.app; import com.github.pagehelper.PageHelper; import com.ruoyi.bst.agreement.domain.AgreementQuery; +import com.ruoyi.bst.agreement.domain.AgreementVO; import com.ruoyi.bst.agreement.domain.enums.AgreementContentType; import com.ruoyi.bst.agreement.service.AgreementService; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.collection.CollectionUtils; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -29,7 +31,8 @@ public class AppAgreementController extends BaseController { if (query.getAreaId()==null) { return AjaxResult.error("运营区不能为空"); } - return success(agreementService.selectAgreementList(query)); + AgreementVO agreementVO = CollectionUtils.firstElement(agreementService.selectAgreementList(query)); + return success(agreementVO); }