src/main/java/com/muyu/system/controller/AtomController.java

@@ -1,20 +0,0 @@
-package com.muyu.system.controller;
-
-import com.muyu.common.core.web.controller.BaseController;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * @Author: 胡杨
- * @Name: Atom
- * @Description: 原子表控制层
- * @CreatedDate: 2024/8/27 下午9:57
- * @FilePath: com.muyu.system.controller
- */
-@Slf4j
-@RestController
-@RequestMapping("/Atom")
-public class AtomController extends BaseController {
-
-}

src/main/java/com/muyu/system/domain/Atom.java

@@ -1,31 +0,0 @@
-package com.muyu.system.domain;
-
-import lombok.*;
-
-/**
- * @Author: 胡杨
- * @Name: Atom
- * @Description: 原子表
- * @CreatedDate: 2024/8/27 下午9:55
- * @FilePath: com.muyu.quest.domain
- */
-
-@Data
-@Builder
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
-public class Atom {
-
-    /** 字段编码 */
-    private String key;
-
-    /** 字段值 */
-    private String value;
-
-    /** 字段名称 */
-    private String name;
-
-    /** 字段类型 */
-    private String type;
-}

src/main/java/com/muyu/system/mapper/AtomMapper.java

@@ -1,21 +0,0 @@
-package com.muyu.system.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.muyu.system.domain.Atom;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-
-/**
- * @Author: 胡杨
- * @Name: Atom
- * @Description: 原子类持久层
- * @CreatedDate: 2024/8/27 下午9:59
- * @FilePath: com.muyu.system.mapper
- */
-
-
-@Repository
-@Mapper
-public interface AtomMapper extends BaseMapper<Atom> {
-}

src/main/java/com/muyu/system/mapper/SysDeptMapper.java

@@ -11,7 +11,7 @@ import java.util.List;
  *
  * @author muyu
  */
-public interface SysDeptMapper {
+public interface SysDeptMapper extends BaseMapper<SysDept> {
     /**
      * 查询部门管理数据
      *

src/main/java/com/muyu/system/mapper/SysDictDataMapper.java

@@ -11,7 +11,7 @@ import java.util.List;
  *
  * @author muyu
  */
-public interface SysDictDataMapper {
+public interface SysDictDataMapper  extends BaseMapper<SysDictData> {
     /**
      * 根据条件分页查询字典数据
      *

src/main/java/com/muyu/system/mapper/SysDictTypeMapper.java

@@ -10,7 +10,7 @@ import java.util.List;
  *
  * @author muyu
  */
-public interface SysDictTypeMapper {
+public interface SysDictTypeMapper extends BaseMapper<SysDictType> {
     /**
      * 根据条件分页查询字典类型
      *

src/main/java/com/muyu/system/mapper/SysLogininforMapper.java

@@ -10,7 +10,7 @@ import java.util.List;
  *
  * @author muyu
  */
-public interface SysLogininforMapper {
+public interface SysLogininforMapper extends BaseMapper<SysLogininfor> {
     /**
      * 新增系统登录日志
      *

src/main/java/com/muyu/system/mapper/SysMenuMapper.java

@@ -11,7 +11,7 @@ import java.util.List;
  *
  * @author muyu
  */
-public interface SysMenuMapper {
+public interface SysMenuMapper extends BaseMapper<SysMenu> {
     /**
      * 查询系统菜单列表
      *

src/main/java/com/muyu/system/mapper/SysNoticeMapper.java

@@ -14,7 +14,7 @@ import java.util.List;
  *
  * @author muyu
  */
-public interface SysNoticeMapper {
+public interface SysNoticeMapper extends BaseMapper<SysNotice> {
     /**
      * 查询公告信息
      *

src/main/java/com/muyu/system/mapper/SysOperLogMapper.java

@@ -10,7 +10,7 @@ import java.util.List;
  *
  * @author muyu
  */
-public interface SysOperLogMapper {
+public interface SysOperLogMapper extends BaseMapper<SysOperLog> {
     /**
      * 新增操作日志
      *

src/main/java/com/muyu/system/mapper/SysPostMapper.java

@@ -10,7 +10,7 @@ import java.util.List;
  *
  * @author muyu
  */
-public interface SysPostMapper {
+public interface SysPostMapper extends BaseMapper<SysPost> {
     /**
      * 查询岗位数据集合
      *

src/main/java/com/muyu/system/mapper/SysRoleDeptMapper.java

@@ -11,7 +11,7 @@ import java.util.List;
  *
  * @author muyu
  */
-public interface SysRoleDeptMapper {
+public interface SysRoleDeptMapper extends BaseMapper<SysRoleDept> {
     /**
      * 通过角色ID删除角色和部门关联
      *

src/main/java/com/muyu/system/mapper/SysRoleMapper.java

@@ -10,7 +10,7 @@ import java.util.List;
  *
  * @author muyu
  */
-public interface SysRoleMapper {
+public interface SysRoleMapper extends BaseMapper<SysRole> {
     /**
      * 根据条件分页查询角色数据
      *

src/main/java/com/muyu/system/mapper/SysRoleMenuMapper.java

@@ -11,7 +11,7 @@ import java.util.List;
  *
  * @author muyu
  */
-public interface SysRoleMenuMapper{
+public interface SysRoleMenuMapper extends BaseMapper<SysRoleMenu> {
     /**
      * 查询菜单使用数量
      *

src/main/java/com/muyu/system/mapper/SysUserMapper.java

@@ -11,7 +11,7 @@ import java.util.List;
  *
  * @author muyu
  */
-public interface SysUserMapper {
+public interface SysUserMapper extends BaseMapper<SysUser> {
     /**
      * 根据条件分页查询用户列表
      *

src/main/java/com/muyu/system/mapper/SysUserPostMapper.java

@@ -10,7 +10,7 @@ import java.util.List;
  *
  * @author muyu
  */
-public interface SysUserPostMapper{
+public interface SysUserPostMapper extends BaseMapper<SysUserPost> {
     /**
      * 通过用户ID删除用户和岗位关联
      *

src/main/java/com/muyu/system/mapper/SysUserRoleMapper.java

@@ -11,7 +11,7 @@ import java.util.List;
  *
  * @author muyu
  */
-public interface SysUserRoleMapper {
+public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
     /**
      * 通过用户ID删除用户和角色关联
      *

src/main/java/com/muyu/system/service/AtomService.java

@@ -1,16 +0,0 @@
-package com.muyu.system.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.muyu.system.domain.Atom;
-import com.muyu.system.domain.SysConfig;
-
-/**
- * @Author: 胡杨
- * @Name: Atom
- * @Description: 原子类持久层
- * @CreatedDate: 2024/8/27 下午10:00
- * @FilePath: com.muyu.system.service
- */
-
-public interface AtomService extends IService<Atom> {
-}

src/main/java/com/muyu/system/service/SysDeptService.java

@@ -12,7 +12,7 @@ import java.util.List;
  *
  * @author muyu
  */
-public interface SysDeptService{
+public interface SysDeptService extends IService<SysDept> {
     /**
      * 查询部门管理数据
      *

src/main/java/com/muyu/system/service/SysDictDataService.java

@@ -10,7 +10,7 @@ import java.util.List;
  *
  * @author muyu
  */
-public interface SysDictDataService {
+public interface SysDictDataService extends IService<SysDictData> {
     /**
      * 根据条件分页查询字典数据
      *

src/main/java/com/muyu/system/service/SysDictTypeService.java

@@ -11,7 +11,7 @@ import java.util.List;
  *
  * @author muyu
  */
-public interface SysDictTypeService{
+public interface SysDictTypeService extends IService<SysDictType> {
     /**
      * 根据条件分页查询字典类型
      *

src/main/java/com/muyu/system/service/SysLogininforService.java

@@ -10,7 +10,7 @@ import java.util.List;
  *
  * @author muyu
  */
-public interface SysLogininforService{
+public interface SysLogininforService extends IService<SysLogininfor> {
     /**
      * 新增系统登录日志
      *

src/main/java/com/muyu/system/service/SysMenuService.java

@@ -13,7 +13,7 @@ import java.util.Set;
  *
  * @author muyu
  */
-public interface SysMenuService{
+public interface SysMenuService extends IService<SysMenu> {
     /**
      * 根据用户查询系统菜单列表
      *

src/main/java/com/muyu/system/service/SysNoticeService.java

@@ -14,7 +14,7 @@ import java.util.List;
  *
  * @author muyu
  */
-public interface SysNoticeService{
+public interface SysNoticeService extends IService<SysNotice> {
     /**
      * 查询公告信息
      *

src/main/java/com/muyu/system/service/SysOperLogService.java

@@ -10,7 +10,7 @@ import java.util.List;
  *
  * @author muyu
  */
-public interface SysOperLogService{
+public interface SysOperLogService extends IService<SysOperLog> {
     /**
      * 新增操作日志
      *

src/main/java/com/muyu/system/service/SysPostService.java

@@ -10,7 +10,7 @@ import java.util.List;
  *
  * @author muyu
  */
-public interface SysPostService {
+public interface SysPostService extends IService<SysPost> {
     /**
      * 查询岗位信息集合
      *

src/main/java/com/muyu/system/service/SysRoleService.java

@@ -12,7 +12,7 @@ import java.util.Set;
  *
  * @author muyu
  */
-public interface SysRoleService {
+public interface SysRoleService extends IService<SysRole> {
     /**
      * 根据条件分页查询角色数据
      *

src/main/java/com/muyu/system/service/SysUserService.java

@@ -10,7 +10,7 @@ import java.util.List;
  *
  * @author muyu
  */
-public interface SysUserService{
+public interface SysUserService extends IService<SysUser> {
     /**
      * 根据条件分页查询用户列表
      *

src/main/java/com/muyu/system/service/impl/AtomServiceImpl.java

@@ -1,23 +0,0 @@
-package com.muyu.system.service.impl;
-
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.muyu.system.domain.Atom;
-import com.muyu.system.mapper.AtomMapper;
-import com.muyu.system.service.AtomService;
-import org.springframework.stereotype.Service;
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * @Author: 胡杨
- * @Name: Atom
- * @Description: 原子类实现层
- * @CreatedDate: 2024/8/27 下午10:00
- * @FilePath: com.muyu.system.service.impl
- */
-
-@Slf4j
-@Service
-public class AtomServiceImpl extends ServiceImpl<AtomMapper, Atom>
-        implements AtomService {
-}

src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java

@@ -30,7 +30,7 @@ import java.util.stream.Collectors;
  * @author muyu
  */
 @Service
-public class SysDeptServiceImpl implements SysDeptService {
+public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> implements SysDeptService {
     @Autowired
     private SysDeptMapper deptMapper;
 

src/main/java/com/muyu/system/service/impl/SysDictDataServiceImpl.java

@@ -8,7 +8,6 @@ import com.muyu.system.service.SysDictDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -17,8 +16,8 @@ import java.util.List;
  * @author muyu
  */
 @Service
-public class SysDictDataServiceImpl implements SysDictDataService {
-    @Resource
+public class SysDictDataServiceImpl extends ServiceImpl<SysDictDataMapper, SysDictData> implements SysDictDataService {
+    @Autowired
     private SysDictDataMapper dictDataMapper;
 
     /**

src/main/java/com/muyu/system/service/impl/SysDictTypeServiceImpl.java

@@ -26,7 +26,7 @@ import java.util.stream.Collectors;
  * @author muyu
  */
 @Service
-public class SysDictTypeServiceImpl implements SysDictTypeService {
+public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDictType> implements SysDictTypeService {
     @Autowired
     private SysDictTypeMapper dictTypeMapper;
 

src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java

@@ -15,7 +15,7 @@ import java.util.List;
  * @author muyu
  */
 @Service
-public class SysLogininforServiceImpl implements SysLogininforService {
+public class SysLogininforServiceImpl extends ServiceImpl<SysLogininforMapper, SysLogininfor> implements SysLogininforService {
 
     @Autowired
     private SysLogininforMapper logininforMapper;

src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java

@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
  * @author muyu
  */
 @Service
-public class SysMenuServiceImpl implements SysMenuService {
+public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> implements SysMenuService {
     public static final String PREMISSION_STRING = "perms[\"{0}\"]";
 
     @Autowired

src/main/java/com/muyu/system/service/impl/SysNoticeServiceImpl.java

@@ -20,7 +20,7 @@ import java.util.List;
  * @author muyu
  */
 @Service
-public class SysNoticeServiceImpl implements SysNoticeService {
+public class SysNoticeServiceImpl extends ServiceImpl<SysNoticeMapper, SysNotice> implements SysNoticeService {
     @Autowired
     private SysNoticeMapper noticeMapper;
 

src/main/java/com/muyu/system/service/impl/SysOperLogServiceImpl.java

@@ -15,7 +15,7 @@ import java.util.List;
  * @author muyu
  */
 @Service
-public class SysOperLogServiceImpl implements SysOperLogService {
+public class SysOperLogServiceImpl extends ServiceImpl<SysOperLogMapper, SysOperLog> implements SysOperLogService {
     @Autowired
     private SysOperLogMapper operLogMapper;
 

src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java

@@ -19,7 +19,7 @@ import java.util.List;
  * @author muyu
  */
 @Service
-public class SysPostServiceImpl implements SysPostService {
+public class SysPostServiceImpl extends ServiceImpl<SysPostMapper, SysPost> implements SysPostService {
     @Autowired
     private SysPostMapper postMapper;
 

src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java

@@ -29,7 +29,7 @@ import java.util.*;
  * @author muyu
  */
 @Service
-public class SysRoleServiceImpl implements SysRoleService {
+public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> implements SysRoleService {
     @Autowired
     private SysRoleMapper roleMapper;
 

src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java

@@ -34,7 +34,7 @@ import java.util.stream.Collectors;
  * @author muyu
  */
 @Service
-public class SysUserServiceImpl implements SysUserService {
+public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements SysUserService {
     private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class);
     @Autowired
     protected Validator validator;
@@ -243,9 +243,7 @@ public class SysUserServiceImpl implements SysUserService {
         // 新增用户与角色管理
         insertUserRole(user);
         // 新增用户与公告关联
-        if (noticeIds !=null && !noticeIds.isEmpty()){
-            userMapper.insertUserNotice(user.getUserId(), noticeIds);
-        }
+        userMapper.insertUserNotice(user.getUserId(), noticeIds);
         return rows;
     }
 

src/main/resources/bootstrap.yml

@@ -25,11 +25,19 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: ${nacos.addr}
+        # nacos用户名
+        username: ${nacos.user-name}
+        # nacos密码
+        password: ${nacos.password}
         # 命名空间
         namespace: ${nacos.namespace}
       config:
         # 服务注册地址
         server-addr: ${nacos.addr}
+        # nacos用户名
+        username: ${nacos.user-name}
+        # nacos密码
+        password: ${nacos.password}
         # 命名空间
         namespace: ${nacos.namespace}
         # 配置文件格式

src/main/resources/mapper/system/AtomMapper.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.muyu.system.mapper.AtomMapper">
-
-</mapper>