diff --git a/src/main/java/com/budwk/app/sys/controller/SysHomeController.java b/src/main/java/com/budwk/app/sys/controller/SysHomeController.java index a5017e12..b8f4470c 100644 --- a/src/main/java/com/budwk/app/sys/controller/SysHomeController.java +++ b/src/main/java/com/budwk/app/sys/controller/SysHomeController.java @@ -146,10 +146,10 @@ public class SysHomeController { @At @SaCheckLogin - @ApiOperation("电脑端快速入口") + @ApiOperation("电脑端推荐应用") @Ok("json") - public Result listQuickEntry(String platform) { - List list = sysMenuService.query(Cnd.where(Sys_menu::getIsQuickEntry, "=", 1) + public Result listRecommendApp(String platform) { + List list = sysMenuService.query(Cnd.where(Sys_menu::getIsRecommendApp, "=", 1) .and(Sys_menu::getDisabled, "=", 0) .and(Sys_menu::getShowit, "=", 1) .and(Sys_menu::getPlatform, "=", platform) diff --git a/src/main/java/com/budwk/app/sys/controller/SysMenuController.java b/src/main/java/com/budwk/app/sys/controller/SysMenuController.java index 6a3cf18b..2d893b7c 100644 --- a/src/main/java/com/budwk/app/sys/controller/SysMenuController.java +++ b/src/main/java/com/budwk/app/sys/controller/SysMenuController.java @@ -38,6 +38,7 @@ import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; import java.util.ArrayList; import java.util.List; +import java.util.Objects; @IocBean @At("/platform/sys/menu") @@ -422,11 +423,16 @@ public class SysMenuController { @At @Ok("json") @SaCheckPermission("sys.manager.menu") - @ApiOperation("更新快捷入口") - public Result updateQuickEntry(@Param("menuIds") String[] menuIds, String platform) { - sysMenuService.update(Chain.make("isQuickEntry", 0), Cnd.where("id", "is not", null).and("platform", "=", platform)); + @ApiOperation("更新首页推荐应用或服务") + public Result updateRecommendSetting(@Param("menuIds") String[] menuIds, String platform, String type) { + String column = ""; + switch (type) { + case "app" -> column = "isRecommendApp"; + case "service" -> column = "isRecommendService"; + } + sysMenuService.update(Chain.make(column, 0), Cnd.where("id", "is not", null).and("platform", "=", platform)); if (ArrayUtil.isNotEmpty(menuIds)) { - sysMenuService.update(Chain.make("isQuickEntry", 1), Cnd.where("id", "in", menuIds).and("platform", "=", platform)); + sysMenuService.update(Chain.make(column, 1), Cnd.where("id", "in", menuIds).and("platform", "=", platform)); } return Result.success(); } diff --git a/src/main/java/com/budwk/app/sys/models/Sys_menu.java b/src/main/java/com/budwk/app/sys/models/Sys_menu.java index 6dccd83a..1c21c7ba 100644 --- a/src/main/java/com/budwk/app/sys/models/Sys_menu.java +++ b/src/main/java/com/budwk/app/sys/models/Sys_menu.java @@ -121,11 +121,17 @@ public class Sys_menu extends BaseModel implements Serializable { @ColDefine(type = ColType.VARCHAR, width = 32) private String moduleId; + @Column + @Comment("是否是推荐应用") + @ColDefine(type = ColType.BOOLEAN) + @Default("0") + private Boolean isRecommendApp; + @Column - @Comment("是否是快捷入口") + @Comment("是否是推荐服务") @ColDefine(type = ColType.BOOLEAN) @Default("0") - private Boolean isQuickEntry; + private Boolean isRecommendService; //按钮权限 private List buttons; diff --git a/src/main/resources/views/platform/sys/home.html b/src/main/resources/views/platform/sys/home.html index fb165a3b..6c2dc2e0 100644 --- a/src/main/resources/views/platform/sys/home.html +++ b/src/main/resources/views/platform/sys/home.html @@ -280,8 +280,8 @@ layout("/layouts/platform.html"){ } }, methods: { - listQuickEntry() { - this.$axios.post("/platform/home/listQuickEntry").then((res) => { + listRecommendApp() { + this.$axios.post("/platform/home/listRecommendApp").then((res) => { if (res.code === 0) { this.quickEntries = res.data } @@ -299,7 +299,7 @@ layout("/layouts/platform.html"){ } }, created() { - this.listQuickEntry() + this.listRecommendApp() this.listActivity() this.listProcessInstance() } diff --git a/src/main/resources/views/platform/sys/menu/index.html b/src/main/resources/views/platform/sys/menu/index.html index de8977f8..286cb6fb 100644 --- a/src/main/resources/views/platform/sys/menu/index.html +++ b/src/main/resources/views/platform/sys/menu/index.html @@ -44,8 +44,11 @@ layout("/layouts/platform.html"){ 新建菜单 排序 - - 首页快速入口 + + 首页推荐应用 + + + 首页推荐服务 - +
  • 新建菜单
  • @@ -128,20 +131,20 @@ layout("/layouts/platform.html"){
  • 编辑
  • 删除
- + - - + + - +