修改了app接口和权限

src/main/java/org/rcisoft/app/appActivity/controller/AppActivityController.java

@@ -6,7 +6,6 @@ package org.rcisoft.app.appActivity.controller;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
-import jakarta.servlet.http.HttpServletResponse;
 import org.rcisoft.business.cmsActivity.entity.CmsActivity;
 import org.rcisoft.business.cmsActivity.service.CmsActivityService;
 import org.rcisoft.core.anno.CyOpeLogAnno;
@@ -16,15 +15,11 @@ import org.rcisoft.core.model.CyGridModel;
 import org.rcisoft.core.model.CyPersistModel;
 import org.rcisoft.core.operlog.enums.CyLogTypeEnum;
 import org.rcisoft.core.result.CyResult;
-import org.rcisoft.core.util.CyEpExcelUtil;
 import org.rcisoft.core.util.CyResultGenUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
-import java.util.List;
 
 /**
  * @author cy
@@ -38,47 +33,8 @@ public class AppActivityController extends CyPaginationController<CmsActivity> {
     @Autowired
     private CmsActivityService cmsActivityServiceImpl;
 
-    @PreAuthorize("@cyPerm.hasPerm('cms:activity:increase')")
-    @CyOpeLogAnno(title = "system-活动管理-新增活动", businessType = CyLogTypeEnum.INSERT)
-    @Operation(summary = "添加活动", description = "添加活动")
-    @PostMapping(value = "/add")
-    public CyResult add(@Valid CmsActivity cmsActivity, BindingResult bindingResult) {
-        CyPersistModel data = cmsActivityServiceImpl.persist(cmsActivity);
-        return CyResultGenUtil.builder(data,
-                CyMessCons.MESSAGE_ALERT_SUCCESS,
-                CyMessCons.MESSAGE_ALERT_ERROR,
-                cmsActivity);
-    }
-
-    @PreAuthorize("@cyPerm.hasPerm('cms:activity:removing')")
-    @CyOpeLogAnno(title = "system-活动管理-删除活动", businessType = CyLogTypeEnum.DELETE)
-    @Operation(summary = "删除活动", description = "删除活动")
-    @Parameters({@Parameter(name = "businessId", description = "businessId", required = true)})
-    @DeleteMapping("/delete/{businessId:\\w+}")
-    public CyResult delete(@PathVariable Integer businessId, CmsActivity cmsActivity) {
-        cmsActivity.setBusinessId(businessId);
-        CyPersistModel data = cmsActivityServiceImpl.remove(cmsActivity);
-        return CyResultGenUtil.builder(data,
-                CyMessCons.MESSAGE_ALERT_SUCCESS,
-                CyMessCons.MESSAGE_ALERT_ERROR,
-                businessId);
-    }
-
-    @PreAuthorize("@cyPerm.hasPerm('cms:activity:modifications')")
-    @CyOpeLogAnno(title = "system-活动管理-修改活动", businessType = CyLogTypeEnum.INSERT)
-    @Operation(summary = "修改活动", description = "修改活动")
-    @Parameters({@Parameter(name = "businessId", description = "businessId", required = false)})
-    @PostMapping("/update/{businessId:\\w+}")
-    public CyResult update(@PathVariable Integer businessId, @Valid CmsActivity cmsActivity, BindingResult bindingResult) {
-        cmsActivity.setBusinessId(businessId);
-        CyPersistModel data = cmsActivityServiceImpl.merge(cmsActivity);
-        return CyResultGenUtil.builder(data,
-                CyMessCons.MESSAGE_ALERT_SUCCESS,
-                CyMessCons.MESSAGE_ALERT_ERROR,
-                cmsActivity);
-    }
 
-//    @PreAuthorize("@cyPerm.hasPerm('cms:activity:singleSearch')")
+    @PreAuthorize("@cyPerm.hasPerm('app:activity:detail')")
     @CyOpeLogAnno(title = "system-活动管理-查询活动", businessType = CyLogTypeEnum.QUERY)
     @Operation(summary = "查询单一活动", description = "查询单一活动")
     @Parameters({@Parameter(name = "businessId", description = "businessId", required = true)})
@@ -90,18 +46,7 @@ public class AppActivityController extends CyPaginationController<CmsActivity> {
                 cmsActivityServiceImpl.findById(businessId));
     }
 
-    //@PreAuthorize("@cyPerm.hasPerm('sys:activity:list')")
-    @CyOpeLogAnno(title = "system-活动管理-查询活动管理", businessType = CyLogTypeEnum.QUERY)
-    @Operation(summary = "查询活动集合", description = "查询活动集合")
-    @GetMapping(value = "/queryCmsActivity")
-    public CyResult querySysContentNewsInformations(CmsActivity cmsActivity) {
-        return CyResultGenUtil.builder(new CyPersistModel(1),
-                CyMessCons.MESSAGE_ALERT_SUCCESS,
-                CyMessCons.MESSAGE_ALERT_ERROR,
-                cmsActivityServiceImpl.findAll(cmsActivity));
-    }
-
-//    @PreAuthorize("@cyPerm.hasPerm('cms:activity:pageSearch')")
+    @PreAuthorize("@cyPerm.hasPerm('app:activity:query')")
     @CyOpeLogAnno(title = "system-活动管理-查询活动", businessType = CyLogTypeEnum.QUERY)
     @Operation(summary = "分页查询活动集合", description = "分页查询活动集合")
     @GetMapping(value = "/queryCmsActivityByPagination")
@@ -109,38 +54,4 @@ public class AppActivityController extends CyPaginationController<CmsActivity> {
         cmsActivityServiceImpl.findAllByPagination(getPaginationUtility(), cmsActivity);
         return getGridModelResponse();
     }
-
-    //修改状态
-    @PreAuthorize("@cyPerm.hasPerm('cms:activity:modificationsStatus')")
-    @CyOpeLogAnno(title = "system-活动管理管理-修改活动管理状态", businessType = CyLogTypeEnum.UPDATE)
-    @Operation(summary = "修改活动状态", description = "修改活动状态")
-    @Parameters({@Parameter(name = "businessId", description = "businessId", required = true)})
-    @PostMapping("/updateStatus/{businessId:\\w+}")
-    public CyResult updateStatus(CmsActivity cmsActivity) {
-        CyPersistModel data = cmsActivityServiceImpl.updateStatus(cmsActivity);
-        return CyResultGenUtil.builder(data,
-                CyMessCons.MESSAGE_ALERT_SUCCESS,
-                CyMessCons.MESSAGE_ALERT_ERROR,
-                cmsActivity);
-    }
-    @PreAuthorize("@cyPerm.hasPerm('cms:activity:derive')")
-    @CyOpeLogAnno(title = "system-活动管理管理-查询活动管理", businessType = CyLogTypeEnum.EXPORT)
-    @Operation(summary = "导出活动信息", description = "导出活动信息")
-    @GetMapping(value = "/export")
-    public void outSysContentNewsInformation(HttpServletResponse response, CmsActivity cmsActivity, @PathVariable @RequestParam(defaultValue = "0") String excelId) {
-        String excelName = "";
-        switch (excelId) {
-            case "0":
-                excelName = "活动信息.xls";
-                break;
-            case "1":
-                excelName = "活动信息.xlsx";
-                break;
-            case "2":
-                excelName = "活动信息.csv";
-                break;
-        }
-        List<CmsActivity> cmsActivityList = cmsActivityServiceImpl.export(cmsActivity);
-        CyEpExcelUtil.exportExcel(cmsActivityList, "活动信息", "活动信息", CmsActivity.class, excelName, response);
-    }
 }

src/main/java/org/rcisoft/app/appApplication/controller/AppApplicationController.java

-package org.rcisoft.app.appApplication.controller;
-/*固定导入*/
-
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import org.rcisoft.business.cmsApplication.entity.CmsApplication;
-import org.rcisoft.business.cmsApplication.service.CmsApplicationService;
-import org.rcisoft.core.anno.CyOpeLogAnno;
-import org.rcisoft.core.constant.CyMessCons;
-import org.rcisoft.core.controller.CyPaginationController;
-import org.rcisoft.core.model.CyGridModel;
-import org.rcisoft.core.model.CyPersistModel;
-import org.rcisoft.core.operlog.enums.CyLogTypeEnum;
-import org.rcisoft.core.result.CyResult;
-import org.rcisoft.core.util.CyResultGenUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @author cy
- * @date 2024年3月25日 下午1:42:40
- */
-@RestController
-@RequestMapping("/app/cmsApplication")
-public class AppApplicationController extends CyPaginationController<CmsApplication> {
-
-
-    @Autowired
-    private CmsApplicationService cmsApplicationServiceImpl;
-
-    @PreAuthorize("@cyPerm.hasPerm('cms:application:singleSearch')")
-    @CyOpeLogAnno(title = "system-报名管理-查询报名", businessType = CyLogTypeEnum.QUERY)
-    @Operation(summary = "查询单一报名", description = "查询单一报名")
-    @Parameters({@Parameter(name = "businessId", description = "businessId", required = true)})
-    @GetMapping("/detail/{businessId:\\w+}")
-    public CyResult detail(@PathVariable Integer businessId) {
-        return CyResultGenUtil.builder(new CyPersistModel(1),
-                CyMessCons.MESSAGE_ALERT_SUCCESS,
-                CyMessCons.MESSAGE_ALERT_ERROR,
-                cmsApplicationServiceImpl.findById(businessId));
-    }
-
-    @PreAuthorize("@cyPerm.hasPerm('sys:application:list')")
-    @CyOpeLogAnno(title = "system-报名管理-查询报名管理", businessType = CyLogTypeEnum.QUERY)
-    @Operation(summary = "查询报名集合", description = "查询报名集合")
-    @GetMapping(value = "/queryCmsApplication")
-    public CyResult queryCmsApplication(CmsApplication cmsApplication) {
-        return CyResultGenUtil.builder(new CyPersistModel(1),
-                CyMessCons.MESSAGE_ALERT_SUCCESS,
-                CyMessCons.MESSAGE_ALERT_ERROR,
-                cmsApplicationServiceImpl.findAll(cmsApplication));
-    }
-
-    @PreAuthorize("@cyPerm.hasPerm('cms:application:pageSearch')")
-    @CyOpeLogAnno(title = "system-报名管理-查询报名", businessType = CyLogTypeEnum.QUERY)
-    @Operation(summary = "分页查询报名集合", description = "分页查询报名集合")
-    @GetMapping(value = "/queryCmsApplicationByPagination")
-    public CyGridModel listByPagination(@RequestParam(required = false) Integer activityId, CmsApplication cmsApplication) {
-        // 如果传入了 activityId，设置到 cmsApplication 对象中
-        if (activityId != null) {
-            cmsApplication.setActivityId(activityId);
-        }
-
-        // 调用分页查询的方法
-        cmsApplicationServiceImpl.findAllByPagination(getPaginationUtility(), cmsApplication);
-
-        // 返回分页结果
-        return getGridModelResponse();
-    }
-}

src/main/java/org/rcisoft/app/appBanner/controller/AppBannerController.java

@@ -4,28 +4,16 @@ package org.rcisoft.app.appBanner.controller;
 /*固定导入*/
 
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import jakarta.servlet.http.HttpServletResponse;
 import org.rcisoft.business.cmsBanner.entity.CmsBanner;
 import org.rcisoft.business.cmsBanner.service.CmsBannerService;
 import org.rcisoft.core.anno.CyOpeLogAnno;
-import org.rcisoft.core.constant.CyMessCons;
 import org.rcisoft.core.controller.CyPaginationController;
 import org.rcisoft.core.model.CyGridModel;
-import org.rcisoft.core.model.CyPersistModel;
 import org.rcisoft.core.operlog.enums.CyLogTypeEnum;
-import org.rcisoft.core.result.CyResult;
-import org.rcisoft.core.util.CyEpExcelUtil;
-import org.rcisoft.core.util.CyResultGenUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
-import java.util.List;
-
 /**
 * Created by cy on 2024年3月30日 下午1:51:15.
 */
@@ -37,82 +25,8 @@ public class AppBannerController extends CyPaginationController<CmsBanner> {
     @Autowired
     private CmsBannerService cmsBannerServiceImpl;
 
-    @PreAuthorize("@cyPerm.hasPerm('cms:banner:increase')")
-    @CyOpeLogAnno(title = "system-banner管理管理-新增banner管理", businessType = CyLogTypeEnum.INSERT)
-    @Operation(summary="添加banner管理", description="添加banner管理")
-    @PostMapping(value = "/add")
-    public CyResult add(@Valid CmsBanner cmsBanner, BindingResult bindingResult) {
-        CyPersistModel data = cmsBannerServiceImpl.persist(cmsBanner);
-        return CyResultGenUtil.builder(data,
-            CyMessCons.MESSAGE_ALERT_SUCCESS,
-            CyMessCons.MESSAGE_ALERT_ERROR,
-        cmsBanner);
-    }
-    @PreAuthorize("@cyPerm.hasPerm('cms:banner:removing')")
-    @CyOpeLogAnno(title = "system-banner管理管理-删除banner管理", businessType = CyLogTypeEnum.DELETE)
-    @Operation(summary="逻辑删除banner管理", description="逻辑删除banner管理")
-    @Parameters({@Parameter(name = "businessId", description = "businessId", required = true)})
-    @DeleteMapping("/deleteLogical/{businessId:\\w+}")
-    public CyResult deleteLogical(@PathVariable String businessId, CmsBanner cmsBanner) {
-        cmsBanner.setBusinessId(Integer.valueOf(businessId));
-        CyPersistModel data = cmsBannerServiceImpl.removeLogical(cmsBanner);
-        return CyResultGenUtil.builder(data,
-            CyMessCons.MESSAGE_ALERT_SUCCESS,
-            CyMessCons.MESSAGE_ALERT_ERROR,
-        businessId);
-    }
-    //@PreAuthorize("@cyPerm.hasPerm('sys:banner:delete')")
-    @CyOpeLogAnno(title = "system-banner管理管理-删除banner管理", businessType = CyLogTypeEnum.DELETE)
-    @Operation(summary="删除banner管理", description="删除banner管理")
-    @Parameters({@Parameter(name = "businessId", description = "businessId", required = true)})
-    @DeleteMapping("/delete/{businessId:\\w+}")
-    public CyResult delete(@PathVariable String businessId, CmsBanner cmsBanner) {
-        cmsBanner.setBusinessId(Integer.valueOf(businessId));
-        CyPersistModel data = cmsBannerServiceImpl.remove(cmsBanner);
-        return CyResultGenUtil.builder(data,
-            CyMessCons.MESSAGE_ALERT_SUCCESS,
-            CyMessCons.MESSAGE_ALERT_ERROR,
-        businessId);
-    }
-
-    @PreAuthorize("@cyPerm.hasPerm('cms:banner:modifications')")
-    @CyOpeLogAnno(title = "system-banner管理管理-修改banner管理", businessType = CyLogTypeEnum.UPDATE)
-    @Operation(summary="修改banner管理", description="修改banner管理")
-    @Parameters({@Parameter(name = "businessId", description = "businessId", required = false)})
-    @PutMapping("/update/{businessId:\\w+}")
-    public CyResult update(@PathVariable String businessId, @Valid CmsBanner cmsBanner, BindingResult bindingResult) {
-        cmsBanner.setBusinessId(Integer.valueOf(businessId));
-        CyPersistModel data = cmsBannerServiceImpl.merge(cmsBanner);
-        return CyResultGenUtil.builder(data,
-            CyMessCons.MESSAGE_ALERT_SUCCESS,
-            CyMessCons.MESSAGE_ALERT_ERROR,
-        cmsBanner);
-    }
-
-    @PreAuthorize("@cyPerm.hasPerm('cms:banner:singleSearch')")
-    @CyOpeLogAnno(title = "system-banner管理管理-查询banner管理", businessType = CyLogTypeEnum.QUERY)
-    @Operation(summary="查询单一banner管理", description="查询单一banner管理")
-    @Parameters({@Parameter(name = "businessId", description = "businessId", required = true)})
-    @GetMapping("/detail/{businessId:\\w+}")
-    public CyResult detail(@PathVariable String businessId) {
-        return CyResultGenUtil.builder(new CyPersistModel(1),
-            CyMessCons.MESSAGE_ALERT_SUCCESS,
-            CyMessCons.MESSAGE_ALERT_ERROR,
-        cmsBannerServiceImpl.findById(businessId));
-    }
 
-    @PreAuthorize("@cyPerm.hasPerm('cms:banner:search')")
-    @CyOpeLogAnno(title = "system-banner管理管理-查询banner管理", businessType = CyLogTypeEnum.QUERY)
-    @Operation(summary="查询banner管理集合", description="查询banner管理集合")
-    @GetMapping(value = "/queryCmsBanners")
-    public CyResult queryCmsBanners(CmsBanner cmsBanner) {
-        return CyResultGenUtil.builder(new CyPersistModel(1),
-            CyMessCons.MESSAGE_ALERT_SUCCESS,
-            CyMessCons.MESSAGE_ALERT_ERROR,
-            cmsBannerServiceImpl.findAll(cmsBanner));
-    }
-
-//    @PreAuthorize("@cyPerm.hasPerm('cms:banner:pageSearch')")
+    @PreAuthorize("@cyPerm.hasPerm('app:banner:query')")
     @CyOpeLogAnno(title = "system-banner管理管理-查询banner管理", businessType = CyLogTypeEnum.QUERY)
     @Operation(summary="分页查询banner管理集合", description="分页查询banner管理集合")
     @GetMapping(value = "/queryCmsBannerByPagination")
@@ -121,18 +35,4 @@ public class AppBannerController extends CyPaginationController<CmsBanner> {
         return getGridModelResponse();
     }
 
-    @PreAuthorize("@cyPerm.hasPerm('cms:banner:derive')")
-    @CyOpeLogAnno(title = "system-banner管理管理-查询banner管理", businessType = CyLogTypeEnum.EXPORT)
-    @Operation(summary = "导出banner管理信息", description = "导出banner管理信息")
-    @GetMapping(value = "/export")
-    public void outCmsBanner(HttpServletResponse response, CmsBanner cmsBanner, @PathVariable @RequestParam(defaultValue = "0") String excelId) {
-        String excelName="";
-        switch(excelId){
-            case "0": excelName="banner管理信息.xls";break;
-            case "1": excelName="banner管理信息.xlsx";break;
-            case "2": excelName="banner管理信息.csv";break;
-        }
-        List<CmsBanner> cmsBannerList = cmsBannerServiceImpl.export(cmsBanner);
-        CyEpExcelUtil.exportExcel(cmsBannerList, "banner管理信息", "banner管理信息", CmsBanner.class, excelName, response);
-    }
 }

src/main/java/org/rcisoft/app/appNotice/controller/AppNoticeController.java

@@ -6,7 +6,6 @@ package org.rcisoft.app.appNotice.controller;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
-import jakarta.servlet.http.HttpServletResponse;
 import org.rcisoft.business.cmsNotice.entity.CmsNotice;
 import org.rcisoft.business.cmsNotice.service.CmsNoticeService;
 import org.rcisoft.core.anno.CyOpeLogAnno;
@@ -16,16 +15,11 @@ import org.rcisoft.core.model.CyGridModel;
 import org.rcisoft.core.model.CyPersistModel;
 import org.rcisoft.core.operlog.enums.CyLogTypeEnum;
 import org.rcisoft.core.result.CyResult;
-import org.rcisoft.core.util.CyEpExcelUtil;
 import org.rcisoft.core.util.CyResultGenUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
-import java.util.List;
-
 /**
  * @author cy
  * @date 2024年3月25日 下午1:42:40
@@ -38,47 +32,8 @@ public class AppNoticeController extends CyPaginationController<CmsNotice> {
     @Autowired
     private CmsNoticeService cmsNoticeServiceImpl;
 
-    @PreAuthorize("@cyPerm.hasPerm('cms:notice:increase')")
-    @CyOpeLogAnno(title = "system-公告管理-新增公告", businessType = CyLogTypeEnum.INSERT)
-    @Operation(summary = "添加公告", description = "添加公告")
-    @PostMapping(value = "/add")
-    public CyResult add(@Valid CmsNotice cmsNotice, BindingResult bindingResult) {
-        CyPersistModel data = cmsNoticeServiceImpl.persist(cmsNotice);
-        return CyResultGenUtil.builder(data,
-                CyMessCons.MESSAGE_ALERT_SUCCESS,
-                CyMessCons.MESSAGE_ALERT_ERROR,
-                cmsNotice);
-    }
-
-    @PreAuthorize("@cyPerm.hasPerm('cms:notice:removing')")
-    @CyOpeLogAnno(title = "system-公告管理-删除公告", businessType = CyLogTypeEnum.DELETE)
-    @Operation(summary = "删除公告", description = "删除公告")
-    @Parameters({@Parameter(name = "businessId", description = "businessId", required = true)})
-    @DeleteMapping("/delete/{businessId:\\w+}")
-    public CyResult delete(@PathVariable Integer businessId, CmsNotice cmsNotice) {
-        cmsNotice.setBusinessId(businessId);
-        CyPersistModel data = cmsNoticeServiceImpl.remove(cmsNotice);
-        return CyResultGenUtil.builder(data,
-                CyMessCons.MESSAGE_ALERT_SUCCESS,
-                CyMessCons.MESSAGE_ALERT_ERROR,
-                businessId);
-    }
-
-    @PreAuthorize("@cyPerm.hasPerm('cms:notice:modifications')")
-    @CyOpeLogAnno(title = "system-公告管理-修改公告", businessType = CyLogTypeEnum.INSERT)
-    @Operation(summary = "修改公告",  description = "修改公告")
-    @Parameters({@Parameter(name = "businessId", description = "businessId", required = false)})
-    @PostMapping("/update/{businessId:\\w+}")
-    public CyResult update(@PathVariable Integer businessId, @Valid CmsNotice cmsNotice, BindingResult bindingResult) {
-        cmsNotice.setBusinessId(businessId);
-        CyPersistModel data = cmsNoticeServiceImpl.merge(cmsNotice);
-        return CyResultGenUtil.builder(data,
-                CyMessCons.MESSAGE_ALERT_SUCCESS,
-                CyMessCons.MESSAGE_ALERT_ERROR,
-                cmsNotice);
-    }
 
-//    @PreAuthorize("@cyPerm.hasPerm('cms:notice:singleSearch')")
+    @PreAuthorize("@cyPerm.hasPerm('app:notice:detail')")
     @CyOpeLogAnno(title = "system-公告管理-查询公告", businessType = CyLogTypeEnum.QUERY)
     @Operation(summary = "查询单一公告", description = "查询单一公告")
     @Parameters({@Parameter(name = "businessId", description = "businessId", required = true)})
@@ -90,19 +45,8 @@ public class AppNoticeController extends CyPaginationController<CmsNotice> {
                 cmsNoticeServiceImpl.findById(businessId));
     }
 
-    //@PreAuthorize("@cyPerm.hasPerm('sys:contentNewsInformation:list')")
-    @CyOpeLogAnno(title = "system-公告管理-查询公告", businessType = CyLogTypeEnum.QUERY)
-    @Operation(summary = "查询公告集合", description = "查询公告集合")
-
-    @GetMapping(value = "/queryCmsNotice")
-    public CyResult querySysContentNewsInformations(CmsNotice cmsNotice) {
-        return CyResultGenUtil.builder(new CyPersistModel(1),
-                CyMessCons.MESSAGE_ALERT_SUCCESS,
-                CyMessCons.MESSAGE_ALERT_ERROR,
-                cmsNoticeServiceImpl.findAll(cmsNotice));
-    }
 
-//    @PreAuthorize("@cyPerm.hasPerm('cms:notice:pageSearch')")
+    @PreAuthorize("@cyPerm.hasPerm('app:notice:query')")
     @CyOpeLogAnno(title = "system-公告管理-查询公告", businessType = CyLogTypeEnum.QUERY)
     @Operation(summary = "分页查询公告集合", description = "分页查询公告集合")
     @GetMapping(value = "/queryCmsNoticeByPagination")
@@ -111,37 +55,4 @@ public class AppNoticeController extends CyPaginationController<CmsNotice> {
         return getGridModelResponse();
     }
 
-    //修改状态
-    @PreAuthorize("@cyPerm.hasPerm('cms:notice:modificationsStatus')")
-    @CyOpeLogAnno(title = "system-公告管理-修改公告状态", businessType = CyLogTypeEnum.UPDATE)
-    @Operation(summary = "修改公告状态", description = "修改公告状态")
-    @Parameters({@Parameter(name = "businessId", description = "businessId", required = true)})
-    @PostMapping("/updateStatus/{businessId:\\w+}")
-    public CyResult updateStatus(CmsNotice cmsNotice) {
-        CyPersistModel data = cmsNoticeServiceImpl.updateStatus(cmsNotice);
-        return CyResultGenUtil.builder(data,
-                CyMessCons.MESSAGE_ALERT_SUCCESS,
-                CyMessCons.MESSAGE_ALERT_ERROR,
-                cmsNotice);
-    }
-    @PreAuthorize("@cyPerm.hasPerm('cms:notice:derive')")
-    @CyOpeLogAnno(title = "system-公告管理-查询公告", businessType = CyLogTypeEnum.EXPORT)
-    @Operation(summary = "导出公告信息", description = "导出公告信息")
-    @GetMapping(value = "/export")
-    public void outSysContentNewsInformation(HttpServletResponse response, CmsNotice cmsNotice, @PathVariable @RequestParam(defaultValue = "0") String excelId) {
-        String excelName = "";
-        switch (excelId) {
-            case "0":
-                excelName = "公告信息.xls";
-                break;
-            case "1":
-                excelName = "公告信息.xlsx";
-                break;
-            case "2":
-                excelName = "公告信息.csv";
-                break;
-        }
-        List<CmsNotice> cmsNoticeList = cmsNoticeServiceImpl.export(cmsNotice);
-        CyEpExcelUtil.exportExcel(cmsNoticeList, "公告信息", "公告信息", CmsNotice.class, excelName, response);
-    }
 }