ruoyi-service/src/main/java/com/ruoyi/bst/ad/domain/enums/AdStatus.java

@@ -1,6 +1,5 @@
 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;
@@ -17,14 +16,5 @@ public enum AdStatus {
     private final String code;
     private final String name;
 
-    // 允许禁用的广告状态
-    public static List<String> canDisable() {
-        return CollectionUtils.map(AdStatus::getCode, ENABLE);
-    }
-
-    // 允许启用的广告状态
-    public static List<String> canEnable() {
-        return CollectionUtils.map(AdStatus::getCode, DISABLE);
-    }
 
 }

ruoyi-service/src/main/java/com/ruoyi/bst/ad/service/impl/AdServiceImpl.java

@@ -5,7 +5,6 @@ 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;
@@ -175,18 +174,14 @@ public class AdServiceImpl implements AdService {
     public int enable(Long adId) {
         AdVO ad = this.selectAdByAdId(adId);
         ServiceUtil.assertion(ad == null, "当前广告信息不存在", adId);
-        ServiceUtil.assertion(!AdStatus.canEnable().contains(ad.getStatus()), "广告%s当前状态不允许启用", adId);
+        ServiceUtil.assertion(!DeviceStatus.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(!AdStatus.canDisable().contains(ad.getStatus()), "广告%s当前状态不允许启用", adId);
+        ServiceUtil.assertion(!DeviceStatus.canDisable().contains(ad.getStatus()), "广告%s当前状态不允许启用", adId);
-        // 更新广告状态
-        return 1;
     }
 
 }

ruoyi-web/src/main/java/com/ruoyi/web/app/AppAgreementController.java

@@ -2,12 +2,10 @@ 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.*;
@@ -31,8 +29,7 @@ public class AppAgreementController extends BaseController {
         if (query.getAreaId()==null) {
             return AjaxResult.error("运营区不能为空");
         }
-        AgreementVO agreementVO = CollectionUtils.firstElement(agreementService.selectAgreementList(query));
+        return success(agreementService.selectAgreementList(query));
-        return success(agreementVO);
     }