From 936dbe1f11369f9e03ef817a114390e6e13219c4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 01 Jun 2022 16:52:29 +0800
Subject: [PATCH] 20220527

---
 src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/NavigationBarServiceImpl.java |   68 +++++++++++++++++++++++-----------
 1 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/NavigationBarServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/NavigationBarServiceImpl.java
index a0f0c40..f72cd93 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/NavigationBarServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/NavigationBarServiceImpl.java
@@ -3,14 +3,17 @@
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xcong.farmer.cms.common.response.Result;
 import com.xcong.farmer.cms.modules.system.dto.AdminAddBarDto;
+import com.xcong.farmer.cms.modules.system.dto.AdminDeleteDto;
 import com.xcong.farmer.cms.modules.system.dto.AdminNavigationBarDto;
 import com.xcong.farmer.cms.modules.system.dto.AdminUpdateBarDto;
 import com.xcong.farmer.cms.modules.system.entity.NavigationBarEntity;
 import com.xcong.farmer.cms.modules.system.mapper.NavigationBarMapper;
+import com.xcong.farmer.cms.modules.system.mapper.UserRoleMapper;
 import com.xcong.farmer.cms.modules.system.service.INavigationBarService;
 import com.xcong.farmer.cms.modules.system.vo.AdminNavigationBarVo;
 import com.xcong.farmer.cms.modules.system.vo.AdminSeeBarInfoVo;
@@ -24,24 +27,29 @@
 import cn.hutool.core.util.ObjectUtil;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
+
 
 @Service
 @Slf4j
 public class NavigationBarServiceImpl extends ServiceImpl<NavigationBarMapper, NavigationBarEntity> implements INavigationBarService {
+
+    @Resource
+    private NavigationBarMapper navigationBarMapper;
 
     @Override
     public Result getBarInPage(AdminNavigationBarDto adminNavigationBarDto) {
         Page<AdminNavigationBarVo> page = new Page<>(adminNavigationBarDto.getPageNum(), adminNavigationBarDto.getPageSize());
         NavigationBarEntity navigationBarEntity = new NavigationBarEntity();
         navigationBarEntity.setParentId(NavigationBarEntity.PARENTID_DEFAULT);
-        IPage<AdminNavigationBarVo> list = this.baseMapper.selectAdminNavigationBarVoInPage(page,navigationBarEntity);
+        IPage<AdminNavigationBarVo> list = navigationBarMapper.selectAdminNavigationBarVoInPage(page,navigationBarEntity);
         List<AdminNavigationBarVo> records = list.getRecords();
         if(CollUtil.isNotEmpty(records)){
             for(AdminNavigationBarVo adminNavigationBarVo : records){
                 Long id = adminNavigationBarVo.getId();
                 QueryWrapper<NavigationBarEntity> objectQueryWrapper = new QueryWrapper<>();
                 objectQueryWrapper.eq("parent_id",id);
-                List<NavigationBarEntity> navigationBarEntities = this.baseMapper.selectList(objectQueryWrapper);
+                List<NavigationBarEntity> navigationBarEntities = navigationBarMapper.selectList(objectQueryWrapper);
                 List<AdminNavigationBarVo> adminNavigationBarVoChilds = new ArrayList<>();
                 if(CollUtil.isNotEmpty(navigationBarEntities)){
                     for(NavigationBarEntity navigationBarEntityChild : navigationBarEntities){
@@ -49,7 +57,7 @@
                         child.setId(navigationBarEntityChild.getId());
                         child.setBarName(navigationBarEntityChild.getBarName());
                         child.setLinkUrl(navigationBarEntityChild.getLinkUrl());
-                        child.setDescribe(navigationBarEntityChild.getDescribe());
+                        child.setRemark(navigationBarEntityChild.getRemark());
                         child.setPic(navigationBarEntityChild.getPic());
                         child.setOrderNum(navigationBarEntityChild.getOrderNum());
                         adminNavigationBarVoChilds.add(child);
@@ -88,34 +96,34 @@
         if(StrUtil.isNotEmpty(pic)){
             navigationBarEntity.setPic(pic);
         }
-        String describe = adminAddBarDto.getDescribe();
-        if(StrUtil.isNotEmpty(describe)){
-            navigationBarEntity.setDescribe(describe);
+        String remark = adminAddBarDto.getRemark();
+        if(StrUtil.isNotEmpty(remark)){
+            navigationBarEntity.setRemark(remark);
         }
-        this.baseMapper.insert(navigationBarEntity);
+        navigationBarMapper.insert(navigationBarEntity);
         return Result.ok("添加成功");
     }
 
     @Override
     @Transactional
     public Result deleteBar(Long id) {
-        NavigationBarEntity navigationBarEntity = this.baseMapper.selectById(id);
+        NavigationBarEntity navigationBarEntity = navigationBarMapper.selectById(id);
         if(ObjectUtil.isEmpty(navigationBarEntity)){
             return Result.fail("导航栏不存在");
         }
         QueryWrapper<NavigationBarEntity> objectQueryWrapper = new QueryWrapper<>();
         objectQueryWrapper.eq("parent_id",id);
-        List<NavigationBarEntity> navigationBarEntities = this.baseMapper.selectList(objectQueryWrapper);
+        List<NavigationBarEntity> navigationBarEntities = navigationBarMapper.selectList(objectQueryWrapper);
         if(CollUtil.isNotEmpty(navigationBarEntities)){
             return Result.fail("请先清空它的二级导航栏");
         }
-        this.baseMapper.deleteById(id);
+        navigationBarMapper.deleteById(id);
         return Result.ok("删除成功");
     }
 
     @Override
     public Result seeBarInfo(Long id) {
-        NavigationBarEntity navigationBarEntity = this.baseMapper.selectById(id);
+        NavigationBarEntity navigationBarEntity = navigationBarMapper.selectById(id);
         if(ObjectUtil.isEmpty(navigationBarEntity)){
             return Result.fail("导航栏不存在");
         }
@@ -123,7 +131,7 @@
         adminSeeBarInfoVo.setId(navigationBarEntity.getId());
         adminSeeBarInfoVo.setBarName(navigationBarEntity.getBarName());
         adminSeeBarInfoVo.setLinkUrl(navigationBarEntity.getLinkUrl());
-        adminSeeBarInfoVo.setDescribe(navigationBarEntity.getDescribe());
+        adminSeeBarInfoVo.setRemark(navigationBarEntity.getRemark());
         adminSeeBarInfoVo.setOrderNum(navigationBarEntity.getOrderNum());
         adminSeeBarInfoVo.setPic(navigationBarEntity.getPic());
         adminSeeBarInfoVo.setParentId(navigationBarEntity.getParentId());
@@ -137,7 +145,7 @@
         if(ObjectUtil.isEmpty(id)){
             return Result.fail("导航栏不存在");
         }
-        NavigationBarEntity navigationBarEntity = this.baseMapper.selectById(id);
+        NavigationBarEntity navigationBarEntity = navigationBarMapper.selectById(id);
         if(ObjectUtil.isEmpty(navigationBarEntity)){
             return Result.fail("导航栏不存在");
         }
@@ -164,23 +172,21 @@
         if(StrUtil.isNotEmpty(pic)){
             navigationBarEntity.setPic(pic);
         }
-        String describe = adminUpdateMenuDto.getDescribe();
-        if(StrUtil.isNotEmpty(describe)){
-            navigationBarEntity.setDescribe(describe);
+        String remark = adminUpdateMenuDto.getRemark();
+        if(StrUtil.isNotEmpty(remark)){
+            navigationBarEntity.setRemark(remark);
         }
-        this.baseMapper.updateById(navigationBarEntity);
+        navigationBarMapper.updateById(navigationBarEntity);
         return Result.ok("更新成功");
     }
 
     @Override
     public Result getBarInList() {
-        List<AdminNavigationBarVo> records = this.baseMapper.selectAdminNavigationBarVoByParentId(NavigationBarEntity.PARENTID_DEFAULT);
+        List<AdminNavigationBarVo> records = navigationBarMapper.selectAdminNavigationBarVoByParentId(NavigationBarEntity.PARENTID_DEFAULT);
         if(CollUtil.isNotEmpty(records)){
             for(AdminNavigationBarVo adminNavigationBarVo : records){
                 Long id = adminNavigationBarVo.getId();
-                QueryWrapper<NavigationBarEntity> objectQueryWrapper = new QueryWrapper<>();
-                objectQueryWrapper.eq("parent_id",id);
-                List<NavigationBarEntity> navigationBarEntities = this.baseMapper.selectList(objectQueryWrapper);
+                List<NavigationBarEntity> navigationBarEntities = navigationBarMapper.selectListByParentId(id);
                 List<AdminNavigationBarVo> adminNavigationBarVoChilds = new ArrayList<>();
                 if(CollUtil.isNotEmpty(navigationBarEntities)){
                     for(NavigationBarEntity navigationBarEntityChild : navigationBarEntities){
@@ -188,7 +194,7 @@
                         child.setId(navigationBarEntityChild.getId());
                         child.setBarName(navigationBarEntityChild.getBarName());
                         child.setLinkUrl(navigationBarEntityChild.getLinkUrl());
-                        child.setDescribe(navigationBarEntityChild.getDescribe());
+                        child.setRemark(navigationBarEntityChild.getRemark());
                         child.setPic(navigationBarEntityChild.getPic());
                         child.setOrderNum(navigationBarEntityChild.getOrderNum());
                         adminNavigationBarVoChilds.add(child);
@@ -199,4 +205,22 @@
         }
         return Result.ok(records);
     }
+
+    @Override
+    @Transactional
+    public Result delObjs(AdminDeleteDto adminDeleteDto) {
+        String ids = adminDeleteDto.getIds();
+        if(StrUtil.isNotEmpty(ids)){
+            String[] barIds = ids.split(StringPool.COMMA);
+            for(String barIdStr : barIds){
+                Long barId = Long.valueOf(barIdStr);
+                QueryWrapper<NavigationBarEntity> objectQueryWrapper = new QueryWrapper<>();
+                objectQueryWrapper.eq("parent_id",barId);
+                navigationBarMapper.delete(objectQueryWrapper);
+
+                navigationBarMapper.deleteById(barId);
+            }
+        }
+        return Result.ok("删除成功");
+    }
 }

--
Gitblit v1.9.1