From 73654589711fde0ee73956939c6cb8f81ab6b704 Mon Sep 17 00:00:00 2001 From: gxwebsoft Date: Wed, 1 May 2024 16:48:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=A2=9E=E5=8A=A0=E5=88=A0=E6=94=B9?= =?UTF-8?q?=E5=8A=A0=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cms/controller/AdRecordController.java | 7 ++++ .../controller/ArticleCategoryController.java | 8 +++++ .../controller/ArticleCommentController.java | 9 +++++ .../controller/ArticleContentController.java | 2 ++ .../cms/controller/ArticleController.java | 7 ++++ .../cms/controller/ArticleLikeController.java | 6 ++++ .../cms/controller/DesignController.java | 7 ++++ .../controller/DesignRecordController.java | 7 ++++ .../cms/controller/DocsBookController.java | 10 ++++++ .../cms/controller/DocsContentController.java | 7 ++++ .../cms/controller/DocsController.java | 7 ++++ .../cms/controller/DomainController.java | 7 ++++ .../cms/controller/FormController.java | 7 ++++ .../cms/controller/FormRecordController.java | 7 ++++ .../cms/controller/NavigationController.java | 7 ++++ .../cms/controller/WebsiteController.java | 10 ++++++ .../controller/WebsiteFieldController.java | 34 +++++++++++++------ .../gxwebsoft/cms/entity/WebsiteField.java | 9 +++-- .../cms/mapper/WebsiteFieldMapper.java | 1 + .../cms/mapper/xml/WebsiteFieldMapper.xml | 15 ++++++-- .../cms/param/WebsiteFieldParam.java | 8 +++-- .../service/impl/WebsiteFieldServiceImpl.java | 2 +- .../oa/controller/LinkController.java | 8 +++++ .../com/gxwebsoft/generator/CmsGenerator.java | 2 +- 24 files changed, 175 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/gxwebsoft/cms/controller/AdRecordController.java b/src/main/java/com/gxwebsoft/cms/controller/AdRecordController.java index b12adf0..e04e37c 100644 --- a/src/main/java/com/gxwebsoft/cms/controller/AdRecordController.java +++ b/src/main/java/com/gxwebsoft/cms/controller/AdRecordController.java @@ -6,6 +6,7 @@ import com.gxwebsoft.cms.service.AdRecordService; import com.gxwebsoft.common.core.web.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -49,6 +50,7 @@ public class AdRecordController extends BaseController { //return success(adRecordService.getByIdRel(id)); } + @PreAuthorize("hasAuthority('cms:adRecord:list')") @ApiOperation("添加广告图片记录表") @PostMapping() public ApiResult save(@RequestBody AdRecord adRecord) { @@ -58,6 +60,7 @@ public class AdRecordController extends BaseController { return fail("添加失败"); } + @PreAuthorize("hasAuthority('cms:adRecord:update')") @ApiOperation("修改广告图片记录表") @PutMapping() public ApiResult update(@RequestBody AdRecord adRecord) { @@ -67,6 +70,7 @@ public class AdRecordController extends BaseController { return fail("修改失败"); } + @PreAuthorize("hasAuthority('cms:adRecord:remove')") @ApiOperation("删除广告图片记录表") @DeleteMapping("/{id}") public ApiResult remove(@PathVariable("id") Integer id) { @@ -76,6 +80,7 @@ public class AdRecordController extends BaseController { return fail("删除失败"); } + @PreAuthorize("hasAuthority('cms:adRecord:save')") @ApiOperation("批量添加广告图片记录表") @PostMapping("/batch") public ApiResult saveBatch(@RequestBody List list) { @@ -85,6 +90,7 @@ public class AdRecordController extends BaseController { return fail("添加失败"); } + @PreAuthorize("hasAuthority('cms:adRecord:update')") @ApiOperation("批量修改广告图片记录表") @PutMapping("/batch") public ApiResult removeBatch(@RequestBody BatchParam batchParam) { @@ -94,6 +100,7 @@ public class AdRecordController extends BaseController { return fail("修改失败"); } + @PreAuthorize("hasAuthority('cms:adRecord:remove')") @ApiOperation("批量删除广告图片记录表") @DeleteMapping("/batch") public ApiResult removeBatch(@RequestBody List ids) { diff --git a/src/main/java/com/gxwebsoft/cms/controller/ArticleCategoryController.java b/src/main/java/com/gxwebsoft/cms/controller/ArticleCategoryController.java index ab93abd..b3cead8 100644 --- a/src/main/java/com/gxwebsoft/cms/controller/ArticleCategoryController.java +++ b/src/main/java/com/gxwebsoft/cms/controller/ArticleCategoryController.java @@ -12,6 +12,7 @@ import com.gxwebsoft.common.core.web.*; import com.gxwebsoft.common.system.entity.User; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -77,6 +78,7 @@ public class ArticleCategoryController extends BaseController { return success(category); } + @PreAuthorize("hasAuthority('cms:articleCategory:save')") @ApiOperation("添加文章分类表") @PostMapping() public ApiResult save(@RequestBody ArticleCategory articleCategory) { @@ -91,6 +93,7 @@ public class ArticleCategoryController extends BaseController { return fail("添加失败"); } + @PreAuthorize("hasAuthority('cms:articleCategory:update')") @ApiOperation("修改文章分类表") @PutMapping() public ApiResult update(@RequestBody ArticleCategory articleCategory) { @@ -106,6 +109,7 @@ public class ArticleCategoryController extends BaseController { return fail("修改失败"); } + @PreAuthorize("hasAuthority('cms:articleCategory:remove')") @ApiOperation("删除文章分类表") @DeleteMapping("/{id}") public ApiResult remove(@PathVariable("id") Integer id) { @@ -118,6 +122,7 @@ public class ArticleCategoryController extends BaseController { return fail("删除失败"); } + @PreAuthorize("hasAuthority('cms:articleCategory:save')") @ApiOperation("批量添加文章分类表") @PostMapping("/batch") public ApiResult saveBatch(@RequestBody List list) { @@ -127,6 +132,7 @@ public class ArticleCategoryController extends BaseController { return fail("添加失败"); } + @PreAuthorize("hasAuthority('cms:articleCategory:update')") @ApiOperation("批量修改文章分类表") @PutMapping("/batch") public ApiResult removeBatch(@RequestBody BatchParam batchParam) { @@ -136,6 +142,7 @@ public class ArticleCategoryController extends BaseController { return fail("修改失败"); } + @PreAuthorize("hasAuthority('cms:articleCategory:remove')") @ApiOperation("批量删除文章分类表") @DeleteMapping("/batch") public ApiResult removeBatch(@RequestBody List ids) { @@ -149,6 +156,7 @@ public class ArticleCategoryController extends BaseController { } return fail("删除失败"); } + @ApiOperation("检查分类是否存在") @GetMapping("/existence") public ApiResult existence(ExistenceParam param) { diff --git a/src/main/java/com/gxwebsoft/cms/controller/ArticleCommentController.java b/src/main/java/com/gxwebsoft/cms/controller/ArticleCommentController.java index 6aafdad..4eb0873 100644 --- a/src/main/java/com/gxwebsoft/cms/controller/ArticleCommentController.java +++ b/src/main/java/com/gxwebsoft/cms/controller/ArticleCommentController.java @@ -31,6 +31,7 @@ public class ArticleCommentController extends BaseController { @Resource private ArticleCommentService articleCommentService; + @PreAuthorize("hasAuthority('cms:articleComment:list')") @ApiOperation("分页查询文章评论表") @GetMapping("/page") public ApiResult> page(ArticleCommentParam param) { @@ -41,6 +42,7 @@ public class ArticleCommentController extends BaseController { //return success(articleCommentService.pageRel(param)); } + @PreAuthorize("hasAuthority('cms:articleComment:list')") @ApiOperation("查询全部文章评论表") @GetMapping() public ApiResult> list(ArticleCommentParam param) { @@ -51,6 +53,7 @@ public class ArticleCommentController extends BaseController { //return success(articleCommentService.listRel(param)); } + @PreAuthorize("hasAuthority('cms:articleComment:list')") @ApiOperation("根据id查询文章评论表") @GetMapping("/{id}") public ApiResult get(@PathVariable("id") Integer id) { @@ -59,6 +62,7 @@ public class ArticleCommentController extends BaseController { //return success(articleCommentService.getByIdRel(id)); } + @PreAuthorize("hasAuthority('cms:articleComment:save')") @ApiOperation("添加文章评论表") @PostMapping() public ApiResult save(@RequestBody ArticleComment articleComment) { @@ -73,6 +77,7 @@ public class ArticleCommentController extends BaseController { return fail("添加失败"); } + @PreAuthorize("hasAuthority('cms:articleComment:update')") @ApiOperation("修改文章评论表") @PutMapping() public ApiResult update(@RequestBody ArticleComment articleComment) { @@ -82,6 +87,7 @@ public class ArticleCommentController extends BaseController { return fail("修改失败"); } + @PreAuthorize("hasAuthority('cms:articleComment:remove')") @ApiOperation("删除文章评论表") @DeleteMapping("/{id}") public ApiResult remove(@PathVariable("id") Integer id) { @@ -91,6 +97,7 @@ public class ArticleCommentController extends BaseController { return fail("删除失败"); } + @PreAuthorize("hasAuthority('cms:articleComment:save')") @ApiOperation("批量添加文章评论表") @PostMapping("/batch") public ApiResult saveBatch(@RequestBody List list) { @@ -100,6 +107,7 @@ public class ArticleCommentController extends BaseController { return fail("添加失败"); } + @PreAuthorize("hasAuthority('cms:articleComment:update')") @ApiOperation("批量修改文章评论表") @PutMapping("/batch") public ApiResult removeBatch(@RequestBody BatchParam batchParam) { @@ -109,6 +117,7 @@ public class ArticleCommentController extends BaseController { return fail("修改失败"); } + @PreAuthorize("hasAuthority('cms:articleComment:remove')") @ApiOperation("批量删除文章评论表") @DeleteMapping("/batch") public ApiResult removeBatch(@RequestBody List ids) { diff --git a/src/main/java/com/gxwebsoft/cms/controller/ArticleContentController.java b/src/main/java/com/gxwebsoft/cms/controller/ArticleContentController.java index b935dc6..f74c5c6 100644 --- a/src/main/java/com/gxwebsoft/cms/controller/ArticleContentController.java +++ b/src/main/java/com/gxwebsoft/cms/controller/ArticleContentController.java @@ -6,6 +6,7 @@ import com.gxwebsoft.cms.service.ArticleContentService; import com.gxwebsoft.common.core.web.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -52,6 +53,7 @@ public class ArticleContentController extends BaseController { //return success(articleContentService.getByIdRel(id)); } + @PreAuthorize("hasAuthority('cms:article:save')") @ApiOperation("添加文章记录表") @PostMapping() public ApiResult save(@RequestBody ArticleContent articleContent) { diff --git a/src/main/java/com/gxwebsoft/cms/controller/ArticleController.java b/src/main/java/com/gxwebsoft/cms/controller/ArticleController.java index 8fdcad0..c45abb6 100644 --- a/src/main/java/com/gxwebsoft/cms/controller/ArticleController.java +++ b/src/main/java/com/gxwebsoft/cms/controller/ArticleController.java @@ -15,6 +15,7 @@ import com.gxwebsoft.common.core.web.PageResult; import com.gxwebsoft.common.system.entity.User; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; @@ -95,6 +96,7 @@ public class ArticleController extends BaseController { return success(article); } + @PreAuthorize("hasAuthority('cms:article:save')") @ApiOperation("添加文章记录表") @Transactional(rollbackFor = {Exception.class}) @PostMapping() @@ -118,6 +120,7 @@ public class ArticleController extends BaseController { return fail("添加失败"); } + @PreAuthorize("hasAuthority('cms:article:update')") @ApiOperation("修改文章记录表") @Transactional(rollbackFor = {Exception.class}) @PutMapping() @@ -142,6 +145,7 @@ public class ArticleController extends BaseController { return fail("修改失败"); } + @PreAuthorize("hasAuthority('cms:article:remove')") @ApiOperation("删除文章记录表") @DeleteMapping("/{id}") public ApiResult remove(@PathVariable("id") Integer id) { @@ -151,6 +155,7 @@ public class ArticleController extends BaseController { return fail("删除失败"); } + @PreAuthorize("hasAuthority('cms:article:save')") @ApiOperation("批量添加文章记录表") @PostMapping("/batch") public ApiResult saveBatch(@RequestBody List
list) { @@ -160,6 +165,7 @@ public class ArticleController extends BaseController { return fail("添加失败"); } + @PreAuthorize("hasAuthority('cms:article:update')") @ApiOperation("批量修改文章记录表") @PutMapping("/batch") public ApiResult removeBatch(@RequestBody BatchParam
batchParam) { @@ -169,6 +175,7 @@ public class ArticleController extends BaseController { return fail("修改失败"); } + @PreAuthorize("hasAuthority('cms:article:remove')") @ApiOperation("批量删除文章记录表") @DeleteMapping("/batch") public ApiResult removeBatch(@RequestBody List ids) { diff --git a/src/main/java/com/gxwebsoft/cms/controller/ArticleLikeController.java b/src/main/java/com/gxwebsoft/cms/controller/ArticleLikeController.java index 970f79b..788e5c5 100644 --- a/src/main/java/com/gxwebsoft/cms/controller/ArticleLikeController.java +++ b/src/main/java/com/gxwebsoft/cms/controller/ArticleLikeController.java @@ -59,6 +59,7 @@ public class ArticleLikeController extends BaseController { //return success(articleLikeService.getByIdRel(id)); } + @PreAuthorize("hasAuthority('cms:articleLike:save')") @ApiOperation("添加点赞文章") @PostMapping() public ApiResult save(@RequestBody ArticleLike articleLike) { @@ -73,6 +74,7 @@ public class ArticleLikeController extends BaseController { return fail("添加失败"); } + @PreAuthorize("hasAuthority('cms:articleLike:update')") @ApiOperation("修改点赞文章") @PutMapping() public ApiResult update(@RequestBody ArticleLike articleLike) { @@ -82,6 +84,7 @@ public class ArticleLikeController extends BaseController { return fail("修改失败"); } + @PreAuthorize("hasAuthority('cms:articleLike:remove')") @ApiOperation("删除点赞文章") @DeleteMapping("/{id}") public ApiResult remove(@PathVariable("id") Integer id) { @@ -91,6 +94,7 @@ public class ArticleLikeController extends BaseController { return fail("删除失败"); } + @PreAuthorize("hasAuthority('cms:articleLike:save')") @ApiOperation("批量添加点赞文章") @PostMapping("/batch") public ApiResult saveBatch(@RequestBody List list) { @@ -100,6 +104,7 @@ public class ArticleLikeController extends BaseController { return fail("添加失败"); } + @PreAuthorize("hasAuthority('cms:articleLike:update')") @ApiOperation("批量修改点赞文章") @PutMapping("/batch") public ApiResult removeBatch(@RequestBody BatchParam batchParam) { @@ -109,6 +114,7 @@ public class ArticleLikeController extends BaseController { return fail("修改失败"); } + @PreAuthorize("hasAuthority('cms:articleLike:remove')") @ApiOperation("批量删除点赞文章") @DeleteMapping("/batch") public ApiResult removeBatch(@RequestBody List ids) { diff --git a/src/main/java/com/gxwebsoft/cms/controller/DesignController.java b/src/main/java/com/gxwebsoft/cms/controller/DesignController.java index d1f30b4..ab55597 100644 --- a/src/main/java/com/gxwebsoft/cms/controller/DesignController.java +++ b/src/main/java/com/gxwebsoft/cms/controller/DesignController.java @@ -8,6 +8,7 @@ import com.gxwebsoft.common.core.web.*; import com.gxwebsoft.common.system.entity.User; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -47,6 +48,7 @@ public class DesignController extends BaseController { return success(designService.getByIdRel(id)); } + @PreAuthorize("hasAuthority('cms:design:save')") @ApiOperation("添加页面管理记录表") @PostMapping() public ApiResult save(@RequestBody Design design) { @@ -64,6 +66,7 @@ public class DesignController extends BaseController { return fail("添加失败"); } + @PreAuthorize("hasAuthority('cms:design:update')") @ApiOperation("修改页面管理记录表") @PutMapping() public ApiResult update(@RequestBody Design design) { @@ -73,6 +76,7 @@ public class DesignController extends BaseController { return fail("修改失败"); } + @PreAuthorize("hasAuthority('cms:design:remove')") @ApiOperation("删除页面管理记录表") @DeleteMapping("/{id}") public ApiResult remove(@PathVariable("id") Integer id) { @@ -82,6 +86,7 @@ public class DesignController extends BaseController { return fail("删除失败"); } + @PreAuthorize("hasAuthority('cms:design:save')") @ApiOperation("批量添加页面管理记录表") @PostMapping("/batch") public ApiResult saveBatch(@RequestBody List list) { @@ -91,6 +96,7 @@ public class DesignController extends BaseController { return fail("添加失败"); } + @PreAuthorize("hasAuthority('cms:design:update')") @ApiOperation("批量修改页面管理记录表") @PutMapping("/batch") public ApiResult removeBatch(@RequestBody BatchParam batchParam) { @@ -100,6 +106,7 @@ public class DesignController extends BaseController { return fail("修改失败"); } + @PreAuthorize("hasAuthority('cms:design:remove')") @ApiOperation("批量删除页面管理记录表") @DeleteMapping("/batch") public ApiResult removeBatch(@RequestBody List ids) { diff --git a/src/main/java/com/gxwebsoft/cms/controller/DesignRecordController.java b/src/main/java/com/gxwebsoft/cms/controller/DesignRecordController.java index 94b88b2..89a5579 100644 --- a/src/main/java/com/gxwebsoft/cms/controller/DesignRecordController.java +++ b/src/main/java/com/gxwebsoft/cms/controller/DesignRecordController.java @@ -7,6 +7,7 @@ import com.gxwebsoft.common.core.web.*; import com.gxwebsoft.common.system.entity.User; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -50,6 +51,7 @@ public class DesignRecordController extends BaseController { //return success(designRecordService.getByIdRel(id)); } + @PreAuthorize("hasAuthority('cms:design:update')") @ApiOperation("添加页面组件表") @PostMapping() public ApiResult save(@RequestBody DesignRecord designRecord) { @@ -64,6 +66,7 @@ public class DesignRecordController extends BaseController { return fail("添加失败"); } + @PreAuthorize("hasAuthority('cms:design:update')") @ApiOperation("修改页面组件表") @PutMapping() public ApiResult update(@RequestBody DesignRecord designRecord) { @@ -73,6 +76,7 @@ public class DesignRecordController extends BaseController { return fail("修改失败"); } + @PreAuthorize("hasAuthority('cms:design:update')") @ApiOperation("删除页面组件表") @DeleteMapping("/{id}") public ApiResult remove(@PathVariable("id") Integer id) { @@ -82,6 +86,7 @@ public class DesignRecordController extends BaseController { return fail("删除失败"); } + @PreAuthorize("hasAuthority('cms:design:update')") @ApiOperation("批量添加页面组件表") @PostMapping("/batch") public ApiResult saveBatch(@RequestBody List list) { @@ -91,6 +96,7 @@ public class DesignRecordController extends BaseController { return fail("添加失败"); } + @PreAuthorize("hasAuthority('cms:design:update')") @ApiOperation("批量修改页面组件表") @PutMapping("/batch") public ApiResult removeBatch(@RequestBody BatchParam batchParam) { @@ -100,6 +106,7 @@ public class DesignRecordController extends BaseController { return fail("修改失败"); } + @PreAuthorize("hasAuthority('cms:design:update')") @ApiOperation("批量删除页面组件表") @DeleteMapping("/batch") public ApiResult removeBatch(@RequestBody List ids) { diff --git a/src/main/java/com/gxwebsoft/cms/controller/DocsBookController.java b/src/main/java/com/gxwebsoft/cms/controller/DocsBookController.java index bd3328a..800a0cc 100644 --- a/src/main/java/com/gxwebsoft/cms/controller/DocsBookController.java +++ b/src/main/java/com/gxwebsoft/cms/controller/DocsBookController.java @@ -14,6 +14,7 @@ import com.gxwebsoft.common.core.web.BatchParam; import com.gxwebsoft.common.core.web.PageResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -36,6 +37,7 @@ public class DocsBookController extends BaseController { @Resource private DocsContentService contentService; + @PreAuthorize("hasAuthority('cms:docsBook:list')") @ApiOperation("分页查询书籍记录表") @GetMapping("/page") public ApiResult> page(DocsBookParam param) { @@ -43,6 +45,7 @@ public class DocsBookController extends BaseController { return success(docsBookService.pageRel(param)); } + @PreAuthorize("hasAuthority('cms:docsBook:list')") @ApiOperation("查询全部书籍记录表") @GetMapping() public ApiResult> list(DocsBookParam param) { @@ -50,6 +53,7 @@ public class DocsBookController extends BaseController { return success(docsBookService.listRel(param)); } + @PreAuthorize("hasAuthority('cms:docsBook:list')") @ApiOperation("根据id查询书籍记录表") @GetMapping("/{id}") public ApiResult get(@PathVariable("id") Integer id) { @@ -57,6 +61,7 @@ public class DocsBookController extends BaseController { return success(docsBookService.getByIdRel(id)); } + @PreAuthorize("hasAuthority('cms:docsBook:save')") @ApiOperation("添加书籍记录表") @PostMapping() public ApiResult save(@RequestBody DocsBook docsBook) { @@ -84,6 +89,7 @@ public class DocsBookController extends BaseController { return fail("添加失败"); } + @PreAuthorize("hasAuthority('cms:docsBook:update')") @ApiOperation("修改书籍记录表") @PutMapping() public ApiResult update(@RequestBody DocsBook docsBook) { @@ -93,6 +99,7 @@ public class DocsBookController extends BaseController { return fail("修改失败"); } + @PreAuthorize("hasAuthority('cms:docsBook:remove')") @ApiOperation("删除书籍记录表") @DeleteMapping("/{id}") public ApiResult remove(@PathVariable("id") Integer id) { @@ -102,6 +109,7 @@ public class DocsBookController extends BaseController { return fail("删除失败"); } + @PreAuthorize("hasAuthority('cms:docsBook:save')") @ApiOperation("批量添加书籍记录表") @PostMapping("/batch") public ApiResult saveBatch(@RequestBody List list) { @@ -111,6 +119,7 @@ public class DocsBookController extends BaseController { return fail("添加失败"); } + @PreAuthorize("hasAuthority('cms:docsBook:update')") @ApiOperation("批量修改书籍记录表") @PutMapping("/batch") public ApiResult removeBatch(@RequestBody BatchParam batchParam) { @@ -120,6 +129,7 @@ public class DocsBookController extends BaseController { return fail("修改失败"); } + @PreAuthorize("hasAuthority('cms:docsBook:remove')") @ApiOperation("批量删除书籍记录表") @DeleteMapping("/batch") public ApiResult removeBatch(@RequestBody List ids) { diff --git a/src/main/java/com/gxwebsoft/cms/controller/DocsContentController.java b/src/main/java/com/gxwebsoft/cms/controller/DocsContentController.java index ffea035..5b2187e 100644 --- a/src/main/java/com/gxwebsoft/cms/controller/DocsContentController.java +++ b/src/main/java/com/gxwebsoft/cms/controller/DocsContentController.java @@ -9,6 +9,7 @@ import com.gxwebsoft.common.core.web.BatchParam; import com.gxwebsoft.common.core.web.PageResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -48,6 +49,7 @@ public class DocsContentController extends BaseController { return success(docsContentService.getByIdRel(id)); } + @PreAuthorize("hasAuthority('cms:docs:save')") @ApiOperation("添加文档内容记录表") @PostMapping() public ApiResult save(@RequestBody DocsContent docsContent) { @@ -57,6 +59,7 @@ public class DocsContentController extends BaseController { return fail("添加失败"); } + @PreAuthorize("hasAuthority('cms:docs:update')") @ApiOperation("修改文档内容记录表") @PutMapping() public ApiResult update(@RequestBody DocsContent docsContent) { @@ -66,6 +69,7 @@ public class DocsContentController extends BaseController { return fail("保存失败"); } + @PreAuthorize("hasAuthority('cms:docs:remove')") @ApiOperation("删除文档内容记录表") @DeleteMapping("/{id}") public ApiResult remove(@PathVariable("id") Integer id) { @@ -75,6 +79,7 @@ public class DocsContentController extends BaseController { return fail("删除失败"); } + @PreAuthorize("hasAuthority('cms:docs:update')") @ApiOperation("批量添加文档内容记录表") @PostMapping("/batch") public ApiResult saveBatch(@RequestBody List list) { @@ -84,6 +89,7 @@ public class DocsContentController extends BaseController { return fail("添加失败"); } + @PreAuthorize("hasAuthority('cms:docs:update')") @ApiOperation("批量修改文档内容记录表") @PutMapping("/batch") public ApiResult removeBatch(@RequestBody BatchParam batchParam) { @@ -93,6 +99,7 @@ public class DocsContentController extends BaseController { return fail("修改失败"); } + @PreAuthorize("hasAuthority('cms:docs:remove')") @ApiOperation("批量删除文档内容记录表") @DeleteMapping("/batch") public ApiResult removeBatch(@RequestBody List ids) { diff --git a/src/main/java/com/gxwebsoft/cms/controller/DocsController.java b/src/main/java/com/gxwebsoft/cms/controller/DocsController.java index ed83085..cad4a23 100644 --- a/src/main/java/com/gxwebsoft/cms/controller/DocsController.java +++ b/src/main/java/com/gxwebsoft/cms/controller/DocsController.java @@ -18,6 +18,7 @@ import com.gxwebsoft.common.core.web.PageResult; import com.gxwebsoft.common.system.entity.User; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -102,6 +103,7 @@ public class DocsController extends BaseController { return success(article); } + @PreAuthorize("hasAuthority('cms:docs:save')") @ApiOperation("添加文档管理记录表") @PostMapping() public ApiResult save(@RequestBody Docs docs) { @@ -119,6 +121,7 @@ public class DocsController extends BaseController { return fail("添加失败"); } + @PreAuthorize("hasAuthority('cms:docs:update')") @ApiOperation("修改文档管理记录表") @PutMapping() public ApiResult update(@RequestBody Docs docs) { @@ -133,6 +136,7 @@ public class DocsController extends BaseController { return fail("保存失败"); } + @PreAuthorize("hasAuthority('cms:docs:remove')") @ApiOperation("删除文档管理记录表") @DeleteMapping("/{id}") public ApiResult remove(@PathVariable("id") Integer id) { @@ -142,6 +146,7 @@ public class DocsController extends BaseController { return fail("删除失败"); } + @PreAuthorize("hasAuthority('cms:docs:update')") @ApiOperation("批量添加文档管理记录表") @PostMapping("/batch") public ApiResult saveBatch(@RequestBody List list) { @@ -151,6 +156,7 @@ public class DocsController extends BaseController { return fail("添加失败"); } + @PreAuthorize("hasAuthority('cms:docs:update')") @ApiOperation("批量修改文档管理记录表") @PutMapping("/batch") public ApiResult removeBatch(@RequestBody BatchParam batchParam) { @@ -160,6 +166,7 @@ public class DocsController extends BaseController { return fail("修改失败"); } + @PreAuthorize("hasAuthority('cms:docs:remove')") @ApiOperation("批量删除文档管理记录表") @DeleteMapping("/batch") public ApiResult removeBatch(@RequestBody List ids) { diff --git a/src/main/java/com/gxwebsoft/cms/controller/DomainController.java b/src/main/java/com/gxwebsoft/cms/controller/DomainController.java index 8740cd8..d16dd50 100644 --- a/src/main/java/com/gxwebsoft/cms/controller/DomainController.java +++ b/src/main/java/com/gxwebsoft/cms/controller/DomainController.java @@ -12,6 +12,7 @@ import com.gxwebsoft.common.core.web.PageResult; import com.gxwebsoft.common.system.entity.User; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -56,6 +57,7 @@ public class DomainController extends BaseController { return success(domainService.getByIdRel(id)); } + @PreAuthorize("hasAuthority('cms:domain:save')") @ApiOperation("添加网站域名记录表") @PostMapping() public ApiResult save(@RequestBody Domain domain) { @@ -87,6 +89,7 @@ public class DomainController extends BaseController { return fail("添加失败"); } + @PreAuthorize("hasAuthority('cms:domain:update')") @ApiOperation("修改网站域名记录表") @PutMapping() public ApiResult update(@RequestBody Domain domain) { @@ -96,6 +99,7 @@ public class DomainController extends BaseController { return fail("修改失败"); } + @PreAuthorize("hasAuthority('cms:domain:remove')") @ApiOperation("删除网站域名记录表") @DeleteMapping("/{id}") public ApiResult remove(@PathVariable("id") Integer id) { @@ -109,6 +113,7 @@ public class DomainController extends BaseController { return fail("删除失败"); } + @PreAuthorize("hasAuthority('cms:domain:update')") @ApiOperation("批量添加网站域名记录表") @PostMapping("/batch") public ApiResult saveBatch(@RequestBody List list) { @@ -118,6 +123,7 @@ public class DomainController extends BaseController { return fail("添加失败"); } + @PreAuthorize("hasAuthority('cms:domain:update')") @ApiOperation("批量修改网站域名记录表") @PutMapping("/batch") public ApiResult removeBatch(@RequestBody BatchParam batchParam) { @@ -127,6 +133,7 @@ public class DomainController extends BaseController { return fail("修改失败"); } + @PreAuthorize("hasAuthority('cms:domain:remove')") @ApiOperation("批量删除网站域名记录表") @DeleteMapping("/batch") public ApiResult removeBatch(@RequestBody List ids) { diff --git a/src/main/java/com/gxwebsoft/cms/controller/FormController.java b/src/main/java/com/gxwebsoft/cms/controller/FormController.java index 4c50531..80ddbae 100644 --- a/src/main/java/com/gxwebsoft/cms/controller/FormController.java +++ b/src/main/java/com/gxwebsoft/cms/controller/FormController.java @@ -16,6 +16,7 @@ import com.gxwebsoft.common.system.entity.User; import com.gxwebsoft.shop.service.MerchantService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -69,6 +70,7 @@ public class FormController extends BaseController { return success(form); } + @PreAuthorize("hasAuthority('cms:form:save')") @ApiOperation("添加表单设计表") @PostMapping() public ApiResult save(@RequestBody Form form) { @@ -83,6 +85,7 @@ public class FormController extends BaseController { return fail("添加失败"); } + @PreAuthorize("hasAuthority('cms:form:update')") @ApiOperation("修改表单设计表") @PutMapping() public ApiResult update(@RequestBody Form form) { @@ -96,6 +99,7 @@ public class FormController extends BaseController { return fail("修改失败"); } + @PreAuthorize("hasAuthority('cms:form:remove')") @ApiOperation("删除表单设计表") @DeleteMapping("/{id}") public ApiResult remove(@PathVariable("id") Integer id) { @@ -105,6 +109,7 @@ public class FormController extends BaseController { return fail("删除失败"); } + @PreAuthorize("hasAuthority('cms:form:save')") @ApiOperation("批量添加表单设计表") @PostMapping("/batch") public ApiResult saveBatch(@RequestBody List
list) { @@ -114,6 +119,7 @@ public class FormController extends BaseController { return fail("添加失败"); } + @PreAuthorize("hasAuthority('cms:form:update')") @ApiOperation("批量修改表单设计表") @PutMapping("/batch") public ApiResult removeBatch(@RequestBody BatchParam batchParam) { @@ -123,6 +129,7 @@ public class FormController extends BaseController { return fail("修改失败"); } + @PreAuthorize("hasAuthority('cms:form:remove')") @ApiOperation("批量删除表单设计表") @DeleteMapping("/batch") public ApiResult removeBatch(@RequestBody List ids) { diff --git a/src/main/java/com/gxwebsoft/cms/controller/FormRecordController.java b/src/main/java/com/gxwebsoft/cms/controller/FormRecordController.java index 31f7f63..d49596b 100644 --- a/src/main/java/com/gxwebsoft/cms/controller/FormRecordController.java +++ b/src/main/java/com/gxwebsoft/cms/controller/FormRecordController.java @@ -12,6 +12,7 @@ import com.gxwebsoft.common.core.web.BatchParam; import com.gxwebsoft.common.core.web.PageResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -53,6 +54,7 @@ public class FormRecordController extends BaseController { return success(formRecordService.getByIdRel(id)); } + @PreAuthorize("hasAuthority('cms:form:save')") @ApiOperation("添加表单数据记录表") @PostMapping() public ApiResult save(@RequestBody FormRecord formRecord) { @@ -68,6 +70,7 @@ public class FormRecordController extends BaseController { return fail("提交失败"); } + @PreAuthorize("hasAuthority('cms:form:update')") @ApiOperation("修改表单数据记录表") @PutMapping() public ApiResult update(@RequestBody FormRecord formRecord) { @@ -77,6 +80,7 @@ public class FormRecordController extends BaseController { return fail("修改失败"); } + @PreAuthorize("hasAuthority('cms:form:remove')") @ApiOperation("删除表单数据记录表") @DeleteMapping("/{id}") public ApiResult remove(@PathVariable("id") Integer id) { @@ -86,6 +90,7 @@ public class FormRecordController extends BaseController { return fail("删除失败"); } + @PreAuthorize("hasAuthority('cms:form:save')") @ApiOperation("批量添加表单数据记录表") @PostMapping("/batch") public ApiResult saveBatch(@RequestBody List list) { @@ -95,6 +100,7 @@ public class FormRecordController extends BaseController { return fail("添加失败"); } + @PreAuthorize("hasAuthority('cms:form:update')") @ApiOperation("批量修改表单数据记录表") @PutMapping("/batch") public ApiResult removeBatch(@RequestBody BatchParam batchParam) { @@ -104,6 +110,7 @@ public class FormRecordController extends BaseController { return fail("修改失败"); } + @PreAuthorize("hasAuthority('cms:form:remove')") @ApiOperation("批量删除表单数据记录表") @DeleteMapping("/batch") public ApiResult removeBatch(@RequestBody List ids) { diff --git a/src/main/java/com/gxwebsoft/cms/controller/NavigationController.java b/src/main/java/com/gxwebsoft/cms/controller/NavigationController.java index 126ef77..b8c4d53 100644 --- a/src/main/java/com/gxwebsoft/cms/controller/NavigationController.java +++ b/src/main/java/com/gxwebsoft/cms/controller/NavigationController.java @@ -8,6 +8,7 @@ import com.gxwebsoft.common.core.web.*; import com.gxwebsoft.common.system.entity.User; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -48,6 +49,7 @@ public class NavigationController extends BaseController { //return success(navigationService.getByIdRel(id)); } + @PreAuthorize("hasAuthority('cms:navigation:save')") @ApiOperation("添加网站导航记录表") @PostMapping() public ApiResult save(@RequestBody Navigation navigation) { @@ -65,6 +67,7 @@ public class NavigationController extends BaseController { return fail("添加失败"); } + @PreAuthorize("hasAuthority('cms:navigation:update')") @ApiOperation("修改网站导航记录表") @PutMapping() public ApiResult update(@RequestBody Navigation navigation) { @@ -89,6 +92,7 @@ public class NavigationController extends BaseController { return fail("修改失败"); } + @PreAuthorize("hasAuthority('cms:navigation:remove')") @ApiOperation("删除网站导航记录表") @DeleteMapping("/{id}") public ApiResult remove(@PathVariable("id") Integer id) { @@ -98,6 +102,7 @@ public class NavigationController extends BaseController { return fail("删除失败"); } + @PreAuthorize("hasAuthority('cms:navigation:save')") @ApiOperation("批量添加网站导航记录表") @PostMapping("/batch") public ApiResult saveBatch(@RequestBody List list) { @@ -107,6 +112,7 @@ public class NavigationController extends BaseController { return fail("添加失败"); } + @PreAuthorize("hasAuthority('cms:navigation:update')") @ApiOperation("批量修改网站导航记录表") @PutMapping("/batch") public ApiResult removeBatch(@RequestBody BatchParam batchParam) { @@ -116,6 +122,7 @@ public class NavigationController extends BaseController { return fail("修改失败"); } + @PreAuthorize("hasAuthority('cms:navigation:remove')") @ApiOperation("批量删除网站导航记录表") @DeleteMapping("/batch") public ApiResult removeBatch(@RequestBody List ids) { diff --git a/src/main/java/com/gxwebsoft/cms/controller/WebsiteController.java b/src/main/java/com/gxwebsoft/cms/controller/WebsiteController.java index 606db45..fb18984 100644 --- a/src/main/java/com/gxwebsoft/cms/controller/WebsiteController.java +++ b/src/main/java/com/gxwebsoft/cms/controller/WebsiteController.java @@ -26,6 +26,7 @@ import com.gxwebsoft.shop.service.MerchantAccountService; import com.gxwebsoft.shop.service.MerchantService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -286,6 +287,7 @@ public class WebsiteController extends BaseController { return success(website); } + @PreAuthorize("hasAuthority('cms:website:remove')") @ApiOperation("清除缓存") @DeleteMapping("/clearSiteInfo/{key}") public ApiResult clearSiteInfo(@PathVariable("key") String key) { @@ -297,6 +299,7 @@ public class WebsiteController extends BaseController { return success("清除失败"); } + @PreAuthorize("hasAuthority('cms:website:list')") @ApiOperation("分页查询网站信息记录表") @GetMapping("/page") public ApiResult> page(WebsiteParam param) { @@ -304,6 +307,7 @@ public class WebsiteController extends BaseController { return success(websiteService.pageRel(param)); } + @PreAuthorize("hasAuthority('cms:website:list')") @ApiOperation("查询全部网站信息记录表") @GetMapping() public ApiResult> list(WebsiteParam param) { @@ -322,6 +326,7 @@ public class WebsiteController extends BaseController { //return success(websiteService.getByIdRel(id)); } + @PreAuthorize("hasAuthority('cms:website:save')") @ApiOperation("添加网站信息记录表") @PostMapping() public ApiResult save(@RequestBody Website website) { @@ -336,6 +341,7 @@ public class WebsiteController extends BaseController { return fail("添加失败"); } + @PreAuthorize("hasAuthority('cms:website:update')") @ApiOperation("修改网站信息记录表") @PutMapping() public ApiResult update(@RequestBody Website website) { @@ -345,6 +351,7 @@ public class WebsiteController extends BaseController { return fail("修改失败"); } + @PreAuthorize("hasAuthority('cms:website:remove')") @ApiOperation("删除网站信息记录表") @DeleteMapping("/{id}") public ApiResult remove(@PathVariable("id") Integer id) { @@ -354,6 +361,7 @@ public class WebsiteController extends BaseController { return fail("删除失败"); } + @PreAuthorize("hasAuthority('cms:website:save')") @ApiOperation("批量添加网站信息记录表") @PostMapping("/batch") public ApiResult saveBatch(@RequestBody List list) { @@ -363,6 +371,7 @@ public class WebsiteController extends BaseController { return fail("添加失败"); } + @PreAuthorize("hasAuthority('cms:website:update')") @ApiOperation("批量修改网站信息记录表") @PutMapping("/batch") public ApiResult removeBatch(@RequestBody BatchParam batchParam) { @@ -372,6 +381,7 @@ public class WebsiteController extends BaseController { return fail("修改失败"); } + @PreAuthorize("hasAuthority('cms:website:remove')") @ApiOperation("批量删除网站信息记录表") @DeleteMapping("/batch") public ApiResult removeBatch(@RequestBody List ids) { diff --git a/src/main/java/com/gxwebsoft/cms/controller/WebsiteFieldController.java b/src/main/java/com/gxwebsoft/cms/controller/WebsiteFieldController.java index ad95579..c30941c 100644 --- a/src/main/java/com/gxwebsoft/cms/controller/WebsiteFieldController.java +++ b/src/main/java/com/gxwebsoft/cms/controller/WebsiteFieldController.java @@ -1,12 +1,15 @@ package com.gxwebsoft.cms.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.gxwebsoft.cms.entity.WebsiteField; +import com.gxwebsoft.cms.mapper.WebsiteFieldMapper; import com.gxwebsoft.cms.param.WebsiteFieldParam; import com.gxwebsoft.cms.service.WebsiteFieldService; import com.gxwebsoft.common.core.web.*; import com.gxwebsoft.common.system.entity.User; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -24,36 +27,31 @@ import java.util.List; public class WebsiteFieldController extends BaseController { @Resource private WebsiteFieldService websiteFieldService; + @Resource + private WebsiteFieldMapper websiteFieldMapper; @ApiOperation("分页查询应用参数") @GetMapping("/page") public ApiResult> page(WebsiteFieldParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number desc"); - page.setDefaultOrder("create_time desc"); - return success(websiteFieldService.page(page, page.getWrapper())); // 使用关联查询 - //return success(websiteFieldService.pageRel(param)); + return success(websiteFieldService.pageRel(param)); } @ApiOperation("查询全部应用参数") @GetMapping() public ApiResult> list(WebsiteFieldParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return success(websiteFieldService.list(page.getOrderWrapper())); // 使用关联查询 - //return success(websiteFieldService.listRel(param)); + return success(websiteFieldService.listRel(param)); } @ApiOperation("根据id查询应用参数") @GetMapping("/{id}") public ApiResult get(@PathVariable("id") Integer id) { - return success(websiteFieldService.getById(id)); // 使用关联查询 - //return success(websiteFieldService.getByIdRel(id)); + return success(websiteFieldService.getByIdRel(id)); } + @PreAuthorize("hasAuthority('cms:websiteField:save')") @ApiOperation("添加应用参数") @PostMapping() public ApiResult save(@RequestBody WebsiteField websiteField) { @@ -63,6 +61,7 @@ public class WebsiteFieldController extends BaseController { return fail("添加失败"); } + @PreAuthorize("hasAuthority('cms:websiteField:update')") @ApiOperation("修改应用参数") @PutMapping() public ApiResult update(@RequestBody WebsiteField websiteField) { @@ -72,6 +71,7 @@ public class WebsiteFieldController extends BaseController { return fail("修改失败"); } + @PreAuthorize("hasAuthority('cms:websiteField:remvoe')") @ApiOperation("删除应用参数") @DeleteMapping("/{id}") public ApiResult remove(@PathVariable("id") Integer id) { @@ -81,6 +81,7 @@ public class WebsiteFieldController extends BaseController { return fail("删除失败"); } + @PreAuthorize("hasAuthority('cms:websiteField:save')") @ApiOperation("批量添加应用参数") @PostMapping("/batch") public ApiResult saveBatch(@RequestBody List list) { @@ -90,6 +91,7 @@ public class WebsiteFieldController extends BaseController { return fail("添加失败"); } + @PreAuthorize("hasAuthority('cms:websiteField:update')") @ApiOperation("批量修改应用参数") @PutMapping("/batch") public ApiResult removeBatch(@RequestBody BatchParam batchParam) { @@ -99,6 +101,7 @@ public class WebsiteFieldController extends BaseController { return fail("修改失败"); } + @PreAuthorize("hasAuthority('cms:websiteField:remvoe')") @ApiOperation("批量删除应用参数") @DeleteMapping("/batch") public ApiResult removeBatch(@RequestBody List ids) { @@ -108,4 +111,13 @@ public class WebsiteFieldController extends BaseController { return fail("删除失败"); } + @PreAuthorize("hasAuthority('cms:websiteField:update')") + @ApiOperation("从回收站放回原处") + @DeleteMapping("/undelete/{id}") + public ApiResult undelete(@PathVariable("id") Integer id) { + if (websiteFieldMapper.undelete(id) > 0) { + return success("恢复成功"); + } + return fail("恢复失败"); + } } diff --git a/src/main/java/com/gxwebsoft/cms/entity/WebsiteField.java b/src/main/java/com/gxwebsoft/cms/entity/WebsiteField.java index 9485d11..81f5d4b 100644 --- a/src/main/java/com/gxwebsoft/cms/entity/WebsiteField.java +++ b/src/main/java/com/gxwebsoft/cms/entity/WebsiteField.java @@ -2,6 +2,7 @@ package com.gxwebsoft.cms.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -28,8 +29,8 @@ public class WebsiteField implements Serializable { @TableId(value = "id", type = IdType.AUTO) private Integer id; - @ApiModelProperty(value = "网站ID") - private Integer websiteId; + @ApiModelProperty(value = "类型，0文本 1图片 2其他") + private Integer type; @ApiModelProperty(value = "参数名称") private String name; @@ -43,6 +44,10 @@ public class WebsiteField implements Serializable { @ApiModelProperty(value = "排序(数字越小越靠前)") private Integer sortNumber; + @ApiModelProperty(value = "是否删除, 0否, 1是") + @TableLogic + private Integer deleted; + @ApiModelProperty(value = "租户id") private Integer tenantId; diff --git a/src/main/java/com/gxwebsoft/cms/mapper/WebsiteFieldMapper.java b/src/main/java/com/gxwebsoft/cms/mapper/WebsiteFieldMapper.java index 677391b..06c27a6 100644 --- a/src/main/java/com/gxwebsoft/cms/mapper/WebsiteFieldMapper.java +++ b/src/main/java/com/gxwebsoft/cms/mapper/WebsiteFieldMapper.java @@ -34,4 +34,5 @@ public interface WebsiteFieldMapper extends BaseMapper { */ List selectListRel(@Param("param") WebsiteFieldParam param); + int undelete(Integer id); } diff --git a/src/main/java/com/gxwebsoft/cms/mapper/xml/WebsiteFieldMapper.xml b/src/main/java/com/gxwebsoft/cms/mapper/xml/WebsiteFieldMapper.xml index 3525260..6fd0db6 100644 --- a/src/main/java/com/gxwebsoft/cms/mapper/xml/WebsiteFieldMapper.xml +++ b/src/main/java/com/gxwebsoft/cms/mapper/xml/WebsiteFieldMapper.xml @@ -10,8 +10,8 @@ AND a.id = #{param.id} - - AND a.website_id = #{param.websiteId} + + AND a.type = #{param.type} AND a.name LIKE CONCAT('%', #{param.name}, '%') @@ -28,6 +28,12 @@ AND a.create_time <= #{param.createTimeEnd} + + AND a.deleted = #{param.deleted} + + + AND a.deleted = 0 + @@ -41,4 +47,9 @@ + + + UPDATE cms_website_field SET deleted = 0 WHERE id = #{param.id} + + diff --git a/src/main/java/com/gxwebsoft/cms/param/WebsiteFieldParam.java b/src/main/java/com/gxwebsoft/cms/param/WebsiteFieldParam.java index 48c8147..5b0ca4d 100644 --- a/src/main/java/com/gxwebsoft/cms/param/WebsiteFieldParam.java +++ b/src/main/java/com/gxwebsoft/cms/param/WebsiteFieldParam.java @@ -26,9 +26,9 @@ public class WebsiteFieldParam extends BaseParam { @QueryField(type = QueryType.EQ) private Integer id; - @ApiModelProperty(value = "网站ID") + @ApiModelProperty(value = "类型，0文本 1图片 2其他") @QueryField(type = QueryType.EQ) - private Integer websiteId; + private Integer type; @ApiModelProperty(value = "名称") private String name; @@ -44,4 +44,8 @@ public class WebsiteFieldParam extends BaseParam { @QueryField(type = QueryType.EQ) private Integer sortNumber; + @ApiModelProperty(value = "是否删除, 0否, 1是") + @QueryField(type = QueryType.EQ) + private Integer deleted; + } diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/WebsiteFieldServiceImpl.java b/src/main/java/com/gxwebsoft/cms/service/impl/WebsiteFieldServiceImpl.java index 8af79fc..0843fc1 100644 --- a/src/main/java/com/gxwebsoft/cms/service/impl/WebsiteFieldServiceImpl.java +++ b/src/main/java/com/gxwebsoft/cms/service/impl/WebsiteFieldServiceImpl.java @@ -23,7 +23,7 @@ public class WebsiteFieldServiceImpl extends ServiceImpl pageRel(WebsiteFieldParam param) { PageParam page = new PageParam<>(param); - //page.setDefaultOrder("create_time desc"); + page.setDefaultOrder("sort_number asc, create_time asc"); List list = baseMapper.selectPageRel(page, param); return new PageResult<>(list, page.getTotal()); } diff --git a/src/main/java/com/gxwebsoft/oa/controller/LinkController.java b/src/main/java/com/gxwebsoft/oa/controller/LinkController.java index fe658b0..037d4ac 100644 --- a/src/main/java/com/gxwebsoft/oa/controller/LinkController.java +++ b/src/main/java/com/gxwebsoft/oa/controller/LinkController.java @@ -7,6 +7,7 @@ import com.gxwebsoft.oa.param.LinkParam; import com.gxwebsoft.oa.service.LinkService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -32,6 +33,7 @@ public class LinkController extends BaseController { return success(linkService.pageRel(param)); } + @ApiOperation("查询全部常用链接") @GetMapping() public ApiResult> list(LinkParam param) { @@ -46,6 +48,7 @@ public class LinkController extends BaseController { return success(linkService.getByIdRel(id)); } + @PreAuthorize("hasAuthority('oa:link:save')") @ApiOperation("添加常用链接") @PostMapping() public ApiResult save(@RequestBody Link link) { @@ -60,6 +63,7 @@ public class LinkController extends BaseController { return fail("添加失败"); } + @PreAuthorize("hasAuthority('oa:link:update')") @ApiOperation("修改常用链接") @PutMapping() public ApiResult update(@RequestBody Link link) { @@ -69,6 +73,7 @@ public class LinkController extends BaseController { return fail("修改失败"); } + @PreAuthorize("hasAuthority('oa:link:remove')") @ApiOperation("删除常用链接") @DeleteMapping("/{id}") public ApiResult remove(@PathVariable("id") Integer id) { @@ -78,6 +83,7 @@ public class LinkController extends BaseController { return fail("删除失败"); } + @PreAuthorize("hasAuthority('oa:link:save')") @ApiOperation("批量添加常用链接") @PostMapping("/batch") public ApiResult saveBatch(@RequestBody List list) { @@ -87,6 +93,7 @@ public class LinkController extends BaseController { return fail("添加失败"); } + @PreAuthorize("hasAuthority('oa:link:update')") @ApiOperation("批量修改常用链接") @PutMapping("/batch") public ApiResult removeBatch(@RequestBody BatchParam batchParam) { @@ -96,6 +103,7 @@ public class LinkController extends BaseController { return fail("修改失败"); } + @PreAuthorize("hasAuthority('oa:link:remove')") @ApiOperation("批量删除常用链接") @DeleteMapping("/batch") public ApiResult removeBatch(@RequestBody List ids) { diff --git a/src/test/java/com/gxwebsoft/generator/CmsGenerator.java b/src/test/java/com/gxwebsoft/generator/CmsGenerator.java index 09eca3a..96707a5 100644 --- a/src/test/java/com/gxwebsoft/generator/CmsGenerator.java +++ b/src/test/java/com/gxwebsoft/generator/CmsGenerator.java @@ -58,7 +58,7 @@ public class CmsGenerator { // "cms_website_field", // "cms_form", // "cms_form_record", -// "cms_domain" +// "cms_domain", }; // 需要去除的表前缀