..

src/main/java/com/budwk/app/sys/controller/SysHomeActivityController.java

@@ -81,4 +81,26 @@ public class SysHomeActivityController {
         return Result.success();
     }
 
+    @At
+    @SaCheckPermission("sys.homeActivity")
+    @ApiOperation("推送大图")
+    public Result push(@Valid String id){
+        Sys_home_activity sysHomeActivity = new Sys_home_activity();
+        sysHomeActivity.setId(id);
+        sysHomeActivity.setPush(true);
+        sysHomeActivityService.updateIgnoreNull(sysHomeActivity);
+        return Result.success();
+    }
+
+    @At
+    @SaCheckPermission("sys.homeActivity")
+    @ApiOperation("取消推送大图")
+    public Result cancelPush(@Valid String id){
+        Sys_home_activity sysHomeActivity = new Sys_home_activity();
+        sysHomeActivity.setId(id);
+        sysHomeActivity.setPush(false);
+        sysHomeActivityService.updateIgnoreNull(sysHomeActivity);
+        return Result.success();
+    }
+
 }

src/main/java/com/budwk/app/sys/controller/SysHomeController.java

@@ -6,8 +6,6 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.useragent.UserAgent;
 import cn.hutool.http.useragent.UserAgentUtil;
 import com.budwk.app.base.constant.RedisConstant;
-import com.budwk.app.base.page.Pagination;
-import com.budwk.app.base.param.PageForm;
 import com.budwk.app.base.result.Result;
 import com.budwk.app.sys.models.Sys_home_activity;
 import com.budwk.app.sys.models.Sys_menu;
@@ -29,7 +27,6 @@ import org.nutz.dao.util.Daos;
 import org.nutz.integration.jedis.RedisService;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
-import org.nutz.json.Json;
 import org.nutz.lang.Lang;
 import org.nutz.lang.Strings;
 import org.nutz.lang.util.NutMap;
@@ -37,17 +34,16 @@ import org.nutz.log.Log;
 import org.nutz.log.Logs;
 import org.nutz.mvc.annotation.At;
 import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
 import org.nutz.plugins.wkcache.annotation.CacheDefaults;
 import org.nutz.plugins.wkcache.annotation.CacheResult;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
-import javax.validation.Valid;
-import java.io.IOException;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
 
 
 @IocBean
@@ -148,7 +144,7 @@ public class SysHomeController {
     @SaCheckLogin
     @ApiOperation("电脑端推荐应用")
     @Ok("json")
-    public Result listRecommendApp(String platform) {
+    public Result listRecommendApp(@Param(value = "platform", df = "PC") String platform) {
         List<Sys_menu> list = sysMenuService.query(Cnd.where(Sys_menu::getIsRecommendApp, "=", 1)
                 .and(Sys_menu::getDisabled, "=", 0)
                 .and(Sys_menu::getShowit, "=", 1)
@@ -160,6 +156,23 @@ public class SysHomeController {
         return Result.success(sysMenus);
     }
 
+    @At
+    @SaCheckLogin
+    @ApiOperation("电脑端推荐服务")
+    @Ok("json")
+    public Result listRecommendService(@Param(value = "platform", df = "PC") String platform) {
+        List<Sys_menu> list = sysMenuService.query(Cnd.where(Sys_menu::getIsRecommendService, "=", 1)
+                .and(Sys_menu::getDisabled, "=", 0)
+                .and(Sys_menu::getShowit, "=", 1)
+                .and(Sys_menu::getPlatform, "=", platform)
+        );
+        List<Sys_menu> menus = sysUserService.getMenus(SecurityUtil.getUserId());
+        List<String> allMenuIds = menus.stream().map(Sys_menu::getId).toList();
+        List<Sys_menu> sysMenus = list.stream().filter(m -> allMenuIds.contains(m.getId())).sorted(Comparator.comparingInt(Sys_menu::getLocation)).toList();
+        return Result.success(sysMenus);
+    }
+
+
     @At
     @SaCheckLogin
     @ApiOperation("首页推送活动")

src/main/java/com/budwk/app/sys/models/Sys_home_activity.java

@@ -28,6 +28,11 @@ public class Sys_home_activity extends BaseModel {
     @Comment("活动封面")
     private String cover;
 
+    @Column
+    @ColDefine(type = ColType.TEXT)
+    @Comment("活动内容")
+    private String content;
+
     @Column
     @ColDefine(type = ColType.VARCHAR, width = 1000)
     @Comment("活动链接")
@@ -65,6 +70,12 @@ public class Sys_home_activity extends BaseModel {
     @Default("0")
     private Boolean top;
 
+    @Column
+    @Comment("是否推送大图")
+    @ColDefine(type = ColType.BOOLEAN)
+    @Default("0")
+    private Boolean push;
+
     @Column
     @Comment("排序号")
     @Default("0")