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

hx-xmhjc/src/main/java/com/fjhx/xmhjc/controller/column/ColumnArticleController.java

@@ -74,4 +74,6 @@ public class ColumnArticleController {
         columnArticleService.delete(dto.getId());
     }
 
+
+
 }

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

@@ -9,6 +9,8 @@ import com.ruoyi.common.core.domain.BaseSelectDto;
 import com.fjhx.xmhjc.service.column.ColumnMenuService;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.util.List;
+
 
 /**
  * 栏目菜单表 前端控制器
@@ -26,6 +28,14 @@ public class ColumnMenuController {
     /**
      * 栏目菜单表分页
      */
+    @PostMapping("/list")
+    public List<ColumnMenuVo> list(@RequestBody ColumnMenuSelectDto dto) {
+        return columnMenuService.getList(dto);
+    }
+
+    /**
+     * 栏目菜单表分页
+     */
     @PostMapping("/page")
     public Page<ColumnMenuVo> page(@RequestBody ColumnMenuSelectDto dto) {
         return columnMenuService.getPage(dto);
@@ -63,4 +73,15 @@ public class ColumnMenuController {
         columnMenuService.delete(dto.getId());
     }
 
+
+    /**
+     * 栏目菜单表分页
+     */
+    @PostMapping("/getListByOpen")
+    public List<ColumnMenuVo> getListByOpen(@RequestBody ColumnMenuSelectDto dto) {
+        dto.setStatus("1");
+        dto.setType("1");
+        return columnMenuService.getList(dto);
+    }
+
 }

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

@@ -1,5 +1,7 @@
 package com.fjhx.xmhjc.controller.column;
 
+import com.fjhx.xmhjc.entity.column.dto.ColumnMenuSelectDto;
+import com.fjhx.xmhjc.entity.column.vo.ColumnMenuVo;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.xmhjc.entity.column.vo.ColumnMenuSubVo;
@@ -9,6 +11,8 @@ import com.ruoyi.common.core.domain.BaseSelectDto;
 import com.fjhx.xmhjc.service.column.ColumnMenuSubService;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.util.List;
+
 
 /**
  * 栏目-子栏目 前端控制器
@@ -63,4 +67,22 @@ public class ColumnMenuSubController {
         columnMenuSubService.delete(dto.getId());
     }
 
+    /**
+     * 栏目-子栏目删除
+     */
+    @PostMapping("/checkDelete")
+    public Boolean checkDelete(@RequestBody BaseSelectDto dto) {
+        return columnMenuSubService.checkDelete(dto.getId());
+    }
+
+
+    /**
+     * 栏目菜单表分页
+     */
+    @PostMapping("/getSubListByOpen")
+    public List<ColumnMenuSubVo> getListByOpen(@RequestBody ColumnMenuSubSelectDto dto) {
+        dto.setStatus("1");
+        return columnMenuSubService.getList(dto);
+    }
+
 }

hx-xmhjc/src/main/java/com/fjhx/xmhjc/entity/column/dto/ColumnArticleSelectDto.java

@@ -13,5 +13,10 @@ import lombok.Setter;
 @Getter
 @Setter
 public class ColumnArticleSelectDto extends BaseSelectDto {
+    private String status;
+    private Long columnId;
+    private Long subId;
+
+    private String title;
 
 }

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

@@ -14,4 +14,12 @@ import lombok.Setter;
 @Setter
 public class ColumnMenuSelectDto extends BaseSelectDto {
 
+
+    private String status;
+
+    /**
+     * 栏目类型1=列表；2=图文；3=外链
+     */
+    private String type;
+
 }

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

@@ -19,4 +19,6 @@ public class ColumnMenuSubSelectDto extends BaseSelectDto {
      */
     private Long columnId;
 
+    private String status;
+
 }

hx-xmhjc/src/main/java/com/fjhx/xmhjc/entity/column/vo/ColumnArticleVo.java

@@ -19,6 +19,10 @@ import java.util.List;
 public class ColumnArticleVo extends ColumnArticle {
 
 
+    private String columnIdName;
+
+    private String subIdName;
+
     /**
      * 封面
      */

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

@@ -7,6 +7,8 @@ import com.fjhx.xmhjc.entity.column.vo.ColumnMenuVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 
 /**
  * <p>
@@ -21,7 +23,7 @@ public interface ColumnMenuMapper extends BaseMapper<ColumnMenu> {
     /**
      * 栏目菜单表列表
      */
-    Page<ColumnMenuVo> getList(@Param("ew") IWrapper<ColumnMenu> wrapper);
+    List<ColumnMenuVo> getList(@Param("ew") IWrapper<ColumnMenu> wrapper);
     /**
      * 栏目菜单表分页
      */

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

@@ -23,7 +23,7 @@ import java.util.List;
 public interface ColumnMenuSubMapper extends BaseMapper<ColumnMenuSub> {
 
     /**
-     * 关于我们-企业文化列表
+     * 栏目-子栏目列表
      */
     List<ColumnMenuSubVo> getList(@Param("ew") IWrapper<ColumnMenuSub> wrapper);
 

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

@@ -7,6 +7,8 @@ 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 java.util.List;
+
 
 /**
  * <p>
@@ -19,8 +21,11 @@ import com.fjhx.xmhjc.entity.column.dto.ColumnMenuDto;
 public interface ColumnMenuService extends BaseService<ColumnMenu> {
 
     /**
-     * 栏目菜单表分页
+     * 栏目菜单表列表
      */
+    List<ColumnMenuVo> getList(ColumnMenuSelectDto dto);
+
+
     Page<ColumnMenuVo> getPage(ColumnMenuSelectDto dto);
 
     /**
@@ -43,4 +48,5 @@ public interface ColumnMenuService extends BaseService<ColumnMenu> {
      */
     void delete(Long id);
 
+
 }

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

@@ -47,4 +47,5 @@ public interface ColumnMenuSubService extends BaseService<ColumnMenuSub> {
      */
     void delete(Long id);
 
+    Boolean checkDelete(Long id);
 }

hx-xmhjc/src/main/java/com/fjhx/xmhjc/service/column/impl/ColumnArticleServiceImpl.java

@@ -1,11 +1,19 @@
 package com.fjhx.xmhjc.service.column.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.xmhjc.entity.about.po.AboutUsCulture;
+import com.fjhx.xmhjc.entity.column.dto.ColumnMenuSelectDto;
+import com.fjhx.xmhjc.entity.column.dto.ColumnMenuSubSelectDto;
 import com.fjhx.xmhjc.entity.column.po.ColumnArticle;
+import com.fjhx.xmhjc.entity.column.po.ColumnMenu;
+import com.fjhx.xmhjc.entity.column.vo.ColumnMenuSubVo;
+import com.fjhx.xmhjc.entity.column.vo.ColumnMenuVo;
 import com.fjhx.xmhjc.mapper.column.ColumnArticleMapper;
 import com.fjhx.xmhjc.service.column.ColumnArticleService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.xmhjc.service.column.ColumnMenuService;
+import com.fjhx.xmhjc.service.column.ColumnMenuSubService;
 import com.ruoyi.common.utils.wrapper.SqlField;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -15,7 +23,11 @@ import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.fjhx.xmhjc.entity.column.dto.ColumnArticleDto;
 import cn.hutool.core.bean.BeanUtil;
 
+import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -28,10 +40,27 @@ import java.util.List;
 @Service
 public class ColumnArticleServiceImpl extends ServiceImpl<ColumnArticleMapper, ColumnArticle> implements ColumnArticleService {
 
+    @Resource
+    private ColumnMenuService columnMenuService;
+    @Resource
+    private ColumnMenuSubService columnMenuSubService;
+
     @Override
     public List<ColumnArticleVo> getList(ColumnArticleSelectDto dto) {
         IWrapper<ColumnArticle> wrapper = getWrapper();
         wrapper.keyword(dto, new SqlField("ca", ColumnArticle::getSort));
+        if(StrUtil.isNotBlank(dto.getStatus())){
+            wrapper.eq("ca", ColumnArticle::getStatus, dto.getStatus());
+        }
+        if(Objects.nonNull(dto.getColumnId())){
+            wrapper.eq("ca", ColumnArticle::getColumnId, dto.getColumnId());
+        }
+        if(Objects.nonNull(dto.getSubId())){
+            wrapper.eq("ca", ColumnArticle::getSubId, dto.getSubId());
+        }
+        if(StrUtil.isNotBlank(dto.getStatus())){
+            wrapper.like("ca", ColumnArticle::getTitle, dto.getTitle());
+        }
         wrapper.orderByAsc("ca", ColumnArticle::getSort);
         List<ColumnArticleVo> list = this.baseMapper.getList(wrapper);
         return list;
@@ -40,8 +69,27 @@ public class ColumnArticleServiceImpl extends ServiceImpl<ColumnArticleMapper, C
     @Override
     public Page<ColumnArticleVo> getPage(ColumnArticleSelectDto dto) {
         IWrapper<ColumnArticle> wrapper = getWrapper();
+        wrapper.keyword(dto, new SqlField("ca", ColumnArticle::getSort));
+        if(StrUtil.isNotBlank(dto.getStatus())){
+            wrapper.eq("ca", ColumnArticle::getStatus, dto.getStatus());
+        }
+        if(Objects.nonNull(dto.getColumnId())){
+            wrapper.eq("ca", ColumnArticle::getColumnId, dto.getColumnId());
+        }
+        if(Objects.nonNull(dto.getSubId())){
+            wrapper.eq("ca", ColumnArticle::getSubId, dto.getSubId());
+        }
         wrapper.orderByDesc("ca", ColumnArticle::getId);
         Page<ColumnArticleVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+
+        Map<Long, String> map = columnMenuService.getList(new ColumnMenuSelectDto()).stream().collect(Collectors.toMap(ColumnMenuVo::getId, ColumnMenuVo::getName));
+        Map<Long, String> map1 = columnMenuSubService.getList(new ColumnMenuSubSelectDto()).stream().collect(Collectors.toMap(ColumnMenuSubVo::getId, ColumnMenuSubVo::getName));
+
+        page.getRecords().forEach(article ->{
+            article.setColumnIdName(map.getOrDefault(article.getColumnId(),""));
+            article.setSubIdName(map1.getOrDefault(article.getSubId(),""));
+        } );
+
         return page;
     }
 

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

@@ -1,8 +1,10 @@
 package com.fjhx.xmhjc.service.column.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.fjhx.xmhjc.entity.about.po.AboutUsCulture;
 import com.fjhx.xmhjc.entity.column.dto.ColumnMenuSubSelectDto;
 import com.fjhx.xmhjc.entity.column.po.ColumnMenu;
+import com.fjhx.xmhjc.entity.column.po.ColumnMenuSub;
 import com.fjhx.xmhjc.entity.column.vo.ColumnMenuSubVo;
 import com.fjhx.xmhjc.mapper.column.ColumnMenuMapper;
 import com.fjhx.xmhjc.service.column.ColumnMenuService;
@@ -38,9 +40,26 @@ public class ColumnMenuServiceImpl extends ServiceImpl<ColumnMenuMapper, ColumnM
 
 
     @Override
+    public List<ColumnMenuVo> getList(ColumnMenuSelectDto dto) {
+        IWrapper<ColumnMenu> wrapper = getWrapper();
+        if(StrUtil.isNotBlank(dto.getStatus())){
+            wrapper.eq("cm", ColumnMenu::getStatus, dto.getStatus());
+        }
+        if(StrUtil.isNotBlank(dto.getType())){
+            wrapper.eq("cm", ColumnMenu::getType, dto.getType());
+        }
+        wrapper.orderByAsc("cm", ColumnMenu::getSort);
+        List<ColumnMenuVo> page = this.baseMapper.getList(wrapper);
+        return page;
+    }
+
+    @Override
     public Page<ColumnMenuVo> getPage(ColumnMenuSelectDto dto) {
         IWrapper<ColumnMenu> wrapper = getWrapper();
         wrapper.keyword(dto,new SqlField("cm", ColumnMenu::getName));
+        if(StrUtil.isNotBlank(dto.getStatus())){
+            wrapper.eq("cm", ColumnMenu::getStatus, dto.getStatus());
+        }
         wrapper.orderByAsc("cm", ColumnMenu::getSort);
         Page<ColumnMenuVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         return page;
@@ -82,5 +101,4 @@ public class ColumnMenuServiceImpl extends ServiceImpl<ColumnMenuMapper, ColumnM
 
 
     }
-
 }

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

@@ -1,9 +1,16 @@
 package com.fjhx.xmhjc.service.column.impl;
 
+import cn.hutool.core.util.StrUtil;
+import com.fjhx.xmhjc.entity.column.dto.ColumnArticleSelectDto;
+import com.fjhx.xmhjc.entity.column.po.ColumnMenu;
 import com.fjhx.xmhjc.entity.column.po.ColumnMenuSub;
+import com.fjhx.xmhjc.entity.column.vo.ColumnArticleVo;
+import com.fjhx.xmhjc.entity.product.po.ProductCategory;
 import com.fjhx.xmhjc.mapper.column.ColumnMenuSubMapper;
+import com.fjhx.xmhjc.service.column.ColumnArticleService;
 import com.fjhx.xmhjc.service.column.ColumnMenuSubService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.StringUtils;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.xmhjc.entity.column.vo.ColumnMenuSubVo;
@@ -13,6 +20,7 @@ import com.fjhx.xmhjc.entity.column.dto.ColumnMenuSubDto;
 import cn.hutool.core.bean.BeanUtil;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -31,10 +39,16 @@ import java.util.stream.Collectors;
 @Service
 public class ColumnMenuSubServiceImpl extends ServiceImpl<ColumnMenuSubMapper, ColumnMenuSub> implements ColumnMenuSubService {
 
+    @Resource
+    private ColumnArticleService columnArticleService;
+
     @Override
     public List<ColumnMenuSubVo> getList(ColumnMenuSubSelectDto dto) {
         IWrapper<ColumnMenuSub> wrapper = getWrapper();
         wrapper.eq("cms", ColumnMenuSub::getColumnId,dto.getColumnId());
+        if(StrUtil.isNotBlank(dto.getStatus())){
+            wrapper.eq("cms", ColumnMenuSub::getStatus, dto.getStatus());
+        }
         wrapper.orderByAsc("cms", ColumnMenuSub::getSort);
         List<ColumnMenuSubVo> list = this.baseMapper.getList(wrapper);
         return list;
@@ -43,6 +57,9 @@ public class ColumnMenuSubServiceImpl extends ServiceImpl<ColumnMenuSubMapper, C
     @Override
     public Page<ColumnMenuSubVo> getPage(ColumnMenuSubSelectDto dto) {
         IWrapper<ColumnMenuSub> wrapper = getWrapper();
+        if(StrUtil.isNotBlank(dto.getStatus())){
+            wrapper.eq("cms", ColumnMenuSub::getStatus, dto.getStatus());
+        }
         wrapper.orderByDesc("cms", ColumnMenuSub::getId);
         Page<ColumnMenuSubVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         return page;
@@ -68,8 +85,17 @@ public class ColumnMenuSubServiceImpl extends ServiceImpl<ColumnMenuSubMapper, C
     @Override
     public void delete(Long id) {
         this.removeById(id);
+    }
 
-
+    @Override
+    public Boolean checkDelete(Long id) {
+        ColumnArticleSelectDto columnArticleSelectDto = new ColumnArticleSelectDto();
+        columnArticleSelectDto.setSubId(id);
+        List<ColumnArticleVo> list = columnArticleService.getList(columnArticleSelectDto);
+        if (list.isEmpty()){
+            return  true;
+        }
+        return false;
     }
 
     @Transactional
@@ -97,7 +123,9 @@ public class ColumnMenuSubServiceImpl extends ServiceImpl<ColumnMenuSubMapper, C
         //删除
         map.forEach((key,value) ->{
             //TODO判断文章
-            this.removeById(key);
+            if (checkDelete(key)){
+                this.removeById(key);
+            }
         });
 
     }