代码更新

nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/param/SysParamController.java

@@ -3,13 +3,13 @@ package org.nl.system.controller.param;
 import cn.dev33.satoken.annotation.SaIgnore;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.modules.logging.annotation.Log;
 import org.nl.system.service.param.ISysParamService;
 import org.nl.system.service.param.dao.Param;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
@@ -31,16 +31,16 @@ import java.util.Map;
 @Slf4j
 @RestController
 @RequestMapping("/api/param")
+@RequiredArgsConstructor
 class SysParamController {
 
-    @Autowired
+    private final ISysParamService paramService;
-    private ISysParamService paramService;
     @GetMapping
     @Log("查询系统参数")
     @ApiOperation("查询系统参数")
     //@SaCheckPermission("param:list")
     public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page){
-        return new ResponseEntity<>(TableDataInfo.build(paramService.queryAll(whereJson, page)), HttpStatus.OK);
+        return new ResponseEntity<>(TableDataInfo.build(paramService.queryPage(whereJson, page)), HttpStatus.OK);
     }
 
     @PostMapping

nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/SysMenu.java

@@ -26,7 +26,7 @@ public class SysMenu implements Serializable {
     /**
      * 菜单标识
      */
-    @TableId(value = "menu_id", type = IdType.AUTO)
+    @TableId(value = "menu_id", type = IdType.NONE)
     private String menuId;
 
     /**

nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java

@@ -10,6 +10,7 @@ import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.system.domain.vo.MenuMetaVo;
 import org.nl.modules.system.domain.vo.MenuVo;
 import org.nl.modules.system.service.dto.MenuDto;
+import org.nl.modules.tools.IdUtil;
 import org.nl.system.service.menu.ISysMenuService;
 import org.nl.system.service.menu.dao.SysMenu;
 import org.nl.system.service.menu.dao.mapper.SysMenuMapper;
@@ -91,6 +92,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
                 throw new BadRequestException("外链必须以http://或者https://开头");
             }
         }
+        resources.setMenuId(IdUtil.getStringId());
         baseMapper.insert(resources);
         // 计算子节点数目
         resources.setSubCount(0);

nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/ISysParamService.java

@@ -1,11 +1,9 @@
 package org.nl.system.service.param;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.system.service.param.dao.Param;
-import org.nl.system.service.param.dto.ParamQuery;
-import org.springframework.data.domain.Pageable;
 
 import java.util.List;
 import java.util.Map;
@@ -22,32 +20,37 @@ public interface ISysParamService extends IService<Param> {
 
     /**
      * 分页查找
-     * @param whereJson
+     *
-     * @param page
+     * @param whereJson 参数列表
+     * @param page      分页信息
      * @return
      */
-    IPage<Param> queryAll(Map whereJson, PageQuery page);
+    Page<Param> queryPage(Map whereJson, PageQuery page);
 
     /**
      * 创建参数
+     *
      * @param param
      */
     void create(Param param);
 
     /**
      * 更新
+     *
      * @param param
      */
     void update(Param param);
 
     /**
      * 删除
+     *
      * @param ids
      */
     void deleteByIds(List<String> ids);
 
     /**
      * 根据编码查询
+     *
      * @param code code
      * @return Param
      */

nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java

@@ -4,8 +4,10 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.common.utils.SecurityUtils;
@@ -13,7 +15,6 @@ import org.nl.modules.tools.MapOf;
 import org.nl.system.service.param.ISysParamService;
 import org.nl.system.service.param.dao.Param;
 import org.nl.system.service.param.dao.mapper.SysParamMapper;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -29,17 +30,18 @@ import java.util.Map;
  * @since 2022-12-14
  */
 @Service
+@RequiredArgsConstructor
+@Slf4j
 public class SysParamServiceImpl extends ServiceImpl<SysParamMapper, Param> implements ISysParamService {
 
-    @Autowired
+    private final SysParamMapper paramMapper;
-    private SysParamMapper paramMapper;
 
     @Override
-    public IPage<Param> queryAll(Map whereJson, PageQuery page) {
+    public Page<Param> queryPage(Map whereJson, PageQuery page) {
         QueryWrapper<Param> queryWrapper = new QueryWrapper<>();
         queryWrapper.orderBy(true, true, "create_time");
-        IPage<Param> paramIPage = paramMapper.selectPage(page.build(), queryWrapper);
+        Page<Param> paramPage = paramMapper.selectPage(page.build(), queryWrapper);
-        return paramIPage;
+        return paramPage;
     }
 
     @Override
@@ -47,7 +49,7 @@ public class SysParamServiceImpl extends ServiceImpl<SysParamMapper, Param> impl
     public void create(Param param) {
         List code = paramMapper.selectByMap(MapOf.of("code", param.getCode()));
         if (ObjectUtil.isNotEmpty(code)) throw new BadRequestException("编码不能一致");
-        param.setId(IdUtil.getSnowflake(1,1).nextIdStr());
+        param.setId(IdUtil.getSnowflake(1, 1).nextIdStr());
         String currentUserId = SecurityUtils.getCurrentUserId();
         String nickName = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
@@ -79,9 +81,8 @@ public class SysParamServiceImpl extends ServiceImpl<SysParamMapper, Param> impl
 
     @Override
     public Param findByCode(String code) {
-//        List<Param> paramList = paramMapper.selectByMap(MapOf.of("code", code));
+        QueryWrapper<Param> queryWrapper = new QueryWrapper<>();
-        QueryWrapper<Param> queryWrapper=new QueryWrapper<>();
+        queryWrapper.eq("code", code);
-        queryWrapper.eq("code",code);
         Param param = paramMapper.selectOne(queryWrapper);
         return param;
     }

nladmin-ui/src/views/system/menu/index.vue

@@ -138,8 +138,6 @@
     >
       <el-table-column type="selection" width="55" />
       <el-table-column label="菜单标题" prop="title" :min-width="flexWidth('title',crud.data,'菜单标题')" />
-      <el-table-column label="菜单标识" prop="menuId" :min-width="flexWidth('title',crud.data,'菜单标识')" />
-      <el-table-column label="菜单标识" prop="menu_id" :min-width="flexWidth('title',crud.data,'菜单标识')" />
       <el-table-column label="子系统" prop="system_type" :min-width="flexWidth('system_type',crud.data,'子系统')" />
       <el-table-column prop="icon" label="图标" align="center" :min-width="flexWidth('icon',crud.data,'图标')">
         <template slot-scope="scope">