param.getSceneType().equals("showMpMenus")

2024-07-23 01:28:11 +08:00
parent 285cc1db0b
commit 46573c1a77
9 changed files with 39 additions and 37 deletions
@@ -4,48 +4,30 @@ import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.http.HttpRequest;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.gxwebsoft.cms.entity.*;
-import com.gxwebsoft.cms.param.MpMenuParam;
-import com.gxwebsoft.cms.param.NavigationParam;
-import com.gxwebsoft.cms.param.WebsiteParam;
-import com.gxwebsoft.cms.service.*;
-import com.gxwebsoft.common.core.exception.BusinessException;
-import com.gxwebsoft.common.core.security.JwtUtil;
-import com.gxwebsoft.common.core.utils.RedisUtil;
-import com.gxwebsoft.common.core.web.BaseController;
 import com.gxwebsoft.cms.param.MpParam;
+import com.gxwebsoft.cms.service.*;
+import com.gxwebsoft.common.core.utils.RedisUtil;
 import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.BaseController;
 import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.system.entity.Dict;
-import com.gxwebsoft.common.system.entity.DictData;
+import com.gxwebsoft.common.core.web.PageResult;
 import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.oa.entity.Company;
-import com.gxwebsoft.oa.param.LinkParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.ibatis.jdbc.Null;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;

 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;

-import static com.gxwebsoft.common.core.utils.CommonUtil.toTreeData;
-
 /**
 * 小程序信息控制器
 *
@@ -107,11 +89,11 @@ public class MpController extends BaseController {
    }

    // 小程序端导航图标
-    final List<MpMenu> mpMenus = mpMenuService.list(new LambdaQueryWrapper<MpMenu>().isNotNull(MpMenu::getGroupName));
-    if (!CollectionUtils.isEmpty(mpMenus)) {
-      final Map<String, List<MpMenu>> mpMenuMap = mpMenus.stream().collect(Collectors.groupingBy(MpMenu::getGroupName));
-      map.put("mpMenus", mpMenuMap);
-    }
+//    final List<MpMenu> mpMenus = mpMenuService.list(new LambdaQueryWrapper<MpMenu>().isNotNull(MpMenu::getGroupName));
+//    if (!CollectionUtils.isEmpty(mpMenus)) {
+//      final Map<String, List<MpMenu>> mpMenuMap = mpMenus.stream().collect(Collectors.groupingBy(MpMenu::getGroupName));
+//      map.put("mpMenus", mpMenuMap);
+//    }

    // 配置信息
    HashMap<String, Object> config = new HashMap<>();
@@ -1,5 +1,6 @@
 package com.gxwebsoft.cms.controller;

+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.gxwebsoft.common.core.web.BaseController;
 import com.gxwebsoft.cms.service.MpPagesService;
 import com.gxwebsoft.cms.entity.MpPages;
@@ -1,12 +1,12 @@
 package com.gxwebsoft.cms.entity;

-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
+
 import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
+import java.util.Map;

 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -70,4 +70,8 @@ public class MpPages implements Serializable {
    @ApiModelProperty(value = "注册时间")
    private Date createTime;

+    @ApiModelProperty(value = "页面下的导航图标列表")
+    @TableField(exist = false)
+    private Map<Integer, List<MpMenu>> mpMenus;
+
 }
@@ -12,7 +12,7 @@ import java.util.List;
 * 小程序信息Mapper
 *
 * @author 科技小王子
- * @since 2024-07-21 23:03:05
+ * @since 2024-07-23 00:09:11
 */
 public interface MpMapper extends BaseMapper<Mp> {

@@ -14,7 +14,7 @@ import lombok.EqualsAndHashCode;
 * 小程序信息查询参数
 *
 * @author 科技小王子
- * @since 2024-07-21 23:03:05
+ * @since 2024-07-23 00:09:11
 */
@Data
@EqualsAndHashCode(callSuper = false)
@@ -11,7 +11,7 @@ import java.util.List;
 * 小程序信息Service
 *
 * @author 科技小王子
- * @since 2024-07-21 23:03:05
+ * @since 2024-07-23 00:09:11
 */
 public interface MpService extends IService<Mp> {

@@ -1,7 +1,10 @@
 package com.gxwebsoft.cms.service.impl;

+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gxwebsoft.cms.entity.MpMenu;
 import com.gxwebsoft.cms.mapper.MpPagesMapper;
+import com.gxwebsoft.cms.service.MpMenuService;
 import com.gxwebsoft.cms.service.MpPagesService;
 import com.gxwebsoft.cms.entity.MpPages;
 import com.gxwebsoft.cms.param.MpPagesParam;
@@ -9,7 +12,10 @@ import com.gxwebsoft.common.core.web.PageParam;
 import com.gxwebsoft.common.core.web.PageResult;
 import org.springframework.stereotype.Service;

+import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;

 /**
 * 小程序页面Service实现
@@ -19,12 +25,21 @@ import java.util.List;
 */
@Service
 public class MpPagesServiceImpl extends ServiceImpl<MpPagesMapper, MpPages> implements MpPagesService {
+    @Resource
+    private MpMenuService mpMenuService;

    @Override
    public PageResult<MpPages> pageRel(MpPagesParam param) {
        PageParam<MpPages, MpPagesParam> page = new PageParam<>(param);
        page.setDefaultOrder("sort_number asc, create_time asc");
        List<MpPages> list = baseMapper.selectPageRel(page, param);
+        if (param.getSceneType() != null && param.getSceneType().equals("showMpMenus")) {
+          final List<MpMenu> mpMenus = mpMenuService.list(new LambdaUpdateWrapper<MpMenu>().eq(MpMenu::getPageId, list.get(0).getId()));
+          final Map<Integer, List<MpMenu>> collect = mpMenus.stream().collect(Collectors.groupingBy(MpMenu::getParentId));
+          list.forEach(d -> {
+            d.setMpMenus(collect);
+          });
+        }
        return new PageResult<>(list, page.getTotal());
    }

@@ -15,7 +15,7 @@ import java.util.List;
 * 小程序信息Service实现
 *
 * @author 科技小王子
- * @since 2024-07-21 23:03:05
+ * @since 2024-07-23 00:09:11
 */
@Service
 public class MpServiceImpl extends ServiceImpl<MpMapper, Mp> implements MpService {