diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cms/controller/CmsColumnController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cms/controller/CmsColumnController.java index 2b3e03d..497dfa1 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cms/controller/CmsColumnController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cms/controller/CmsColumnController.java @@ -239,6 +239,7 @@ public class CmsColumnController extends JeecgController add(@RequestBody CmsColumn cmsColumn) { + cmsColumn.setPid("0"); cmsColumnService.save(cmsColumn); return Result.OK("添加成功!"); } @@ -270,11 +271,15 @@ public class CmsColumnController extends JeecgController delete(@RequestParam(name = "id", required = true) String id) { Result result = new Result(); CmsColumn sysCategory = cmsColumnService.getById(id); - if (sysCategory == null) { - result.error500("未找到对应实体"); - } else { - this.cmsColumnService.delete(id); - result.success("删除成功!"); + if (sysCategory.getIsdel().equals("Y")) { + if (sysCategory == null) { + result.error500("未找到对应实体"); + } else { + this.cmsColumnService.delete(id); + result.success("删除成功!"); + } + }else { + result.success("基础设置不可删除!"); } return result; } diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cms/controller/CmsHomePageController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cms/controller/CmsHomePageController.java index 6fd9070..3da4359 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cms/controller/CmsHomePageController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cms/controller/CmsHomePageController.java @@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; -import java.util.List; +import java.util.*; @Api(tags = "cms首页") @RestController @@ -69,53 +69,35 @@ public class CmsHomePageController /*extends JeecgController getindexnew(CmsArticle cmsArticle, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "6") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(cmsArticle, req.getParameterMap()); - queryWrapper.eq("status", "1"); - queryWrapper.eq("column_id", "1717099205205401602"); - queryWrapper.last("order by publish_time desc"); - Page page = new Page(pageNo, pageSize); - IPage pageList = cmsArticleService.page(page, queryWrapper); - return Result.OK(pageList); - } - - @ApiOperation(value = "用于首页的竞赛导航", notes = "竞赛导航") - @GetMapping(value = "/getindexcomp") - public Result getindexcomp(CmsArticle cmsArticle, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "8") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(cmsArticle, req.getParameterMap()); - queryWrapper.eq("status", "1"); - queryWrapper.eq("column_id", "1712301393339650049"); - queryWrapper.last("order by publish_time desc"); - Page page = new Page(pageNo, pageSize); - IPage pageList = cmsArticleService.page(page, queryWrapper); - return Result.OK(pageList); - } - - - @ApiOperation(value = "用于首页的研究成果", notes = "研究成果") - @GetMapping(value = "/getindexaward") + @ApiOperation(value = "用于首页的要问速报", notes = "用于首页的要问速报") + @GetMapping(value = "/indexywsb") public Result getindexaward(CmsArticle cmsArticle, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "3") Integer pageSize, - HttpServletRequest req) { + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "3") Integer pageSize, + HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(cmsArticle, req.getParameterMap()); queryWrapper.eq("status", "1"); - queryWrapper.eq("column_id", "1717099355382456322"); - queryWrapper.last("order by publish_time desc"); - Page page = new Page(pageNo, pageSize); - IPage pageList = cmsArticleService.page(page, queryWrapper); - return Result.OK(pageList); + List allArticles = cmsArticleService.list(queryWrapper); + + if (allArticles.size() <= 3) { + return Result.OK(allArticles); + } else { + // 随机选择3条记录 + Random random = new Random(); + List randomArticles = new ArrayList<>(3); + Set selectedIndices = new HashSet<>(3); // 使用Set来确保索引的唯一性 + + while (selectedIndices.size() < 3) { + int index = random.nextInt(allArticles.size()); + selectedIndices.add(index); + } + for (Integer index : selectedIndices) { + randomArticles.add(allArticles.get(index)); + } + return Result.OK(randomArticles); + } } - @ApiOperation(value = "查询全部新闻", notes = "查询全部新闻") @GetMapping(value = "/cmsfindallnews") public Result cmsfindallnews(CmsArticle cmsArticle, diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cms/entity/CmsColumn.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cms/entity/CmsColumn.java index 29858f6..3852c01 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cms/entity/CmsColumn.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cms/entity/CmsColumn.java @@ -86,4 +86,9 @@ public class CmsColumn implements Serializable { @ApiModelProperty(value = "是否有子节点") @Dict(dicCode = "captain_code") private String hasChild; + + /**删除标记*/ + @Excel(name = "删除标记", width = 15) + @ApiModelProperty(value = "删除标记") + private java.lang.String isdel; } diff --git a/jeecgboot-vue3/src/layouts/default/header/components/user-dropdown/index.vue b/jeecgboot-vue3/src/layouts/default/header/components/user-dropdown/index.vue index 5d0feeb..6222646 100644 --- a/jeecgboot-vue3/src/layouts/default/header/components/user-dropdown/index.vue +++ b/jeecgboot-vue3/src/layouts/default/header/components/user-dropdown/index.vue @@ -13,7 +13,7 @@ - + @@ -170,7 +170,8 @@ break; case 'account': //update-begin---author:wangshuai ---date:20221125 for:进入用户设置页面------------ - go(`/system/usersetting`); + // go(`/system/usersetting`); + go(`/kejiju/system/usersetting`); //update-end---author:wangshuai ---date:20221125 for:进入用户设置页面-------------- break; } diff --git a/jeecgboot-vue3/src/views/system/depart/components/DepartLeftTree.vue b/jeecgboot-vue3/src/views/system/depart/components/DepartLeftTree.vue index 7d3785f..b2cc48c 100644 --- a/jeecgboot-vue3/src/views/system/depart/components/DepartLeftTree.vue +++ b/jeecgboot-vue3/src/views/system/depart/components/DepartLeftTree.vue @@ -7,8 +7,8 @@ 导入 导出 - 同步企微? - 同步钉钉? +