Quellcode durchsuchen

1、厦门海嘉成-栏目菜单

41235 vor 1 Jahr
Ursprung
Commit
764cab3d11
20 geänderte Dateien mit 753 neuen und 0 gelöschten Zeilen
  1. 0 0
      hx-xmhjc/src/main/java/com/fjhx/xmhjc/a-json/ColumnMenuApi.json
  2. 5 0
      hx-xmhjc/src/main/java/com/fjhx/xmhjc/a-json/ColumnMenuSubApi.json
  3. 66 0
      hx-xmhjc/src/main/java/com/fjhx/xmhjc/controller/column/ColumnMenuController.java
  4. 66 0
      hx-xmhjc/src/main/java/com/fjhx/xmhjc/controller/column/ColumnMenuSubController.java
  5. 21 0
      hx-xmhjc/src/main/java/com/fjhx/xmhjc/entity/column/dto/ColumnMenuDto.java
  6. 17 0
      hx-xmhjc/src/main/java/com/fjhx/xmhjc/entity/column/dto/ColumnMenuSelectDto.java
  7. 18 0
      hx-xmhjc/src/main/java/com/fjhx/xmhjc/entity/column/dto/ColumnMenuSubDto.java
  8. 22 0
      hx-xmhjc/src/main/java/com/fjhx/xmhjc/entity/column/dto/ColumnMenuSubSelectDto.java
  9. 53 0
      hx-xmhjc/src/main/java/com/fjhx/xmhjc/entity/column/po/ColumnMenu.java
  10. 42 0
      hx-xmhjc/src/main/java/com/fjhx/xmhjc/entity/column/po/ColumnMenuSub.java
  11. 17 0
      hx-xmhjc/src/main/java/com/fjhx/xmhjc/entity/column/vo/ColumnMenuSubVo.java
  12. 20 0
      hx-xmhjc/src/main/java/com/fjhx/xmhjc/entity/column/vo/ColumnMenuVo.java
  13. 30 0
      hx-xmhjc/src/main/java/com/fjhx/xmhjc/mapper/column/ColumnMenuMapper.java
  14. 35 0
      hx-xmhjc/src/main/java/com/fjhx/xmhjc/mapper/column/ColumnMenuSubMapper.java
  15. 46 0
      hx-xmhjc/src/main/java/com/fjhx/xmhjc/service/column/ColumnMenuService.java
  16. 50 0
      hx-xmhjc/src/main/java/com/fjhx/xmhjc/service/column/ColumnMenuSubService.java
  17. 83 0
      hx-xmhjc/src/main/java/com/fjhx/xmhjc/service/column/impl/ColumnMenuServiceImpl.java
  18. 104 0
      hx-xmhjc/src/main/java/com/fjhx/xmhjc/service/column/impl/ColumnMenuSubServiceImpl.java
  19. 31 0
      hx-xmhjc/src/main/resources/mapper/column/ColumnMenuMapper.xml
  20. 27 0
      hx-xmhjc/src/main/resources/mapper/column/ColumnMenuSubMapper.xml

Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
hx-xmhjc/src/main/java/com/fjhx/xmhjc/a-json/ColumnMenuApi.json


+ 5 - 0
hx-xmhjc/src/main/java/com/fjhx/xmhjc/a-json/ColumnMenuSubApi.json

@@ -0,0 +1,5 @@
+{"openapi":"3.0.1","tags":[{"name":"栏目-子栏目"}],"paths":{"/columnMenuSub/page":{"post":{"summary":"分页","tags":["栏目-子栏目"],"requestBody":{"content":{"application/json":{"schema":{"type":"object","required":["pageNum","pageSize"],"title":null,"properties":{"pageNum":{"type":"integer","required":null,"title":"页数","properties":null,"items":null},"pageSize":{"type":"integer","required":null,"title":"每页大小","properties":null,"items":null}},"items":null}}}},"responses":{"200":{"description":"成功","content":{"application/json":{"schema":{"type":"object","required":["code","success","msg","data"],"title":null,"properties":{"code":{"type":"Integer","required":null,"title":null,"properties":null,"items":null},"success":{"type":"boolean","required":null,"title":null,"properties":null,"items":null},"msg":{"type":"string","required":null,"title":null,"properties":null,"items":null},"data":{"type":"object","required":["rows","total"],"title":null,"properties":{"records":{"type":"array","required":null,"title":"分页数据","properties":null,"items":{"type":"object","required":null,"title":null,"properties":{"id":{"type":"integer","required":null,"title":"","properties":null,"items":null},"columnId
+":{"type":"integer","required":null,"title":"菜单栏目id","properties":null,"items":null},"name":{"type":"string","required":null,"title":"名称","properties":null,"items":null},"sort":{"type":"string","required":null,"title":"排序","properties":null,"items":null}},"items":null}},"total":{"type":"integer","required":null,"title":"总条数","properties":null,"items":null}},"items":null}},"items":null}}}}}}},"/columnMenuSub/detail":{"post":{"summary":"明细","tags":["栏目-子栏目"],"requestBody":{"content":{"application/json":{"schema":{"type":"object","required":["id"],"title":null,"properties":{"id":{"type":"integer","required":null,"title":"栏目-子栏目id","properties":null,"items":null}},"items":null}}}},"responses":{"200":{"description":"成功","content":{"application/json":{"schema":{"type":"object","required":["code","success","msg","data"],"title":null,"properties":{"code":{"type":"Integer","required":null,"title":null,"properties":null,"items":null},"success":{"type":"boolean","required":null,"title":null,"properties":null,"items":null},"msg":{"type":"string","required":null,"title":null,"properties":null,"items":null},"data":{"type":"object","required":null,"title":null,"properties":{"id":{"type":"integer","required":null,"title":"","properties":null,"items":null},"columnId
+":{"type":"integer","required":null,"title":"菜单栏目id","properties":null,"items":null},"name":{"type":"string","required":null,"title":"名称","properties":null,"items":null},"sort":{"type":"string","required":null,"title":"排序","properties":null,"items":null}},"items":null}},"items":null}}}}}}},"/columnMenuSub/add":{"post":{"summary":"新增","tags":["栏目-子栏目"],"requestBody":{"content":{"application/json":{"schema":{"type":"object","required":null,"title":null,"properties":{"columnId
+":{"type":"integer","required":null,"title":"菜单栏目id","properties":null,"items":null},"name":{"type":"string","required":null,"title":"名称","properties":null,"items":null},"sort":{"type":"string","required":null,"title":"排序","properties":null,"items":null}},"items":null}}}},"responses":{"200":{"description":"成功","content":{"application/json":{"schema":{"type":"object","required":["code","success","msg","data"],"title":null,"properties":{"code":{"type":"Integer","required":null,"title":null,"properties":null,"items":null},"success":{"type":"boolean","required":null,"title":null,"properties":null,"items":null},"msg":{"type":"string","required":null,"title":null,"properties":null,"items":null},"data":{"type":null,"required":null,"title":null,"properties":null,"items":null}},"items":null}}}}}}},"/columnMenuSub/edit":{"post":{"summary":"编辑","tags":["栏目-子栏目"],"requestBody":{"content":{"application/json":{"schema":{"type":"object","required":null,"title":null,"properties":{"id":{"type":"integer","required":null,"title":"","properties":null,"items":null},"columnId
+":{"type":"integer","required":null,"title":"菜单栏目id","properties":null,"items":null},"name":{"type":"string","required":null,"title":"名称","properties":null,"items":null},"sort":{"type":"string","required":null,"title":"排序","properties":null,"items":null}},"items":null}}}},"responses":{"200":{"description":"成功","content":{"application/json":{"schema":{"type":"object","required":["code","success","msg","data"],"title":null,"properties":{"code":{"type":"Integer","required":null,"title":null,"properties":null,"items":null},"success":{"type":"boolean","required":null,"title":null,"properties":null,"items":null},"msg":{"type":"string","required":null,"title":null,"properties":null,"items":null},"data":{"type":null,"required":null,"title":null,"properties":null,"items":null}},"items":null}}}}}}},"/columnMenuSub/delete":{"post":{"summary":"删除","tags":["栏目-子栏目"],"requestBody":{"content":{"application/json":{"schema":{"type":"object","required":["id"],"title":null,"properties":{"id":{"type":"integer","required":null,"title":"栏目-子栏目id","properties":null,"items":null}},"items":null}}}},"responses":{"200":{"description":"成功","content":{"application/json":{"schema":{"type":"object","required":["code","success","msg","data"],"title":null,"properties":{"code":{"type":"Integer","required":null,"title":null,"properties":null,"items":null},"success":{"type":"boolean","required":null,"title":null,"properties":null,"items":null},"msg":{"type":"string","required":null,"title":null,"properties":null,"items":null},"data":{"type":null,"required":null,"title":null,"properties":null,"items":null}},"items":null}}}}}}}}}

+ 66 - 0
hx-xmhjc/src/main/java/com/fjhx/xmhjc/controller/column/ColumnMenuController.java

@@ -0,0 +1,66 @@
+package com.fjhx.xmhjc.controller.column;
+
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.xmhjc.entity.column.vo.ColumnMenuVo;
+import com.fjhx.xmhjc.entity.column.dto.ColumnMenuSelectDto;
+import com.fjhx.xmhjc.entity.column.dto.ColumnMenuDto;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.xmhjc.service.column.ColumnMenuService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * 栏目菜单表 前端控制器
+ *
+ * @author lqh
+ * @since 2023-11-15
+ */
+@RestController
+@RequestMapping("/columnMenu")
+public class ColumnMenuController {
+
+    @Autowired
+    private ColumnMenuService columnMenuService;
+
+    /**
+     * 栏目菜单表分页
+     */
+    @PostMapping("/page")
+    public Page<ColumnMenuVo> page(@RequestBody ColumnMenuSelectDto dto) {
+        return columnMenuService.getPage(dto);
+    }
+
+    /**
+     * 栏目菜单表明细
+     */
+    @PostMapping("/detail")
+    public ColumnMenuVo detail(@RequestBody BaseSelectDto dto) {
+        return columnMenuService.detail(dto.getId());
+    }
+
+    /**
+     * 栏目菜单表新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody ColumnMenuDto columnMenuDto) {
+        columnMenuService.add(columnMenuDto);
+    }
+
+    /**
+     * 栏目菜单表编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody ColumnMenuDto columnMenuDto) {
+        columnMenuService.edit(columnMenuDto);
+    }
+
+    /**
+     * 栏目菜单表删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        columnMenuService.delete(dto.getId());
+    }
+
+}

+ 66 - 0
hx-xmhjc/src/main/java/com/fjhx/xmhjc/controller/column/ColumnMenuSubController.java

@@ -0,0 +1,66 @@
+package com.fjhx.xmhjc.controller.column;
+
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.xmhjc.entity.column.vo.ColumnMenuSubVo;
+import com.fjhx.xmhjc.entity.column.dto.ColumnMenuSubSelectDto;
+import com.fjhx.xmhjc.entity.column.dto.ColumnMenuSubDto;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.xmhjc.service.column.ColumnMenuSubService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * 栏目-子栏目 前端控制器
+ *
+ * @author lqh
+ * @since 2023-11-15
+ */
+@RestController
+@RequestMapping("/columnMenuSub")
+public class ColumnMenuSubController {
+
+    @Autowired
+    private ColumnMenuSubService columnMenuSubService;
+
+    /**
+     * 栏目-子栏目分页
+     */
+    @PostMapping("/page")
+    public Page<ColumnMenuSubVo> page(@RequestBody ColumnMenuSubSelectDto dto) {
+        return columnMenuSubService.getPage(dto);
+    }
+
+    /**
+     * 栏目-子栏目明细
+     */
+    @PostMapping("/detail")
+    public ColumnMenuSubVo detail(@RequestBody BaseSelectDto dto) {
+        return columnMenuSubService.detail(dto.getId());
+    }
+
+    /**
+     * 栏目-子栏目新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody ColumnMenuSubDto columnMenuSubDto) {
+        columnMenuSubService.add(columnMenuSubDto);
+    }
+
+    /**
+     * 栏目-子栏目编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody ColumnMenuSubDto columnMenuSubDto) {
+        columnMenuSubService.edit(columnMenuSubDto);
+    }
+
+    /**
+     * 栏目-子栏目删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        columnMenuSubService.delete(dto.getId());
+    }
+
+}

+ 21 - 0
hx-xmhjc/src/main/java/com/fjhx/xmhjc/entity/column/dto/ColumnMenuDto.java

@@ -0,0 +1,21 @@
+package com.fjhx.xmhjc.entity.column.dto;
+
+import com.fjhx.xmhjc.entity.column.po.ColumnMenu;
+import com.fjhx.xmhjc.entity.column.po.ColumnMenuSub;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * 栏目菜单表新增编辑入参实体
+ *
+ * @author lqh
+ * @since 2023-11-15
+ */
+@Getter
+@Setter
+public class ColumnMenuDto extends ColumnMenu {
+
+    List<ColumnMenuSub> columnMenuSubList;
+}

+ 17 - 0
hx-xmhjc/src/main/java/com/fjhx/xmhjc/entity/column/dto/ColumnMenuSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.xmhjc.entity.column.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 栏目菜单表列表查询入参实体
+ *
+ * @author lqh
+ * @since 2023-11-15
+ */
+@Getter
+@Setter
+public class ColumnMenuSelectDto extends BaseSelectDto {
+
+}

+ 18 - 0
hx-xmhjc/src/main/java/com/fjhx/xmhjc/entity/column/dto/ColumnMenuSubDto.java

@@ -0,0 +1,18 @@
+package com.fjhx.xmhjc.entity.column.dto;
+
+import com.fjhx.xmhjc.entity.column.po.ColumnMenuSub;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 栏目-子栏目新增编辑入参实体
+ *
+ * @author lqh
+ * @since 2023-11-15
+ */
+@Getter
+@Setter
+public class ColumnMenuSubDto extends ColumnMenuSub {
+
+
+}

+ 22 - 0
hx-xmhjc/src/main/java/com/fjhx/xmhjc/entity/column/dto/ColumnMenuSubSelectDto.java

@@ -0,0 +1,22 @@
+package com.fjhx.xmhjc.entity.column.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 栏目-子栏目列表查询入参实体
+ *
+ * @author lqh
+ * @since 2023-11-15
+ */
+@Getter
+@Setter
+public class ColumnMenuSubSelectDto extends BaseSelectDto {
+
+    /**
+     * 菜单栏目id
+     */
+    private Long columnId;
+
+}

+ 53 - 0
hx-xmhjc/src/main/java/com/fjhx/xmhjc/entity/column/po/ColumnMenu.java

@@ -0,0 +1,53 @@
+package com.fjhx.xmhjc.entity.column.po;
+
+import com.ruoyi.common.core.domain.BaseIdPo;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 栏目菜单表
+ * </p>
+ *
+ * @author lqh
+ * @since 2023-11-15
+ */
+@Getter
+@Setter
+@TableName("column_menu")
+public class ColumnMenu extends BaseIdPo {
+
+    /**
+     * 栏目名称
+     */
+    private String name;
+
+    /**
+     * 栏目类型1=列表;2=图文;3=外链
+     */
+    private String type;
+
+    /**
+     * 图文富文本
+     */
+    private String content;
+
+    private String url;
+
+    /**
+     * 排序
+     */
+    private String sort;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 列表类型1=9宫格,2=图文列表,3=纯文本列表
+     */
+    private String listType;
+
+}

+ 42 - 0
hx-xmhjc/src/main/java/com/fjhx/xmhjc/entity/column/po/ColumnMenuSub.java

@@ -0,0 +1,42 @@
+package com.fjhx.xmhjc.entity.column.po;
+
+import com.ruoyi.common.core.domain.BaseIdPo;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 栏目-子栏目
+ * </p>
+ *
+ * @author lqh
+ * @since 2023-11-15
+ */
+@Getter
+@Setter
+@TableName("column_menu_sub")
+public class ColumnMenuSub extends BaseIdPo {
+
+    /**
+     * 菜单栏目id
+     */
+    private Long columnId
+;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 排序
+     */
+    private String sort;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+}

+ 17 - 0
hx-xmhjc/src/main/java/com/fjhx/xmhjc/entity/column/vo/ColumnMenuSubVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.xmhjc.entity.column.vo;
+
+import com.fjhx.xmhjc.entity.column.po.ColumnMenuSub;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 栏目-子栏目列表查询返回值实体
+ *
+ * @author lqh
+ * @since 2023-11-15
+ */
+@Getter
+@Setter
+public class ColumnMenuSubVo extends ColumnMenuSub {
+
+}

+ 20 - 0
hx-xmhjc/src/main/java/com/fjhx/xmhjc/entity/column/vo/ColumnMenuVo.java

@@ -0,0 +1,20 @@
+package com.fjhx.xmhjc.entity.column.vo;
+
+import com.fjhx.xmhjc.entity.column.po.ColumnMenu;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * 栏目菜单表列表查询返回值实体
+ *
+ * @author lqh
+ * @since 2023-11-15
+ */
+@Getter
+@Setter
+public class ColumnMenuVo extends ColumnMenu {
+
+    List<ColumnMenuSubVo> columnMenuSubList;
+}

+ 30 - 0
hx-xmhjc/src/main/java/com/fjhx/xmhjc/mapper/column/ColumnMenuMapper.java

@@ -0,0 +1,30 @@
+package com.fjhx.xmhjc.mapper.column;
+
+import com.fjhx.xmhjc.entity.column.po.ColumnMenu;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.xmhjc.entity.column.vo.ColumnMenuVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 栏目菜单表 Mapper 接口
+ * </p>
+ *
+ * @author lqh
+ * @since 2023-11-15
+ */
+public interface ColumnMenuMapper extends BaseMapper<ColumnMenu> {
+
+    /**
+     * 栏目菜单表列表
+     */
+    Page<ColumnMenuVo> getList(@Param("ew") IWrapper<ColumnMenu> wrapper);
+    /**
+     * 栏目菜单表分页
+     */
+    Page<ColumnMenuVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<ColumnMenu> wrapper);
+
+}

+ 35 - 0
hx-xmhjc/src/main/java/com/fjhx/xmhjc/mapper/column/ColumnMenuSubMapper.java

@@ -0,0 +1,35 @@
+package com.fjhx.xmhjc.mapper.column;
+
+import com.fjhx.xmhjc.entity.about.po.AboutUsCulture;
+import com.fjhx.xmhjc.entity.about.vo.AboutUsCultureVo;
+import com.fjhx.xmhjc.entity.column.po.ColumnMenuSub;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.xmhjc.entity.column.vo.ColumnMenuSubVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 栏目-子栏目 Mapper 接口
+ * </p>
+ *
+ * @author lqh
+ * @since 2023-11-15
+ */
+public interface ColumnMenuSubMapper extends BaseMapper<ColumnMenuSub> {
+
+    /**
+     * 关于我们-企业文化列表
+     */
+    List<ColumnMenuSubVo> getList(@Param("ew") IWrapper<ColumnMenuSub> wrapper);
+
+    /**
+     * 栏目-子栏目分页
+     */
+    Page<ColumnMenuSubVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<ColumnMenuSub> wrapper);
+
+}

+ 46 - 0
hx-xmhjc/src/main/java/com/fjhx/xmhjc/service/column/ColumnMenuService.java

@@ -0,0 +1,46 @@
+package com.fjhx.xmhjc.service.column;
+
+import com.fjhx.xmhjc.entity.column.po.ColumnMenu;
+import com.ruoyi.common.core.service.BaseService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.xmhjc.entity.column.vo.ColumnMenuVo;
+import com.fjhx.xmhjc.entity.column.dto.ColumnMenuSelectDto;
+import com.fjhx.xmhjc.entity.column.dto.ColumnMenuDto;
+
+
+/**
+ * <p>
+ * 栏目菜单表 服务类
+ * </p>
+ *
+ * @author lqh
+ * @since 2023-11-15
+ */
+public interface ColumnMenuService extends BaseService<ColumnMenu> {
+
+    /**
+     * 栏目菜单表分页
+     */
+    Page<ColumnMenuVo> getPage(ColumnMenuSelectDto dto);
+
+    /**
+     * 栏目菜单表明细
+     */
+    ColumnMenuVo detail(Long id);
+
+    /**
+     * 栏目菜单表新增
+     */
+    void add(ColumnMenuDto columnMenuDto);
+
+    /**
+     * 栏目菜单表编辑
+     */
+    void edit(ColumnMenuDto columnMenuDto);
+
+    /**
+     * 栏目菜单表删除
+     */
+    void delete(Long id);
+
+}

+ 50 - 0
hx-xmhjc/src/main/java/com/fjhx/xmhjc/service/column/ColumnMenuSubService.java

@@ -0,0 +1,50 @@
+package com.fjhx.xmhjc.service.column;
+
+import com.fjhx.xmhjc.entity.column.po.ColumnMenuSub;
+import com.ruoyi.common.core.service.BaseService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.xmhjc.entity.column.vo.ColumnMenuSubVo;
+import com.fjhx.xmhjc.entity.column.dto.ColumnMenuSubSelectDto;
+import com.fjhx.xmhjc.entity.column.dto.ColumnMenuSubDto;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 栏目-子栏目 服务类
+ * </p>
+ *
+ * @author lqh
+ * @since 2023-11-15
+ */
+public interface ColumnMenuSubService extends BaseService<ColumnMenuSub> {
+
+    List<ColumnMenuSubVo> getList(ColumnMenuSubSelectDto dto);
+
+    /**
+     * 栏目-子栏目分页
+     */
+    Page<ColumnMenuSubVo> getPage(ColumnMenuSubSelectDto dto);
+
+    /**
+     * 栏目-子栏目明细
+     */
+    ColumnMenuSubVo detail(Long id);
+
+    /**
+     * 栏目-子栏目新增
+     */
+    void add(ColumnMenuSubDto columnMenuSubDto);
+
+    /**
+     * 栏目-子栏目编辑
+     */
+    void edit(ColumnMenuSubDto columnMenuSubDto);
+
+    /**
+     * 栏目-子栏目删除
+     */
+    void delete(Long id);
+
+}

+ 83 - 0
hx-xmhjc/src/main/java/com/fjhx/xmhjc/service/column/impl/ColumnMenuServiceImpl.java

@@ -0,0 +1,83 @@
+package com.fjhx.xmhjc.service.column.impl;
+
+import com.fjhx.xmhjc.entity.column.dto.ColumnMenuSubSelectDto;
+import com.fjhx.xmhjc.entity.column.po.ColumnMenu;
+import com.fjhx.xmhjc.entity.column.vo.ColumnMenuSubVo;
+import com.fjhx.xmhjc.mapper.column.ColumnMenuMapper;
+import com.fjhx.xmhjc.service.column.ColumnMenuService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.DictUtils;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.xmhjc.entity.column.vo.ColumnMenuVo;
+import com.fjhx.xmhjc.entity.column.dto.ColumnMenuSelectDto;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.fjhx.xmhjc.entity.column.dto.ColumnMenuDto;
+import cn.hutool.core.bean.BeanUtil;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+
+/**
+ * <p>
+ * 栏目菜单表 服务实现类
+ * </p>
+ *
+ * @author lqh
+ * @since 2023-11-15
+ */
+@Service
+public class ColumnMenuServiceImpl extends ServiceImpl<ColumnMenuMapper, ColumnMenu> implements ColumnMenuService {
+
+    @Resource
+    private ColumnMenuSubServiceImpl columnMenuSubService;
+
+
+    @Override
+    public Page<ColumnMenuVo> getPage(ColumnMenuSelectDto dto) {
+        IWrapper<ColumnMenu> wrapper = getWrapper();
+        wrapper.orderByDesc("cm", ColumnMenu::getId);
+        Page<ColumnMenuVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public ColumnMenuVo detail(Long id) {
+        ColumnMenu ColumnMenu = this.getById(id);
+        ColumnMenuVo result = BeanUtil.toBean(ColumnMenu, ColumnMenuVo.class);
+
+        ColumnMenuSubSelectDto columnMenuSubSelectDto = new ColumnMenuSubSelectDto();
+        columnMenuSubSelectDto.setColumnId(id);
+        List<ColumnMenuSubVo> list = columnMenuSubService.getList(columnMenuSubSelectDto);
+        result.setColumnMenuSubList(list);
+
+        return result;
+    }
+
+    @Override
+    @Transactional
+    public void add(ColumnMenuDto columnMenuDto) {
+        this.save(columnMenuDto);
+        //处理子表
+        columnMenuSubService.handleColumnMenuSub(columnMenuDto.getId(),columnMenuDto.getColumnMenuSubList());
+    }
+
+    @Override
+    public void edit(ColumnMenuDto columnMenuDto) {
+        this.updateById(columnMenuDto);
+        //处理子表
+        columnMenuSubService.handleColumnMenuSub(columnMenuDto.getId(),columnMenuDto.getColumnMenuSubList());
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+
+        //TODO判断菜单及栏目是否有文章
+
+
+    }
+
+}

+ 104 - 0
hx-xmhjc/src/main/java/com/fjhx/xmhjc/service/column/impl/ColumnMenuSubServiceImpl.java

@@ -0,0 +1,104 @@
+package com.fjhx.xmhjc.service.column.impl;
+
+import com.fjhx.xmhjc.entity.column.po.ColumnMenuSub;
+import com.fjhx.xmhjc.mapper.column.ColumnMenuSubMapper;
+import com.fjhx.xmhjc.service.column.ColumnMenuSubService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.xmhjc.entity.column.vo.ColumnMenuSubVo;
+import com.fjhx.xmhjc.entity.column.dto.ColumnMenuSubSelectDto;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.fjhx.xmhjc.entity.column.dto.ColumnMenuSubDto;
+import cn.hutool.core.bean.BeanUtil;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+
+/**
+ * <p>
+ * 栏目-子栏目 服务实现类
+ * </p>
+ *
+ * @author lqh
+ * @since 2023-11-15
+ */
+@Service
+public class ColumnMenuSubServiceImpl extends ServiceImpl<ColumnMenuSubMapper, ColumnMenuSub> implements ColumnMenuSubService {
+
+    @Override
+    public List<ColumnMenuSubVo> getList(ColumnMenuSubSelectDto dto) {
+        IWrapper<ColumnMenuSub> wrapper = getWrapper();
+        wrapper.eq("cms", ColumnMenuSub::getColumnId,dto.getColumnId());
+        wrapper.orderByAsc("cms", ColumnMenuSub::getSort);
+        List<ColumnMenuSubVo> list = this.baseMapper.getList(wrapper);
+        return list;
+    }
+
+    @Override
+    public Page<ColumnMenuSubVo> getPage(ColumnMenuSubSelectDto dto) {
+        IWrapper<ColumnMenuSub> wrapper = getWrapper();
+        wrapper.orderByDesc("cms", ColumnMenuSub::getId);
+        Page<ColumnMenuSubVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public ColumnMenuSubVo detail(Long id) {
+        ColumnMenuSub ColumnMenuSub = this.getById(id);
+        ColumnMenuSubVo result = BeanUtil.toBean(ColumnMenuSub, ColumnMenuSubVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(ColumnMenuSubDto columnMenuSubDto) {
+        this.save(columnMenuSubDto);
+    }
+
+    @Override
+    public void edit(ColumnMenuSubDto columnMenuSubDto) {
+        this.updateById(columnMenuSubDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+
+
+    }
+
+    @Transactional
+    public void handleColumnMenuSub(Long id, List<ColumnMenuSub> columnMenuSubList) {
+        //获取已有子栏目
+        IWrapper<ColumnMenuSub> wrapper = getWrapper();
+        wrapper.eq("cms", ColumnMenuSub::getColumnId,id);
+        List<ColumnMenuSubVo> list = this.baseMapper.getList(wrapper);
+        //用于删除子栏目
+        Map<Long, ColumnMenuSubVo> map = list.stream().collect(Collectors.toMap(ColumnMenuSub::getId, Function.identity()));
+
+        //新增修改
+        columnMenuSubList.stream().forEach(sub ->{
+            sub.setColumnId(id);
+            //判断新增修改
+            if (Objects.isNull(sub.getId())){
+               this.save(sub);
+            }else {
+                this.updateById(sub);
+                //去除已存在Id
+                map.remove(sub.getId());
+            }
+        });
+
+        //删除
+        map.forEach((key,value) ->{
+            //TODO判断文章
+            this.removeById(key);
+        });
+
+    }
+}

+ 31 - 0
hx-xmhjc/src/main/resources/mapper/column/ColumnMenuMapper.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fjhx.xmhjc.mapper.column.ColumnMenuMapper">
+    <select id="getList" resultType="com.fjhx.xmhjc.entity.column.vo.ColumnMenuVo">
+        select
+            cm.id,
+            cm.name,
+            cm.type,
+            cm.content,
+            cm.url,
+            cm.sort,
+            cm.status,
+            cm.list_type
+        from column_menu cm
+            ${ew.customSqlSegment}
+    </select>
+    <select id="getPage" resultType="com.fjhx.xmhjc.entity.column.vo.ColumnMenuVo">
+        select
+            cm.id,
+            cm.name,
+            cm.type,
+            cm.content,
+            cm.url,
+            cm.sort,
+            cm.status,
+            cm.list_type
+        from column_menu cm
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

+ 27 - 0
hx-xmhjc/src/main/resources/mapper/column/ColumnMenuSubMapper.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fjhx.xmhjc.mapper.column.ColumnMenuSubMapper">
+
+    <select id="getList" resultType="com.fjhx.xmhjc.entity.column.vo.ColumnMenuSubVo">
+        select
+            cms.id,
+            cms.column_id,
+            cms.name,
+            cms.sort,
+            cms.status
+        from column_menu_sub cms
+            ${ew.customSqlSegment}
+    </select>
+
+    <select id="getPage" resultType="com.fjhx.xmhjc.entity.column.vo.ColumnMenuSubVo">
+        select
+            cms.id,
+            cms.column_id,
+            cms.name,
+            cms.sort,
+            cms.status
+        from column_menu_sub cms
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.