.idea/misc.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="EntryPointsManager">
+    <pattern value="com.ctsi.utils.RedisUtil" method="getValueToString" />
+  </component>
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="MavenProjectsManager">
     <option name="originalFiles">

application/src/main/java/com/ctsi/Application.java

@@ -27,13 +27,15 @@ public class Application {
         if (env.getProperty(SERVER_SSL_KEY_STORE) != null) {
             protocol = "https";
         }
-        log.info("\n----------------------------------------------------------\n\t" +
-                        "Application '{}' is running! Access URLs:\n\t" +
-                        "Local: \t\t{}://localhost:{}\n\t" +
-                        "External: \t{}://{}:{}\n\t" +
-                        "API doc: \t{}://{}:{}/{}\n\t" +
-                        "启动成功，Sa-Token 配置如下：{}"+
-                        "Profile(s): \t{}\n----------------------------------------------------------",
+        log.info("""
+
+                        ----------------------------------------------------------
+                        \tApplication '{}' is running! Access URLs:
+                        \tLocal: \t\t{}://localhost:{}
+                        \tExternal: \t{}://{}:{}
+                        \tAPI doc: \t{}://{}:{}/{}
+                        \t启动成功，Sa-Token 配置如下：{}Profile(s): \t{}
+                        ----------------------------------------------------------""",
                 env.getProperty("spring.application.name"),
                 protocol,
                 serverPort,

application/src/main/java/com/ctsi/Auth/entity/PO/CaptchaPO.java → application/src/main/java/com/ctsi/auth/entity/po/CaptchaPO.java

@@ -1,4 +1,4 @@
-package com.ctsi.Auth.entity.PO;
+package com.ctsi.auth.entity.po;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

application/src/main/java/com/ctsi/Auth/entity/PO/TokenInfoPO.java → application/src/main/java/com/ctsi/auth/entity/po/TokenInfoPO.java

@@ -1,4 +1,4 @@
-package com.ctsi.Auth.entity.PO;
+package com.ctsi.auth.entity.po;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

application/src/main/java/com/ctsi/Auth/entity/PO/UserInfoPO.java → application/src/main/java/com/ctsi/auth/entity/po/UserInfoPO.java

@@ -1,4 +1,4 @@
-package com.ctsi.Auth.entity.PO;
+package com.ctsi.auth.entity.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;

application/src/main/java/com/ctsi/Auth/entity/VO/UserForm.java → application/src/main/java/com/ctsi/auth/entity/vo/UserForm.java

@@ -1,4 +1,4 @@
-package com.ctsi.Auth.entity.VO;
+package com.ctsi.auth.entity.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;

application/src/main/java/com/ctsi/Auth/web/login.java → application/src/main/java/com/ctsi/auth/web/login.java

@@ -1,17 +1,17 @@
-package com.ctsi.Auth.web;
+package com.ctsi.auth.web;
 
 import cn.dev33.satoken.stp.StpUtil;
-import com.ctsi.Auth.entity.PO.CaptchaPO;
-import com.ctsi.Auth.entity.PO.TokenInfoPO;
-import com.ctsi.Auth.entity.PO.UserInfoPO;
-import com.ctsi.Auth.entity.VO.UserForm;
-import com.ctsi.Enum.ErrorCodeEnum;
-import com.ctsi.System.SysMenu.entity.PO.SysMenuSearchPO;
-import com.ctsi.System.SysMenu.service.SysMenuService;
-import com.ctsi.System.SysUser.entity.SysUser;
-import com.ctsi.System.SysUser.service.SysUserService;
-import com.ctsi.System.SysUserDetail.entity.SysUserDetail;
-import com.ctsi.System.SysUserDetail.service.SysUserDetailService;
+import com.ctsi.auth.entity.po.CaptchaPO;
+import com.ctsi.auth.entity.po.TokenInfoPO;
+import com.ctsi.auth.entity.po.UserInfoPO;
+import com.ctsi.auth.entity.vo.UserForm;
+import com.ctsi.anum.ErrorCodeEnum;
+import com.ctsi.system.sysMenu.entity.po.SysMenuSearchPO;
+import com.ctsi.system.sysMenu.service.SysMenuService;
+import com.ctsi.system.sysUser.entity.SysUser;
+import com.ctsi.system.sysUser.service.SysUserService;
+import com.ctsi.system.sysUserDetail.entity.SysUserDetail;
+import com.ctsi.system.sysUserDetail.service.SysUserDetailService;
 import com.ctsi.utils.ApiResult;
 import com.ctsi.utils.CaptchaUtil;
 import com.ctsi.utils.PasswordEncoderUtil;
@@ -52,7 +52,7 @@ public class login {
             // 验证码校验是否开启
             if (captchaType) {
                 // 从 redis 中获取之前生成的验证码
-                String captcha =(String) redisUtil.get(userForm.getCaptchaKey());
+                String captcha = redisUtil.getValueToString(userForm.getCaptchaKey());
                 if (captcha == null)
                     return ApiResult.result(ErrorCodeEnum.CAPTCHA_EXPIRED);
                 // 从 redis 中删除验证码

application/src/main/resources/data-h2.sql

@@ -1,9 +0,0 @@
-CREATE TABLE sys_user(
-                         `ID` INT NOT NULL AUTO_INCREMENT  COMMENT '主键id' ,
-                         `USER_NAME` VARCHAR(255) NOT NULL   COMMENT '用户id' ,
-                         `PASSWORD` VARCHAR(255) NOT NULL   COMMENT '密码' ,
-                         `DEL_FLAG` INT   DEFAULT 0 COMMENT '逻辑删除' ,
-                         PRIMARY KEY (ID)
-)  COMMENT = '用户表' ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-
-CREATE UNIQUE INDEX userName_index ON sys_user(USER_NAME);

application/src/main/resources/schema-h2.sql

@@ -1,2 +0,0 @@
-INSERT INTO `sys_user` (USER_NAME, PASSWORD) VALUES
-('admin', '123456');

core/src/main/java/com/ctsi/System/SysDic/mapper/SysDicMapper.java

@@ -1,26 +0,0 @@
-package com.ctsi.System.SysDic.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.ctsi.System.SysDic.entity.SysDic;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
- /**
- * 字典表;(sys_dic)表数据库访问层
- * @author : machaoyi
- * @date : 2024-1-16
- */
-@Mapper
-public interface SysDicMapper  extends BaseMapper<SysDic>{
-    /** 
-     * 分页查询指定行数据
-     *
-     * @param page 分页参数
-     * @param wrapper 动态查询条件
-     * @ return 分页对象列表
-     */
-    IPage<SysDic> selectByPage(IPage<SysDic> page , @Param(Constants.WRAPPER) Wrapper<SysDic> wrapper);
-}

core/src/main/java/com/ctsi/System/SysDicItem/mapper/SysDicItemMapper.java

@@ -1,26 +0,0 @@
-package com.ctsi.System.SysDicItem.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.ctsi.System.SysDicItem.entity.SysDicItem;
-import com.github.yulichang.base.MPJBaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
- /**
- * 字典项表;(sys_dic_item)表数据库访问层
- * @author : machaoyi
- * @date : 2024-1-16
- */
-@Mapper
-public interface SysDicItemMapper  extends MPJBaseMapper<SysDicItem> {
-    /** 
-     * 分页查询指定行数据
-     *
-     * @param page 分页参数
-     * @param wrapper 动态查询条件
-     * @ return 分页对象列表
-     */
-    IPage<SysDicItem> selectByPage(IPage<SysDicItem> page , @Param(Constants.WRAPPER) Wrapper<SysDicItem> wrapper);
-}

core/src/main/java/com/ctsi/System/SysMenu/mapper/SysMenuMapper.java

@@ -1,26 +0,0 @@
-package com.ctsi.System.SysMenu.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.ctsi.System.SysMenu.entity.SysMenu;
-import com.github.yulichang.base.MPJBaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
- /**
- * 菜单;(sys_menu)表数据库访问层
- * @author : machaoyi
- * @date : 2024-1-10
- */
-@Mapper
-public interface SysMenuMapper  extends MPJBaseMapper<SysMenu> {
-    /** 
-     * 分页查询指定行数据
-     *
-     * @param page 分页参数
-     * @param wrapper 动态查询条件
-     * @ return 分页对象列表
-     */
-    IPage<SysMenu> selectByPage(IPage<SysMenu> page , @Param(Constants.WRAPPER) Wrapper<SysMenu> wrapper);
-}

core/src/main/java/com/ctsi/System/SysOrg/mapper/SysOrgMapper.java

@@ -1,26 +0,0 @@
-package com.ctsi.System.SysOrg.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.ctsi.System.SysOrg.entity.SysOrg;
-import com.github.yulichang.base.MPJBaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
- /**
- * 部门信息表;(sys_org)表数据库访问层
- * @author : machaoyi
- * @date : 2024-1-10
- */
-@Mapper
-public interface SysOrgMapper  extends MPJBaseMapper<SysOrg> {
-    /** 
-     * 分页查询指定行数据
-     *
-     * @param page 分页参数
-     * @param wrapper 动态查询条件
-     * @ return 分页对象列表
-     */
-    IPage<SysOrg> selectByPage(IPage<SysOrg> page , @Param(Constants.WRAPPER) Wrapper<SysOrg> wrapper);
-}

core/src/main/java/com/ctsi/System/SysRole/mapper/SysRoleMapper.java

@@ -1,26 +0,0 @@
-package com.ctsi.System.SysRole.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.ctsi.System.SysRole.entity.SysRole;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
- /**
- * 角色表;(sys_role)表数据库访问层
- * @author : machaoyi
- * @date : 2024-1-11
- */
-@Mapper
-public interface SysRoleMapper  extends BaseMapper<SysRole>{
-    /** 
-     * 分页查询指定行数据
-     *
-     * @param page 分页参数
-     * @param wrapper 动态查询条件
-     * @ return 分页对象列表
-     */
-    IPage<SysRole> selectByPage(IPage<SysRole> page , @Param(Constants.WRAPPER) Wrapper<SysRole> wrapper);
-}

core/src/main/java/com/ctsi/System/SysRoleMenu/mapper/SysRoleMenuMapper.java

@@ -1,26 +0,0 @@
-package com.ctsi.System.SysRoleMenu.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.ctsi.System.SysRoleMenu.entity.SysRoleMenu;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * 角色菜单表;(sys_role_menu)表数据库访问层
- * @author : machaoyi
- * @date : 2024-1-12
- */
-@Mapper
-public interface SysRoleMenuMapper  extends BaseMapper<SysRoleMenu>{
-    /** 
-     * 分页查询指定行数据
-     *
-     * @param page 分页参数
-     * @param wrapper 动态查询条件
-     * @ return 分页对象列表
-     */
-    IPage<SysRoleMenu> selectByPage(IPage<SysRoleMenu> page , @Param(Constants.WRAPPER) Wrapper<SysRoleMenu> wrapper);
-}

core/src/main/java/com/ctsi/System/SysUser/mapper/SysUserMapper.java

@@ -1,26 +0,0 @@
-package com.ctsi.System.SysUser.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.ctsi.System.SysUser.entity.SysUser;
-import com.github.yulichang.base.MPJBaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
- /**
- * 用户表;(sys_user)表数据库访问层
- * @author : machaoyi
- * @date : 2024-1-10
- */
-@Mapper
-public interface SysUserMapper  extends MPJBaseMapper<SysUser> {
-    /** 
-     * 分页查询指定行数据
-     *
-     * @param page 分页参数
-     * @param wrapper 动态查询条件
-     * @ return 分页对象列表
-     */
-    IPage<SysUser> selectByPage(IPage<SysUser> page , @Param(Constants.WRAPPER) Wrapper<SysUser> wrapper);
-}

core/src/main/java/com/ctsi/System/SysUserDetail/entity/VO/SysUserDetailAddVO.java

@@ -1,42 +0,0 @@
-package com.ctsi.System.SysUserDetail.entity.VO;
-
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.ctsi.utils.LongToStringSerialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
-* 用户信息表;
-* @author : machaoyi
-* @date : 2024-1-10
-*/
-@ApiModel(value = "用户信息表新增VO")
-@TableName("sys_user_detail")
-@Data
-public class SysUserDetailAddVO implements Serializable{
-   /** 主键id */
-   @ApiModelProperty(value = "主键id")
-   @TableId
-   @JsonSerialize(using = LongToStringSerialize.class)
-   private Long id ;
-   /** 姓名 */
-   @ApiModelProperty(value = "姓名")
-   private String name ;
-   /** 性别 */
-   @ApiModelProperty(value = "性别")
-   private String gender ;
-   /** 手机号 */
-   @ApiModelProperty(value = "手机号")
-   private String phone ;
-   /** 邮箱 */
-   @ApiModelProperty(value = "邮箱")
-   private String email ;
-   /** 出生日期 */
-   @ApiModelProperty(value = "出生日期")
-   private String birthDate ;
-}

core/src/main/java/com/ctsi/System/SysUserDetail/mapper/SysUserDetailMapper.java

@@ -1,26 +0,0 @@
-package com.ctsi.System.SysUserDetail.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.ctsi.System.SysUserDetail.entity.SysUserDetail;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
- /**
- * 用户信息表;(sys_user_detail)表数据库访问层
- * @author : machaoyi
- * @date : 2024-1-10
- */
-@Mapper
-public interface SysUserDetailMapper  extends BaseMapper<SysUserDetail>{
-    /** 
-     * 分页查询指定行数据
-     *
-     * @param page 分页参数
-     * @param wrapper 动态查询条件
-     * @ return 分页对象列表
-     */
-    IPage<SysUserDetail> selectByPage(IPage<SysUserDetail> page , @Param(Constants.WRAPPER) Wrapper<SysUserDetail> wrapper);
-}

core/src/main/java/com/ctsi/System/SysUserOrg/mapper/SysUserOrgMapper.java

@@ -1,26 +0,0 @@
-package com.ctsi.System.SysUserOrg.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.ctsi.System.SysUserOrg.entity.SysUserOrg;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * 用户部门表;(sys_user_org)表数据库访问层
- * @author : machaoyi
- * @date : 2024-1-11
- */
-@Mapper
-public interface SysUserOrgMapper  extends BaseMapper<SysUserOrg>{
-    /** 
-     * 分页查询指定行数据
-     *
-     * @param page 分页参数
-     * @param wrapper 动态查询条件
-     * @ return 分页对象列表
-     */
-    IPage<SysUserOrg> selectByPage(IPage<SysUserOrg> page , @Param(Constants.WRAPPER) Wrapper<SysUserOrg> wrapper);
-}

core/src/main/java/com/ctsi/System/SysUserRole/mapper/SysUserRoleMapper.java

@@ -1,26 +0,0 @@
-package com.ctsi.System.SysUserRole.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.ctsi.System.SysUserRole.entity.SysUserRole;
-import com.github.yulichang.base.MPJBaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
- /**
- * 用户角色表;(sys_user_role)表数据库访问层
- * @author : machaoyi
- * @date : 2024-1-11
- */
-@Mapper
-public interface SysUserRoleMapper  extends MPJBaseMapper<SysUserRole> {
-    /** 
-     * 分页查询指定行数据
-     *
-     * @param page 分页参数
-     * @param wrapper 动态查询条件
-     * @ return 分页对象列表
-     */
-    IPage<SysUserRole> selectByPage(IPage<SysUserRole> page , @Param(Constants.WRAPPER) Wrapper<SysUserRole> wrapper);
-}

core/src/main/java/com/ctsi/Enum/ErrorCodeEnum.java → core/src/main/java/com/ctsi/anum/ErrorCodeEnum.java

@@ -1,4 +1,4 @@
-package com.ctsi.Enum;
+package com.ctsi.anum;
 
 import lombok.Getter;
 

core/src/main/java/com/ctsi/System/Password/entity/UpdatePasswordVO.java → core/src/main/java/com/ctsi/system/password/entity/UpdatePasswordVO.java

@@ -1,4 +1,4 @@
-package com.ctsi.System.Password.entity;
+package com.ctsi.system.password.entity;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

core/src/main/java/com/ctsi/System/Password/password.java → core/src/main/java/com/ctsi/system/password/password.java

@@ -1,7 +1,7 @@
-package com.ctsi.System.Password;
+package com.ctsi.system.password;
 
-import com.ctsi.System.Password.entity.UpdatePasswordVO;
-import com.ctsi.System.SysUser.service.SysUserService;
+import com.ctsi.system.password.entity.UpdatePasswordVO;
+import com.ctsi.system.sysUser.service.SysUserService;
 import com.ctsi.utils.ApiResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

core/src/main/java/com/ctsi/System/SysDic/controller/SysDicController.java → core/src/main/java/com/ctsi/system/sysDic/controller/SysDicController.java

@@ -1,8 +1,8 @@
-package com.ctsi.System.SysDic.controller;
+package com.ctsi.system.sysDic.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.System.SysDic.entity.SysDic;
-import com.ctsi.System.SysDic.service.SysDicService;
+import com.ctsi.system.sysDic.entity.SysDic;
+import com.ctsi.system.sysDic.service.SysDicService;
 import com.ctsi.entity.FramePage;
 import com.ctsi.utils.ApiResult;
 import io.swagger.annotations.Api;

core/src/main/java/com/ctsi/System/SysDic/entity/SysDic.java → core/src/main/java/com/ctsi/system/sysDic/entity/SysDic.java

@@ -1,4 +1,4 @@
-package com.ctsi.System.SysDic.entity;
+package com.ctsi.system.sysDic.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

core/src/main/java/com/ctsi/system/sysDic/mapper/SysDicMapper.java

@@ -0,0 +1,14 @@
+package com.ctsi.system.sysDic.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ctsi.system.sysDic.entity.SysDic;
+import org.apache.ibatis.annotations.Mapper;
+
+ /**
+ * 字典表;(sys_dic)表数据库访问层
+ * @author : machaoyi
+ * @date : 2024-1-16
+ */
+@Mapper
+public interface SysDicMapper  extends BaseMapper<SysDic>{
+ }

core/src/main/java/com/ctsi/System/SysDic/mapper/SysDicMapper.xml → core/src/main/java/com/ctsi/system/sysDic/mapper/SysDicMapper.xml

@@ -1,8 +1,8 @@
 <?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.ctsi.System.SysDic.mapper.SysDicMapper">
-     <select id="selectByPage" resultType="com.ctsi.System.SysDic.entity.SysDic">
+<mapper namespace="com.ctsi.system.sysDic.mapper.SysDicMapper">
+     <select id="selectByPage" resultType="com.ctsi.system.sysDic.entity.SysDic">
         select * from sys_dic ${ew.customSqlSegment}
     </select>
 </mapper>

core/src/main/java/com/ctsi/System/SysDic/service/SysDicService.java → core/src/main/java/com/ctsi/system/sysDic/service/SysDicService.java

@@ -1,7 +1,7 @@
-package com.ctsi.System.SysDic.service;
+package com.ctsi.system.sysDic.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.System.SysDic.entity.SysDic;
+import com.ctsi.system.sysDic.entity.SysDic;
 
  /**
  * 字典表;(sys_dic)表服务接口

core/src/main/java/com/ctsi/System/SysDic/service/impl/SysDicServiceImpl.java → core/src/main/java/com/ctsi/system/sysDic/service/impl/SysDicServiceImpl.java

@@ -1,13 +1,13 @@
-package com.ctsi.System.SysDic.service.impl;
+package com.ctsi.system.sysDic.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.System.SysDic.entity.SysDic;
-import com.ctsi.System.SysDic.mapper.SysDicMapper;
-import com.ctsi.System.SysDic.service.SysDicService;
+import com.ctsi.system.sysDic.entity.SysDic;
+import com.ctsi.system.sysDic.mapper.SysDicMapper;
+import com.ctsi.system.sysDic.service.SysDicService;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 

core/src/main/java/com/ctsi/System/SysDicItem/controller/SysDicItemController.java → core/src/main/java/com/ctsi/system/sysDicItem/controller/SysDicItemController.java

@@ -1,10 +1,10 @@
-package com.ctsi.System.SysDicItem.controller;
+package com.ctsi.system.sysDicItem.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.System.SysDicItem.entity.SysDicItem;
-import com.ctsi.System.SysDicItem.entity.SysDicItemSearchPO;
-import com.ctsi.System.SysDicItem.entity.SysDicItemSearchVO;
-import com.ctsi.System.SysDicItem.service.SysDicItemService;
+import com.ctsi.system.sysDicItem.entity.SysDicItem;
+import com.ctsi.system.sysDicItem.entity.SysDicItemSearchPO;
+import com.ctsi.system.sysDicItem.entity.SysDicItemSearchVO;
+import com.ctsi.system.sysDicItem.service.SysDicItemService;
 import com.ctsi.entity.FramePage;
 import com.ctsi.utils.ApiResult;
 import io.swagger.annotations.Api;

core/src/main/java/com/ctsi/System/SysDicItem/entity/SysDicItem.java → core/src/main/java/com/ctsi/system/sysDicItem/entity/SysDicItem.java

@@ -1,4 +1,4 @@
-package com.ctsi.System.SysDicItem.entity;
+package com.ctsi.system.sysDicItem.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

core/src/main/java/com/ctsi/System/SysDicItem/entity/SysDicItemSearchPO.java → core/src/main/java/com/ctsi/system/sysDicItem/entity/SysDicItemSearchPO.java

@@ -1,4 +1,4 @@
-package com.ctsi.System.SysDicItem.entity;
+package com.ctsi.system.sysDicItem.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

core/src/main/java/com/ctsi/System/SysDicItem/entity/SysDicItemSearchVO.java → core/src/main/java/com/ctsi/system/sysDicItem/entity/SysDicItemSearchVO.java

@@ -1,4 +1,4 @@
-package com.ctsi.System.SysDicItem.entity;
+package com.ctsi.system.sysDicItem.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ctsi.utils.LongToStringSerialize;

core/src/main/java/com/ctsi/system/sysDicItem/mapper/SysDicItemMapper.java

@@ -0,0 +1,14 @@
+package com.ctsi.system.sysDicItem.mapper;
+
+import com.ctsi.system.sysDicItem.entity.SysDicItem;
+import com.github.yulichang.base.MPJBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+ /**
+ * 字典项表;(sys_dic_item)表数据库访问层
+ * @author : machaoyi
+ * @date : 2024-1-16
+ */
+@Mapper
+public interface SysDicItemMapper  extends MPJBaseMapper<SysDicItem> {
+ }

core/src/main/java/com/ctsi/System/SysDicItem/mapper/SysDicItemMapper.xml → core/src/main/java/com/ctsi/system/sysDicItem/mapper/SysDicItemMapper.xml

@@ -1,8 +1,8 @@
 <?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.ctsi.System.SysDicItem.mapper.SysDicItemMapper">
-     <select id="selectByPage" resultType="com.ctsi.System.SysDicItem.entity.SysDicItem">
+<mapper namespace="com.ctsi.system.sysDicItem.mapper.SysDicItemMapper">
+     <select id="selectByPage" resultType="com.ctsi.system.sysDicItem.entity.SysDicItem">
         select * from sys_dic_item ${ew.customSqlSegment}
     </select>
 </mapper>

core/src/main/java/com/ctsi/System/SysDicItem/service/SysDicItemService.java → core/src/main/java/com/ctsi/system/sysDicItem/service/SysDicItemService.java

@@ -1,9 +1,9 @@
-package com.ctsi.System.SysDicItem.service;
+package com.ctsi.system.sysDicItem.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.System.SysDicItem.entity.SysDicItem;
-import com.ctsi.System.SysDicItem.entity.SysDicItemSearchPO;
-import com.ctsi.System.SysDicItem.entity.SysDicItemSearchVO;
+import com.ctsi.system.sysDicItem.entity.SysDicItem;
+import com.ctsi.system.sysDicItem.entity.SysDicItemSearchPO;
+import com.ctsi.system.sysDicItem.entity.SysDicItemSearchVO;
 
 import java.util.List;
 

core/src/main/java/com/ctsi/System/SysDicItem/service/impl/SysDicItemServiceImpl.java → core/src/main/java/com/ctsi/system/sysDicItem/service/impl/SysDicItemServiceImpl.java

@@ -1,16 +1,16 @@
-package com.ctsi.System.SysDicItem.service.impl;
+package com.ctsi.system.sysDicItem.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.System.SysDic.entity.SysDic;
-import com.ctsi.System.SysDicItem.entity.SysDicItem;
-import com.ctsi.System.SysDicItem.entity.SysDicItemSearchPO;
-import com.ctsi.System.SysDicItem.entity.SysDicItemSearchVO;
-import com.ctsi.System.SysDicItem.mapper.SysDicItemMapper;
-import com.ctsi.System.SysDicItem.service.SysDicItemService;
+import com.ctsi.system.sysDic.entity.SysDic;
+import com.ctsi.system.sysDicItem.entity.SysDicItem;
+import com.ctsi.system.sysDicItem.entity.SysDicItemSearchPO;
+import com.ctsi.system.sysDicItem.entity.SysDicItemSearchVO;
+import com.ctsi.system.sysDicItem.mapper.SysDicItemMapper;
+import com.ctsi.system.sysDicItem.service.SysDicItemService;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;

core/src/main/java/com/ctsi/System/SysMenu/controller/SysMenuController.java → core/src/main/java/com/ctsi/system/sysMenu/controller/SysMenuController.java

@@ -1,10 +1,10 @@
-package com.ctsi.System.SysMenu.controller;
+package com.ctsi.system.sysMenu.controller;
 
 import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.System.SysMenu.entity.PO.SysMenuSearchPO;
-import com.ctsi.System.SysMenu.entity.SysMenu;
-import com.ctsi.System.SysMenu.service.SysMenuService;
+import com.ctsi.system.sysMenu.entity.po.SysMenuSearchPO;
+import com.ctsi.system.sysMenu.entity.SysMenu;
+import com.ctsi.system.sysMenu.service.SysMenuService;
 import com.ctsi.entity.FramePage;
 import com.ctsi.utils.ApiResult;
 import io.swagger.annotations.Api;

core/src/main/java/com/ctsi/System/SysMenu/entity/SysMenu.java → core/src/main/java/com/ctsi/system/sysMenu/entity/SysMenu.java

@@ -1,4 +1,4 @@
-package com.ctsi.System.SysMenu.entity;
+package com.ctsi.system.sysMenu.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

core/src/main/java/com/ctsi/System/SysMenu/entity/PO/SysMenuSearchPO.java → core/src/main/java/com/ctsi/system/sysMenu/entity/po/SysMenuSearchPO.java

@@ -1,4 +1,4 @@
-package com.ctsi.System.SysMenu.entity.PO;
+package com.ctsi.system.sysMenu.entity.po;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,7 +21,7 @@ import java.util.List;
 @Data
 public class SysMenuSearchPO implements Serializable{
    /** 主键id */
-   @ApiModelProperty(value = "主键id")
+   @ApiModelProperty(value = "主键id", dataType = "java.lang.String")
    @TableId
    @JsonSerialize(using = LongToStringSerialize.class)
    private Long id ;
@@ -29,7 +29,7 @@ public class SysMenuSearchPO implements Serializable{
    @ApiModelProperty(value = "标题")
    private String menuTitle ;
    /** 父级 */
-   @ApiModelProperty(value = "父级")
+   @ApiModelProperty(value = "父级", dataType = "java.lang.String")
    @JsonSerialize(using = LongToStringSerialize.class)
    private Long parentId ;
    /** 编码 */

core/src/main/java/com/ctsi/system/sysMenu/mapper/SysMenuMapper.java

@@ -0,0 +1,24 @@
+package com.ctsi.system.sysMenu.mapper;
+
+import com.ctsi.system.sysMenu.entity.SysMenu;
+import com.github.yulichang.base.MPJBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+ /**
+ * 菜单;(sys_menu)表数据库访问层
+ * @author : machaoyi
+ * @date : 2024-1-10
+ */
+@Mapper
+public interface SysMenuMapper  extends MPJBaseMapper<SysMenu> {
+// --注释掉检查 START (2024/1/23 10:53):
+//    /**
+//     * 分页查询指定行数据
+//     *
+//     * @param page 分页参数
+//     * @param wrapper 动态查询条件
+//     * @ return 分页对象列表
+//     */
+//    IPage<sysMenu> selectByPage(IPage<sysMenu> page , @Param(Constants.WRAPPER) Wrapper<sysMenu> wrapper);
+// --注释掉检查 STOP (2024/1/23 10:53)
+}

core/src/main/java/com/ctsi/System/SysMenu/mapper/SysMenuMapper.xml → core/src/main/java/com/ctsi/system/sysMenu/mapper/SysMenuMapper.xml

@@ -1,8 +1,8 @@
 <?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.ctsi.System.SysMenu.mapper.SysMenuMapper">
-     <select id="selectByPage" resultType="com.ctsi.System.SysMenu.entity.SysMenu">
+<mapper namespace="com.ctsi.system.sysMenu.mapper.SysMenuMapper">
+     <select id="selectByPage" resultType="com.ctsi.system.sysMenu.entity.SysMenu">
         select * from sys_menu ${ew.customSqlSegment}
     </select>
 </mapper>

core/src/main/java/com/ctsi/System/SysMenu/service/SysMenuService.java → core/src/main/java/com/ctsi/system/sysMenu/service/SysMenuService.java

@@ -1,8 +1,8 @@
-package com.ctsi.System.SysMenu.service;
+package com.ctsi.system.sysMenu.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.System.SysMenu.entity.PO.SysMenuSearchPO;
-import com.ctsi.System.SysMenu.entity.SysMenu;
+import com.ctsi.system.sysMenu.entity.po.SysMenuSearchPO;
+import com.ctsi.system.sysMenu.entity.SysMenu;
 
 import java.util.List;
 

core/src/main/java/com/ctsi/System/SysMenu/service/impl/SysMenuServiceImpl.java → core/src/main/java/com/ctsi/system/sysMenu/service/impl/SysMenuServiceImpl.java

@@ -1,15 +1,15 @@
-package com.ctsi.System.SysMenu.service.impl;
+package com.ctsi.system.sysMenu.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.System.SysMenu.entity.PO.SysMenuSearchPO;
-import com.ctsi.System.SysMenu.entity.SysMenu;
-import com.ctsi.System.SysMenu.mapper.SysMenuMapper;
-import com.ctsi.System.SysMenu.service.SysMenuService;
-import com.ctsi.System.SysRoleMenu.entity.SysRoleMenu;
-import com.ctsi.System.SysUserRole.entity.SysUserRole;
+import com.ctsi.system.sysMenu.entity.po.SysMenuSearchPO;
+import com.ctsi.system.sysMenu.entity.SysMenu;
+import com.ctsi.system.sysMenu.mapper.SysMenuMapper;
+import com.ctsi.system.sysMenu.service.SysMenuService;
+import com.ctsi.system.sysRoleMenu.entity.SysRoleMenu;
+import com.ctsi.system.sysUserRole.entity.SysUserRole;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;

core/src/main/java/com/ctsi/System/SysOrg/controller/SysOrgController.java → core/src/main/java/com/ctsi/system/sysOrg/controller/SysOrgController.java

@@ -1,10 +1,10 @@
-package com.ctsi.System.SysOrg.controller;
+package com.ctsi.system.sysOrg.controller;
 
 import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.System.SysOrg.entity.PO.SysOrgSearchPO;
-import com.ctsi.System.SysOrg.entity.SysOrg;
-import com.ctsi.System.SysOrg.service.SysOrgService;
+import com.ctsi.system.sysOrg.entity.po.SysOrgSearchPO;
+import com.ctsi.system.sysOrg.entity.SysOrg;
+import com.ctsi.system.sysOrg.service.SysOrgService;
 import com.ctsi.entity.FramePage;
 import com.ctsi.utils.ApiResult;
 import io.swagger.annotations.Api;

core/src/main/java/com/ctsi/System/SysOrg/entity/SysOrg.java → core/src/main/java/com/ctsi/system/sysOrg/entity/SysOrg.java

@@ -1,4 +1,4 @@
-package com.ctsi.System.SysOrg.entity;
+package com.ctsi.system.sysOrg.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

core/src/main/java/com/ctsi/System/SysOrg/entity/PO/SysOrgSearchPO.java → core/src/main/java/com/ctsi/system/sysOrg/entity/po/SysOrgSearchPO.java

@@ -1,4 +1,4 @@
-package com.ctsi.System.SysOrg.entity.PO;
+package com.ctsi.system.sysOrg.entity.po;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

core/src/main/java/com/ctsi/system/sysOrg/mapper/SysOrgMapper.java

@@ -0,0 +1,24 @@
+package com.ctsi.system.sysOrg.mapper;
+
+import com.ctsi.system.sysOrg.entity.SysOrg;
+import com.github.yulichang.base.MPJBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+ /**
+ * 部门信息表;(sys_org)表数据库访问层
+ * @author : machaoyi
+ * @date : 2024-1-10
+ */
+@Mapper
+public interface SysOrgMapper  extends MPJBaseMapper<SysOrg> {
+// --注释掉检查 START (2024/1/23 10:53):
+//    /**
+//     * 分页查询指定行数据
+//     *
+//     * @param page 分页参数
+//     * @param wrapper 动态查询条件
+//     * @ return 分页对象列表
+//     */
+//    IPage<sysOrg> selectByPage(IPage<sysOrg> page , @Param(Constants.WRAPPER) Wrapper<sysOrg> wrapper);
+// --注释掉检查 STOP (2024/1/23 10:53)
+}

core/src/main/java/com/ctsi/System/SysOrg/mapper/SysOrgMapper.xml → core/src/main/java/com/ctsi/system/sysOrg/mapper/SysOrgMapper.xml

@@ -1,8 +1,8 @@
 <?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.ctsi.System.SysOrg.mapper.SysOrgMapper">
-     <select id="selectByPage" resultType="com.ctsi.System.SysOrg.entity.SysOrg">
+<mapper namespace="com.ctsi.system.sysOrg.mapper.SysOrgMapper">
+     <select id="selectByPage" resultType="com.ctsi.system.sysOrg.entity.SysOrg">
         select * from sys_org ${ew.customSqlSegment}
     </select>
 </mapper>

core/src/main/java/com/ctsi/System/SysOrg/service/SysOrgService.java → core/src/main/java/com/ctsi/system/sysOrg/service/SysOrgService.java

@@ -1,8 +1,8 @@
-package com.ctsi.System.SysOrg.service;
+package com.ctsi.system.sysOrg.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.System.SysOrg.entity.PO.SysOrgSearchPO;
-import com.ctsi.System.SysOrg.entity.SysOrg;
+import com.ctsi.system.sysOrg.entity.po.SysOrgSearchPO;
+import com.ctsi.system.sysOrg.entity.SysOrg;
 
 /**
  * 部门信息表;(sys_org)表服务接口

core/src/main/java/com/ctsi/System/SysOrg/service/impl/SysOrgServiceImpl.java → core/src/main/java/com/ctsi/system/sysOrg/service/impl/SysOrgServiceImpl.java

@@ -1,13 +1,13 @@
-package com.ctsi.System.SysOrg.service.impl;
+package com.ctsi.system.sysOrg.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.System.SysOrg.entity.PO.SysOrgSearchPO;
-import com.ctsi.System.SysOrg.entity.SysOrg;
-import com.ctsi.System.SysOrg.mapper.SysOrgMapper;
-import com.ctsi.System.SysOrg.service.SysOrgService;
+import com.ctsi.system.sysOrg.entity.po.SysOrgSearchPO;
+import com.ctsi.system.sysOrg.entity.SysOrg;
+import com.ctsi.system.sysOrg.mapper.SysOrgMapper;
+import com.ctsi.system.sysOrg.service.SysOrgService;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;

core/src/main/java/com/ctsi/System/SysRole/controller/SysRoleController.java → core/src/main/java/com/ctsi/system/sysRole/controller/SysRoleController.java

@@ -1,12 +1,12 @@
-package com.ctsi.System.SysRole.controller;
+package com.ctsi.system.sysRole.controller;
 
 import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.System.SysRole.entity.PO.SysRoleMenuAddPO;
-import com.ctsi.System.SysRole.entity.SysRole;
-import com.ctsi.System.SysRole.entity.VO.SysRoleMenuAddVO;
-import com.ctsi.System.SysRole.service.SysRoleService;
-import com.ctsi.System.SysRoleMenu.service.SysRoleMenuService;
+import com.ctsi.system.sysRole.entity.po.SysRoleMenuAddPO;
+import com.ctsi.system.sysRole.entity.SysRole;
+import com.ctsi.system.sysRole.entity.vo.SysRoleMenuAddVO;
+import com.ctsi.system.sysRole.service.SysRoleService;
+import com.ctsi.system.sysRoleMenu.service.SysRoleMenuService;
 import com.ctsi.entity.FramePage;
 import com.ctsi.utils.ApiResult;
 import io.swagger.annotations.Api;

core/src/main/java/com/ctsi/System/SysRole/entity/SysRole.java → core/src/main/java/com/ctsi/system/sysRole/entity/SysRole.java

@@ -1,4 +1,4 @@
-package com.ctsi.System.SysRole.entity;
+package com.ctsi.system.sysRole.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

core/src/main/java/com/ctsi/System/SysRole/entity/PO/SysRoleMenuAddPO.java → core/src/main/java/com/ctsi/system/sysRole/entity/po/SysRoleMenuAddPO.java

@@ -1,4 +1,4 @@
-package com.ctsi.System.SysRole.entity.PO;
+package com.ctsi.system.sysRole.entity.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ctsi.utils.LongToStringSerialize;

core/src/main/java/com/ctsi/System/SysRole/entity/VO/SysRoleMenuAddVO.java → core/src/main/java/com/ctsi/system/sysRole/entity/vo/SysRoleMenuAddVO.java

@@ -1,4 +1,4 @@
-package com.ctsi.System.SysRole.entity.VO;
+package com.ctsi.system.sysRole.entity.vo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;

core/src/main/java/com/ctsi/system/sysRole/mapper/SysRoleMapper.java

@@ -0,0 +1,24 @@
+package com.ctsi.system.sysRole.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ctsi.system.sysRole.entity.SysRole;
+import org.apache.ibatis.annotations.Mapper;
+
+ /**
+ * 角色表;(sys_role)表数据库访问层
+ * @author : machaoyi
+ * @date : 2024-1-11
+ */
+@Mapper
+public interface SysRoleMapper  extends BaseMapper<SysRole>{
+// --注释掉检查 START (2024/1/23 10:53):
+//    /**
+//     * 分页查询指定行数据
+//     *
+//     * @param page 分页参数
+//     * @param wrapper 动态查询条件
+//     * @ return 分页对象列表
+//     */
+//    IPage<sysRole> selectByPage(IPage<sysRole> page , @Param(Constants.WRAPPER) Wrapper<sysRole> wrapper);
+// --注释掉检查 STOP (2024/1/23 10:53)
+}

core/src/main/java/com/ctsi/System/SysRole/mapper/SysRoleMapper.xml → core/src/main/java/com/ctsi/system/sysRole/mapper/SysRoleMapper.xml

@@ -1,8 +1,8 @@
 <?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.ctsi.System.SysRole.mapper.SysRoleMapper">
-     <select id="selectByPage" resultType="com.ctsi.System.SysRole.entity.SysRole">
+<mapper namespace="com.ctsi.system.sysRole.mapper.SysRoleMapper">
+     <select id="selectByPage" resultType="com.ctsi.system.sysRole.entity.SysRole">
         select * from sys_role ${ew.customSqlSegment}
     </select>
 </mapper>

core/src/main/java/com/ctsi/System/SysRole/service/SysRoleService.java → core/src/main/java/com/ctsi/system/sysRole/service/SysRoleService.java

@@ -1,7 +1,7 @@
-package com.ctsi.System.SysRole.service;
+package com.ctsi.system.sysRole.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.System.SysRole.entity.SysRole;
+import com.ctsi.system.sysRole.entity.SysRole;
 
 /**
  * 角色表;(sys_role)表服务接口

core/src/main/java/com/ctsi/System/SysRole/service/impl/SysRoleServiceImpl.java → core/src/main/java/com/ctsi/system/sysRole/service/impl/SysRoleServiceImpl.java

@@ -1,13 +1,13 @@
-package com.ctsi.System.SysRole.service.impl;
+package com.ctsi.system.sysRole.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.System.SysRole.entity.SysRole;
-import com.ctsi.System.SysRole.mapper.SysRoleMapper;
-import com.ctsi.System.SysRole.service.SysRoleService;
+import com.ctsi.system.sysRole.entity.SysRole;
+import com.ctsi.system.sysRole.mapper.SysRoleMapper;
+import com.ctsi.system.sysRole.service.SysRoleService;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 

core/src/main/java/com/ctsi/System/SysRoleMenu/controller/SysRoleMenuController.java → core/src/main/java/com/ctsi/system/sysRoleMenu/controller/SysRoleMenuController.java

@@ -1,8 +1,8 @@
-package com.ctsi.System.SysRoleMenu.controller;
+package com.ctsi.system.sysRoleMenu.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.System.SysRoleMenu.entity.SysRoleMenu;
-import com.ctsi.System.SysRoleMenu.service.SysRoleMenuService;
+import com.ctsi.system.sysRoleMenu.entity.SysRoleMenu;
+import com.ctsi.system.sysRoleMenu.service.SysRoleMenuService;
 import com.ctsi.entity.FramePage;
 import com.ctsi.utils.ApiResult;
 import io.swagger.annotations.ApiOperation;
@@ -44,14 +44,12 @@ public class SysRoleMenuController{
     /** 
      * 分页查询
      *
-     * @param sysRoleMenu 筛选条件
-     * @ return 查询结果
      */
     @ApiOperation("分页查询")
     @GetMapping
-    public ApiResult<Page<SysRoleMenu>> paginQuery(SysRoleMenu sysRoleMenu, FramePage framePage){
+    public ApiResult<Page<SysRoleMenu>> paginQuery(FramePage framePage){
         try {
-            return ApiResult.success(sysRoleMenuService.paginQuery(sysRoleMenu, framePage.getPageNum(), framePage.getPageSize()));
+            return ApiResult.success(sysRoleMenuService.paginQuery(framePage.getPageNum(), framePage.getPageSize()));
         } catch (Exception e) {
             log.error(e.getMessage());
             return ApiResult.failure("分页查询失败",null);

core/src/main/java/com/ctsi/System/SysRoleMenu/entity/SysRoleMenu.java → core/src/main/java/com/ctsi/system/sysRoleMenu/entity/SysRoleMenu.java

@@ -1,4 +1,4 @@
-package com.ctsi.System.SysRoleMenu.entity;
+package com.ctsi.system.sysRoleMenu.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

core/src/main/java/com/ctsi/system/sysRoleMenu/mapper/SysRoleMenuMapper.java

@@ -0,0 +1,24 @@
+package com.ctsi.system.sysRoleMenu.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ctsi.system.sysRoleMenu.entity.SysRoleMenu;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 角色菜单表;(sys_role_menu)表数据库访问层
+ * @author : machaoyi
+ * @date : 2024-1-12
+ */
+@Mapper
+public interface SysRoleMenuMapper  extends BaseMapper<SysRoleMenu>{
+// --注释掉检查 START (2024/1/23 11:16):
+//    /**
+//     * 分页查询指定行数据
+//     *
+//     * @param page 分页参数
+//     * @param wrapper 动态查询条件
+//     * @ return 分页对象列表
+//     */
+//    IPage<sysRoleMenu> selectByPage(IPage<sysRoleMenu> page , @Param(Constants.WRAPPER) Wrapper<sysRoleMenu> wrapper);
+// --注释掉检查 STOP (2024/1/23 11:16)
+}

core/src/main/java/com/ctsi/System/SysRoleMenu/mapper/SysRoleMenuMapper.xml → core/src/main/java/com/ctsi/system/sysRoleMenu/mapper/SysRoleMenuMapper.xml

@@ -1,8 +1,8 @@
 <?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.ctsi.System.SysRoleMenu.mapper.SysRoleMenuMapper">
-     <select id="selectByPage" resultType="com.ctsi.System.SysRoleMenu.entity.SysRoleMenu">
+<mapper namespace="com.ctsi.system.sysRoleMenu.mapper.SysRoleMenuMapper">
+     <select id="selectByPage" resultType="com.ctsi.system.sysRoleMenu.entity.SysRoleMenu">
         select * from sys_role_menu ${ew.customSqlSegment}
     </select>
 </mapper>

core/src/main/java/com/ctsi/System/SysRoleMenu/service/SysRoleMenuService.java → core/src/main/java/com/ctsi/system/sysRoleMenu/service/SysRoleMenuService.java

@@ -1,9 +1,9 @@
-package com.ctsi.System.SysRoleMenu.service;
+package com.ctsi.system.sysRoleMenu.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.System.SysRole.entity.PO.SysRoleMenuAddPO;
-import com.ctsi.System.SysRole.entity.VO.SysRoleMenuAddVO;
-import com.ctsi.System.SysRoleMenu.entity.SysRoleMenu;
+import com.ctsi.system.sysRole.entity.po.SysRoleMenuAddPO;
+import com.ctsi.system.sysRole.entity.vo.SysRoleMenuAddVO;
+import com.ctsi.system.sysRoleMenu.entity.SysRoleMenu;
 
  /**
  * 角色菜单表;(sys_role_menu)表服务接口
@@ -23,12 +23,11 @@ public interface SysRoleMenuService{
     /**
      * 分页查询
      *
-     * @param sysRoleMenu 筛选条件
      * @param current 当前页码
      * @param size  每页大小
      * @ return
      */
-    Page<SysRoleMenu> paginQuery(SysRoleMenu sysRoleMenu, long current, long size);
+    Page<SysRoleMenu> paginQuery(long current, long size);
     /** 
      * 新增数据
      *

core/src/main/java/com/ctsi/System/SysRoleMenu/service/impl/SysRoleMenuServiceImpl.java → core/src/main/java/com/ctsi/system/sysRoleMenu/service/impl/SysRoleMenuServiceImpl.java

@@ -1,14 +1,14 @@
-package com.ctsi.System.SysRoleMenu.service.impl;
+package com.ctsi.system.sysRoleMenu.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.System.SysRole.entity.PO.SysRoleMenuAddPO;
-import com.ctsi.System.SysRole.entity.VO.SysRoleMenuAddVO;
-import com.ctsi.System.SysRoleMenu.entity.SysRoleMenu;
-import com.ctsi.System.SysRoleMenu.mapper.SysRoleMenuMapper;
-import com.ctsi.System.SysRoleMenu.service.SysRoleMenuService;
+import com.ctsi.system.sysRole.entity.po.SysRoleMenuAddPO;
+import com.ctsi.system.sysRole.entity.vo.SysRoleMenuAddVO;
+import com.ctsi.system.sysRoleMenu.entity.SysRoleMenu;
+import com.ctsi.system.sysRoleMenu.mapper.SysRoleMenuMapper;
+import com.ctsi.system.sysRoleMenu.service.SysRoleMenuService;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
@@ -38,12 +38,11 @@ public class SysRoleMenuServiceImpl implements SysRoleMenuService {
     /**
      * 分页查询
      *
-     * @param sysRoleMenu 筛选条件
      * @param current 当前页码
      * @param size  每页大小
      * @ return
      */
-    public Page<SysRoleMenu> paginQuery(SysRoleMenu sysRoleMenu, long current, long size){
+    public Page<SysRoleMenu> paginQuery(long current, long size){
         //1. 构建动态查询条件
         LambdaQueryWrapper<SysRoleMenu> queryWrapper = new LambdaQueryWrapper<>();
         //2. 执行分页查询

core/src/main/java/com/ctsi/System/SysUser/controller/SysUserController.java → core/src/main/java/com/ctsi/system/sysUser/controller/SysUserController.java

@@ -1,19 +1,19 @@
-package com.ctsi.System.SysUser.controller;
+package com.ctsi.system.sysUser.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.System.SysUser.entity.PO.UserDetailPO;
-import com.ctsi.System.SysUser.entity.SysUser;
-import com.ctsi.System.SysUser.entity.VO.UserAddVO;
-import com.ctsi.System.SysUser.entity.VO.UserEditVO;
-import com.ctsi.System.SysUser.entity.VO.UserSearchVO;
-import com.ctsi.System.SysUser.service.SysUserService;
-import com.ctsi.System.SysUserDetail.entity.SysUserDetail;
-import com.ctsi.System.SysUserDetail.service.SysUserDetailService;
-import com.ctsi.System.SysUserOrg.entity.SysUserOrg;
-import com.ctsi.System.SysUserOrg.service.SysUserOrgService;
-import com.ctsi.System.SysUserRole.entity.PO.SysUserRoleAddPO;
-import com.ctsi.System.SysUserRole.entity.VO.SysUserRoleAddVO;
-import com.ctsi.System.SysUserRole.service.SysUserRoleService;
+import com.ctsi.system.sysUser.entity.po.UserDetailPO;
+import com.ctsi.system.sysUser.entity.SysUser;
+import com.ctsi.system.sysUser.entity.vo.UserAddVO;
+import com.ctsi.system.sysUser.entity.vo.UserEditVO;
+import com.ctsi.system.sysUser.entity.vo.UserSearchVO;
+import com.ctsi.system.sysUser.service.SysUserService;
+import com.ctsi.system.sysUserDetail.entity.SysUserDetail;
+import com.ctsi.system.sysUserDetail.service.SysUserDetailService;
+import com.ctsi.system.sysUserOrg.entity.SysUserOrg;
+import com.ctsi.system.sysUserOrg.service.SysUserOrgService;
+import com.ctsi.system.sysUserRole.entity.po.SysUserRoleAddPO;
+import com.ctsi.system.sysUserRole.entity.vo.SysUserRoleAddVO;
+import com.ctsi.system.sysUserRole.service.SysUserRoleService;
 import com.ctsi.entity.FramePage;
 import com.ctsi.utils.ApiResult;
 import io.swagger.annotations.Api;

core/src/main/java/com/ctsi/System/SysUser/entity/SysUser.java → core/src/main/java/com/ctsi/system/sysUser/entity/SysUser.java

@@ -1,4 +1,4 @@
-package com.ctsi.System.SysUser.entity;
+package com.ctsi.system.sysUser.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;

core/src/main/java/com/ctsi/System/SysUser/entity/PO/UserDetailPO.java → core/src/main/java/com/ctsi/system/sysUser/entity/po/UserDetailPO.java

@@ -1,4 +1,4 @@
-package com.ctsi.System.SysUser.entity.PO;
+package com.ctsi.system.sysUser.entity.po;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.ctsi.utils.LongToStringSerialize;

core/src/main/java/com/ctsi/System/SysUser/entity/VO/UserAddVO.java → core/src/main/java/com/ctsi/system/sysUser/entity/vo/UserAddVO.java

@@ -1,4 +1,4 @@
-package com.ctsi.System.SysUser.entity.VO;
+package com.ctsi.system.sysUser.entity.vo;
 
 import com.ctsi.utils.LongToStringSerialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;

core/src/main/java/com/ctsi/System/SysUser/entity/VO/UserEditVO.java → core/src/main/java/com/ctsi/system/sysUser/entity/vo/UserEditVO.java

@@ -1,4 +1,4 @@
-package com.ctsi.System.SysUser.entity.VO;
+package com.ctsi.system.sysUser.entity.vo;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.ctsi.utils.LongToStringSerialize;

core/src/main/java/com/ctsi/System/SysUser/entity/VO/UserSearchVO.java → core/src/main/java/com/ctsi/system/sysUser/entity/vo/UserSearchVO.java

@@ -1,4 +1,4 @@
-package com.ctsi.System.SysUser.entity.VO;
+package com.ctsi.system.sysUser.entity.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

core/src/main/java/com/ctsi/system/sysUser/mapper/SysUserMapper.java

@@ -0,0 +1,24 @@
+package com.ctsi.system.sysUser.mapper;
+
+import com.ctsi.system.sysUser.entity.SysUser;
+import com.github.yulichang.base.MPJBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+ /**
+ * 用户表;(sys_user)表数据库访问层
+ * @author : machaoyi
+ * @date : 2024-1-10
+ */
+@Mapper
+public interface SysUserMapper  extends MPJBaseMapper<SysUser> {
+// --注释掉检查 START (2024/1/23 10:55):
+//    /**
+//     * 分页查询指定行数据
+//     *
+//     * @param page 分页参数
+//     * @param wrapper 动态查询条件
+//     * @ return 分页对象列表
+//     */
+//    IPage<sysUser> selectByPage(IPage<sysUser> page , @Param(Constants.WRAPPER) Wrapper<sysUser> wrapper);
+// --注释掉检查 STOP (2024/1/23 10:55)
+}

core/src/main/java/com/ctsi/System/SysUser/mapper/SysUserMapper.xml → core/src/main/java/com/ctsi/system/sysUser/mapper/SysUserMapper.xml

@@ -1,8 +1,8 @@
 <?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.ctsi.System.SysUser.mapper.SysUserMapper">
-     <select id="selectByPage" resultType="com.ctsi.System.SysUser.entity.SysUser">
+<mapper namespace="com.ctsi.system.sysUser.mapper.SysUserMapper">
+     <select id="selectByPage" resultType="com.ctsi.system.sysUser.entity.SysUser">
         select * from sys_user ${ew.customSqlSegment}
     </select>
 </mapper>

core/src/main/java/com/ctsi/System/SysUser/service/SysUserService.java → core/src/main/java/com/ctsi/system/sysUser/service/SysUserService.java

@@ -1,10 +1,10 @@
-package com.ctsi.System.SysUser.service;
+package com.ctsi.system.sysUser.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.System.Password.entity.UpdatePasswordVO;
-import com.ctsi.System.SysUser.entity.PO.UserDetailPO;
-import com.ctsi.System.SysUser.entity.SysUser;
-import com.ctsi.System.SysUser.entity.VO.UserSearchVO;
+import com.ctsi.system.password.entity.UpdatePasswordVO;
+import com.ctsi.system.sysUser.entity.po.UserDetailPO;
+import com.ctsi.system.sysUser.entity.SysUser;
+import com.ctsi.system.sysUser.entity.vo.UserSearchVO;
 import com.ctsi.utils.ApiResult;
 
 /**
@@ -37,17 +37,11 @@ public interface SysUserService{
      * @param sysUser 实例对象
      * @ return 实例对象
      */
-    SysUser insert(SysUser sysUser);
+    void insert(SysUser sysUser);
 
     ApiResult<String> updatePassword(UpdatePasswordVO updatePasswordVO);
-    /** 
-     * 更新数据
-     *
-     * @param sysUser 实例对象
-     * @ return 实例对象
-     */
-    UserDetailPO update(SysUser sysUser);
-    /** 
+
+    /**
      * 通过主键删除数据
      *
      * @param id 主键

core/src/main/java/com/ctsi/System/SysUser/service/impl/SysUserServiceImpl.java → core/src/main/java/com/ctsi/system/sysUser/service/impl/SysUserServiceImpl.java

@@ -1,23 +1,22 @@
-package com.ctsi.System.SysUser.service.impl;
+package com.ctsi.system.sysUser.service.impl;
 
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.System.Password.entity.UpdatePasswordVO;
-import com.ctsi.System.SysOrg.entity.SysOrg;
-import com.ctsi.System.SysUser.entity.PO.UserDetailPO;
-import com.ctsi.System.SysUser.entity.SysUser;
-import com.ctsi.System.SysUser.entity.VO.UserSearchVO;
-import com.ctsi.System.SysUser.mapper.SysUserMapper;
-import com.ctsi.System.SysUser.service.SysUserService;
-import com.ctsi.System.SysUserDetail.entity.SysUserDetail;
-import com.ctsi.System.SysUserOrg.entity.SysUserOrg;
-import com.ctsi.System.SysUserRole.entity.PO.SysUserRoleAddPO;
-import com.ctsi.System.SysUserRole.entity.SysUserRole;
-import com.ctsi.System.SysUserRole.service.SysUserRoleService;
+import com.ctsi.system.password.entity.UpdatePasswordVO;
+import com.ctsi.system.sysOrg.entity.SysOrg;
+import com.ctsi.system.sysUser.entity.po.UserDetailPO;
+import com.ctsi.system.sysUser.entity.SysUser;
+import com.ctsi.system.sysUser.entity.vo.UserSearchVO;
+import com.ctsi.system.sysUser.mapper.SysUserMapper;
+import com.ctsi.system.sysUser.service.SysUserService;
+import com.ctsi.system.sysUserDetail.entity.SysUserDetail;
+import com.ctsi.system.sysUserOrg.entity.SysUserOrg;
+import com.ctsi.system.sysUserRole.entity.po.SysUserRoleAddPO;
+import com.ctsi.system.sysUserRole.entity.SysUserRole;
+import com.ctsi.system.sysUserRole.service.SysUserRoleService;
 import com.ctsi.utils.ApiResult;
 import com.ctsi.utils.PasswordEncoderUtil;
 import com.ctsi.utils.PasswordUtils;
@@ -121,7 +120,7 @@ public class SysUserServiceImpl implements SysUserService {
      * @param sysUser 实例对象
      * @ return 实例对象
      */
-    public SysUser insert(SysUser sysUser){
+    public void insert(SysUser sysUser){
         // 新增用户时如果没有特别设定密码，则使用默认密码
         if (Strings.isBlank(sysUser.getPassword())) {
             if (Strings.isBlank(defaultPassword)) {
@@ -131,7 +130,6 @@ public class SysUserServiceImpl implements SysUserService {
         }
         sysUser.setPassword(PasswordEncoderUtil.hashPassword(sysUser.getPassword()));
         sysUserMapper.insert(sysUser);
-        return sysUser;
     }
 
     /**
@@ -156,30 +154,8 @@ public class SysUserServiceImpl implements SysUserService {
         sysUserMapper.updateById(sysUserUpdate);
         return ApiResult.success("修改成功");
     }
-    
-    /** 
-     * 更新数据
-     *
-     * @param sysUser 实例对象
-     * @ return 实例对象
-     */
-    public UserDetailPO update(SysUser sysUser){
-        //1. 根据条件动态更新
-        LambdaUpdateChainWrapper<SysUser> chainWrapper = new LambdaUpdateChainWrapper<>(sysUserMapper);
-        if(StrUtil.isNotBlank(sysUser.getUserName())){
-            chainWrapper.set(SysUser::getUserName, sysUser.getUserName());
-        }
-        if(StrUtil.isNotBlank(sysUser.getPassword())){
-            chainWrapper.set(SysUser::getPassword, sysUser.getPassword());
-        }
-        //2. 设置主键，并更新
-        chainWrapper.eq(SysUser::getId, sysUser.getId());
-        chainWrapper.update();
-        //3. 更新成功了，查询最最对象返回
-        return queryById(sysUser.getId());
-    }
-    
-    /** 
+
+    /**
      * 通过主键删除数据
      *
      * @param id 主键

core/src/main/java/com/ctsi/System/SysUserDetail/controller/SysUserDetailController.java → core/src/main/java/com/ctsi/system/sysUserDetail/controller/SysUserDetailController.java

@@ -1,8 +1,8 @@
-package com.ctsi.System.SysUserDetail.controller;
+package com.ctsi.system.sysUserDetail.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.System.SysUserDetail.entity.SysUserDetail;
-import com.ctsi.System.SysUserDetail.service.SysUserDetailService;
+import com.ctsi.system.sysUserDetail.entity.SysUserDetail;
+import com.ctsi.system.sysUserDetail.service.SysUserDetailService;
 import com.ctsi.entity.FramePage;
 import com.ctsi.utils.ApiResult;
 import io.swagger.annotations.ApiOperation;

core/src/main/java/com/ctsi/System/SysUserDetail/entity/SysUserDetail.java → core/src/main/java/com/ctsi/system/sysUserDetail/entity/SysUserDetail.java

@@ -1,4 +1,4 @@
-package com.ctsi.System.SysUserDetail.entity;
+package com.ctsi.system.sysUserDetail.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

core/src/main/java/com/ctsi/system/sysUserDetail/mapper/SysUserDetailMapper.java

@@ -0,0 +1,24 @@
+package com.ctsi.system.sysUserDetail.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ctsi.system.sysUserDetail.entity.SysUserDetail;
+import org.apache.ibatis.annotations.Mapper;
+
+ /**
+ * 用户信息表;(sys_user_detail)表数据库访问层
+ * @author : machaoyi
+ * @date : 2024-1-10
+ */
+@Mapper
+public interface SysUserDetailMapper  extends BaseMapper<SysUserDetail>{
+// --注释掉检查 START (2024/1/23 10:55):
+//    /**
+//     * 分页查询指定行数据
+//     *
+//     * @param page 分页参数
+//     * @param wrapper 动态查询条件
+//     * @ return 分页对象列表
+//     */
+//    IPage<sysUserDetail> selectByPage(IPage<sysUserDetail> page , @Param(Constants.WRAPPER) Wrapper<sysUserDetail> wrapper);
+// --注释掉检查 STOP (2024/1/23 10:55)
+}

core/src/main/java/com/ctsi/System/SysUserDetail/mapper/SysUserDetailMapper.xml → core/src/main/java/com/ctsi/system/sysUserDetail/mapper/SysUserDetailMapper.xml

@@ -1,8 +1,8 @@
 <?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.ctsi.System.SysUserDetail.mapper.SysUserDetailMapper">
-     <select id="selectByPage" resultType="com.ctsi.System.SysUserDetail.entity.SysUserDetail">
+<mapper namespace="com.ctsi.system.sysUserDetail.mapper.SysUserDetailMapper">
+     <select id="selectByPage" resultType="com.ctsi.system.sysUserDetail.entity.SysUserDetail">
         select * from sys_user_detail ${ew.customSqlSegment}
     </select>
 </mapper>

core/src/main/java/com/ctsi/System/SysUserDetail/service/SysUserDetailService.java → core/src/main/java/com/ctsi/system/sysUserDetail/service/SysUserDetailService.java

@@ -1,7 +1,7 @@
-package com.ctsi.System.SysUserDetail.service;
+package com.ctsi.system.sysUserDetail.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.System.SysUserDetail.entity.SysUserDetail;
+import com.ctsi.system.sysUserDetail.entity.SysUserDetail;
 
  /**
  * 用户信息表;(sys_user_detail)表服务接口

core/src/main/java/com/ctsi/System/SysUserDetail/service/impl/SysUserDetailServiceImpl.java → core/src/main/java/com/ctsi/system/sysUserDetail/service/impl/SysUserDetailServiceImpl.java

@@ -1,13 +1,13 @@
-package com.ctsi.System.SysUserDetail.service.impl;
+package com.ctsi.system.sysUserDetail.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.System.SysUserDetail.entity.SysUserDetail;
-import com.ctsi.System.SysUserDetail.mapper.SysUserDetailMapper;
-import com.ctsi.System.SysUserDetail.service.SysUserDetailService;
+import com.ctsi.system.sysUserDetail.entity.SysUserDetail;
+import com.ctsi.system.sysUserDetail.mapper.SysUserDetailMapper;
+import com.ctsi.system.sysUserDetail.service.SysUserDetailService;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 

core/src/main/java/com/ctsi/System/SysUserOrg/controller/SysUserOrgController.java → core/src/main/java/com/ctsi/system/sysUserOrg/controller/SysUserOrgController.java

@@ -1,8 +1,8 @@
-package com.ctsi.System.SysUserOrg.controller;
+package com.ctsi.system.sysUserOrg.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.System.SysUserOrg.entity.SysUserOrg;
-import com.ctsi.System.SysUserOrg.service.SysUserOrgService;
+import com.ctsi.system.sysUserOrg.entity.SysUserOrg;
+import com.ctsi.system.sysUserOrg.service.SysUserOrgService;
 import com.ctsi.entity.FramePage;
 import com.ctsi.utils.ApiResult;
 import io.swagger.annotations.ApiOperation;
@@ -44,14 +44,12 @@ public class SysUserOrgController{
     /** 
      * 分页查询
      *
-     * @param sysUserOrg 筛选条件
-     * @ return 查询结果
      */
     @ApiOperation("分页查询")
     @GetMapping
-    public ApiResult<Page<SysUserOrg>> paginQuery(SysUserOrg sysUserOrg, FramePage framePage){
+    public ApiResult<Page<SysUserOrg>> paginQuery(FramePage framePage){
         try {
-            return ApiResult.success(sysUserOrgService.paginQuery(sysUserOrg, framePage.getPageNum(), framePage.getPageSize()));
+            return ApiResult.success(sysUserOrgService.paginQuery(framePage.getPageNum(), framePage.getPageSize()));
         } catch (Exception e) {
             log.error(e.getMessage());
             return ApiResult.failure("分页查询失败",null);

core/src/main/java/com/ctsi/System/SysUserOrg/entity/SysUserOrg.java → core/src/main/java/com/ctsi/system/sysUserOrg/entity/SysUserOrg.java

@@ -1,4 +1,4 @@
-package com.ctsi.System.SysUserOrg.entity;
+package com.ctsi.system.sysUserOrg.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

core/src/main/java/com/ctsi/system/sysUserOrg/mapper/SysUserOrgMapper.java

@@ -0,0 +1,24 @@
+package com.ctsi.system.sysUserOrg.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ctsi.system.sysUserOrg.entity.SysUserOrg;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 用户部门表;(sys_user_org)表数据库访问层
+ * @author : machaoyi
+ * @date : 2024-1-11
+ */
+@Mapper
+public interface SysUserOrgMapper  extends BaseMapper<SysUserOrg>{
+// --注释掉检查 START (2024/1/23 10:55):
+//    /**
+//     * 分页查询指定行数据
+//     *
+//     * @param page 分页参数
+//     * @param wrapper 动态查询条件
+//     * @ return 分页对象列表
+//     */
+//    IPage<sysUserOrg> selectByPage(IPage<sysUserOrg> page , @Param(Constants.WRAPPER) Wrapper<sysUserOrg> wrapper);
+// --注释掉检查 STOP (2024/1/23 10:55)
+}

core/src/main/java/com/ctsi/System/SysUserOrg/mapper/SysUserOrgMapper.xml → core/src/main/java/com/ctsi/system/sysUserOrg/mapper/SysUserOrgMapper.xml

@@ -1,8 +1,8 @@
 <?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.ctsi.System.SysUserOrg.mapper.SysUserOrgMapper">
-     <select id="selectByPage" resultType="com.ctsi.System.SysUserOrg.entity.SysUserOrg">
+<mapper namespace="com.ctsi.system.sysUserOrg.mapper.SysUserOrgMapper">
+     <select id="selectByPage" resultType="com.ctsi.system.sysUserOrg.entity.SysUserOrg">
         select * from sys_user_org ${ew.customSqlSegment}
     </select>
 </mapper>

core/src/main/java/com/ctsi/System/SysUserOrg/service/SysUserOrgService.java → core/src/main/java/com/ctsi/system/sysUserOrg/service/SysUserOrgService.java

@@ -1,7 +1,7 @@
-package com.ctsi.System.SysUserOrg.service;
+package com.ctsi.system.sysUserOrg.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.System.SysUserOrg.entity.SysUserOrg;
+import com.ctsi.system.sysUserOrg.entity.SysUserOrg;
 
 /**
  * 用户部门表;(sys_user_org)表服务接口
@@ -23,12 +23,11 @@ public interface SysUserOrgService{
     /**
      * 分页查询
      *
-     * @param sysUserOrg 筛选条件
      * @param current 当前页码
      * @param size  每页大小
      * @ return
      */
-    Page<SysUserOrg> paginQuery(SysUserOrg sysUserOrg, long current, long size);
+    Page<SysUserOrg> paginQuery(long current, long size);
     /** 
      * 新增数据
      *

core/src/main/java/com/ctsi/System/SysUserOrg/service/impl/SysUserOrgServiceImpl.java → core/src/main/java/com/ctsi/system/sysUserOrg/service/impl/SysUserOrgServiceImpl.java

@@ -1,12 +1,12 @@
-package com.ctsi.System.SysUserOrg.service.impl;
+package com.ctsi.system.sysUserOrg.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.System.SysUserOrg.entity.SysUserOrg;
-import com.ctsi.System.SysUserOrg.mapper.SysUserOrgMapper;
-import com.ctsi.System.SysUserOrg.service.SysUserOrgService;
+import com.ctsi.system.sysUserOrg.entity.SysUserOrg;
+import com.ctsi.system.sysUserOrg.mapper.SysUserOrgMapper;
+import com.ctsi.system.sysUserOrg.service.SysUserOrgService;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
@@ -39,12 +39,11 @@ public class SysUserOrgServiceImpl implements SysUserOrgService{
     /**
      * 分页查询
      *
-     * @param sysUserOrg 筛选条件
      * @param current 当前页码
      * @param size  每页大小
      * @ return
      */
-    public Page<SysUserOrg> paginQuery(SysUserOrg sysUserOrg, long current, long size){
+    public Page<SysUserOrg> paginQuery(long current, long size){
         //1. 构建动态查询条件
         LambdaQueryWrapper<SysUserOrg> queryWrapper = new LambdaQueryWrapper<>();
         //2. 执行分页查询

core/src/main/java/com/ctsi/System/SysUserRole/controller/SysUserRoleController.java → core/src/main/java/com/ctsi/system/sysUserRole/controller/SysUserRoleController.java

@@ -1,8 +1,8 @@
-package com.ctsi.System.SysUserRole.controller;
+package com.ctsi.system.sysUserRole.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.System.SysUserRole.entity.SysUserRole;
-import com.ctsi.System.SysUserRole.service.SysUserRoleService;
+import com.ctsi.system.sysUserRole.entity.SysUserRole;
+import com.ctsi.system.sysUserRole.service.SysUserRoleService;
 import com.ctsi.entity.FramePage;
 import com.ctsi.utils.ApiResult;
 import io.swagger.annotations.ApiOperation;
@@ -44,14 +44,12 @@ public class SysUserRoleController{
     /** 
      * 分页查询
      *
-     * @param sysUserRole 筛选条件
-     * @ return 查询结果
      */
     @ApiOperation("分页查询")
     @GetMapping
-    public ApiResult<Page<SysUserRole>> paginQuery(SysUserRole sysUserRole, FramePage framePage){
+    public ApiResult<Page<SysUserRole>> paginQuery(FramePage framePage){
         try {
-            return ApiResult.success(sysUserRoleService.paginQuery(sysUserRole, framePage.getPageNum(), framePage.getPageSize()));
+            return ApiResult.success(sysUserRoleService.paginQuery(framePage.getPageNum(), framePage.getPageSize()));
         } catch (Exception e) {
             log.error(e.getMessage());
             return ApiResult.failure("分页查询失败",null);

core/src/main/java/com/ctsi/System/SysUserRole/entity/SysUserRole.java → core/src/main/java/com/ctsi/system/sysUserRole/entity/SysUserRole.java

@@ -1,4 +1,4 @@
-package com.ctsi.System.SysUserRole.entity;
+package com.ctsi.system.sysUserRole.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

core/src/main/java/com/ctsi/System/SysUserRole/entity/PO/SysUserRoleAddPO.java → core/src/main/java/com/ctsi/system/sysUserRole/entity/po/SysUserRoleAddPO.java

@@ -1,4 +1,4 @@
-package com.ctsi.System.SysUserRole.entity.PO;
+package com.ctsi.system.sysUserRole.entity.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;

core/src/main/java/com/ctsi/System/SysUserRole/entity/PO/SysUserRolePO.java → core/src/main/java/com/ctsi/system/sysUserRole/entity/po/SysUserRolePO.java

@@ -1,4 +1,4 @@
-package com.ctsi.System.SysUserRole.entity.PO;
+package com.ctsi.system.sysUserRole.entity.po;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

core/src/main/java/com/ctsi/System/SysUserRole/entity/VO/SysUserRoleAddVO.java → core/src/main/java/com/ctsi/system/sysUserRole/entity/vo/SysUserRoleAddVO.java

@@ -1,4 +1,4 @@
-package com.ctsi.System.SysUserRole.entity.VO;
+package com.ctsi.system.sysUserRole.entity.vo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;

core/src/main/java/com/ctsi/system/sysUserRole/mapper/SysUserRoleMapper.java

@@ -0,0 +1,24 @@
+package com.ctsi.system.sysUserRole.mapper;
+
+import com.ctsi.system.sysUserRole.entity.SysUserRole;
+import com.github.yulichang.base.MPJBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+ /**
+ * 用户角色表;(sys_user_role)表数据库访问层
+ * @author : machaoyi
+ * @date : 2024-1-11
+ */
+@Mapper
+public interface SysUserRoleMapper  extends MPJBaseMapper<SysUserRole> {
+// --注释掉检查 START (2024/1/23 10:55):
+//    /**
+//     * 分页查询指定行数据
+//     *
+//     * @param page 分页参数
+//     * @param wrapper 动态查询条件
+//     * @ return 分页对象列表
+//     */
+//    IPage<sysUserRole> selectByPage(IPage<sysUserRole> page , @Param(Constants.WRAPPER) Wrapper<sysUserRole> wrapper);
+// --注释掉检查 STOP (2024/1/23 10:55)
+}

core/src/main/java/com/ctsi/System/SysUserRole/mapper/SysUserRoleMapper.xml → core/src/main/java/com/ctsi/system/sysUserRole/mapper/SysUserRoleMapper.xml

@@ -1,8 +1,8 @@
 <?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.ctsi.System.SysUserRole.mapper.SysUserRoleMapper">
-     <select id="selectByPage" resultType="com.ctsi.System.SysUserRole.entity.SysUserRole">
+<mapper namespace="com.ctsi.system.sysUserRole.mapper.SysUserRoleMapper">
+     <select id="selectByPage" resultType="com.ctsi.system.sysUserRole.entity.SysUserRole">
         select * from sys_user_role ${ew.customSqlSegment}
     </select>
 </mapper>

core/src/main/java/com/ctsi/System/SysUserRole/service/SysUserRoleService.java → core/src/main/java/com/ctsi/system/sysUserRole/service/SysUserRoleService.java

@@ -1,9 +1,9 @@
-package com.ctsi.System.SysUserRole.service;
+package com.ctsi.system.sysUserRole.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.System.SysUserRole.entity.PO.SysUserRoleAddPO;
-import com.ctsi.System.SysUserRole.entity.SysUserRole;
-import com.ctsi.System.SysUserRole.entity.VO.SysUserRoleAddVO;
+import com.ctsi.system.sysUserRole.entity.po.SysUserRoleAddPO;
+import com.ctsi.system.sysUserRole.entity.SysUserRole;
+import com.ctsi.system.sysUserRole.entity.vo.SysUserRoleAddVO;
 
 /**
  * 用户角色表;(sys_user_role)表服务接口
@@ -23,12 +23,11 @@ public interface SysUserRoleService{
     /**
      * 分页查询
      *
-     * @param sysUserRole 筛选条件
      * @param current 当前页码
      * @param size  每页大小
      * @ return
      */
-    Page<SysUserRole> paginQuery(SysUserRole sysUserRole, long current, long size);
+    Page<SysUserRole> paginQuery(long current, long size);
     /** 
      * 新增数据
      *

core/src/main/java/com/ctsi/System/SysUserRole/service/impl/SysUserRoleServiceImpl.java → core/src/main/java/com/ctsi/system/sysUserRole/service/impl/SysUserRoleServiceImpl.java

@@ -1,16 +1,16 @@
-package com.ctsi.System.SysUserRole.service.impl;
+package com.ctsi.system.sysUserRole.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.System.SysRole.entity.SysRole;
-import com.ctsi.System.SysUserRole.entity.PO.SysUserRoleAddPO;
-import com.ctsi.System.SysUserRole.entity.PO.SysUserRolePO;
-import com.ctsi.System.SysUserRole.entity.SysUserRole;
-import com.ctsi.System.SysUserRole.entity.VO.SysUserRoleAddVO;
-import com.ctsi.System.SysUserRole.mapper.SysUserRoleMapper;
-import com.ctsi.System.SysUserRole.service.SysUserRoleService;
+import com.ctsi.system.sysRole.entity.SysRole;
+import com.ctsi.system.sysUserRole.entity.po.SysUserRoleAddPO;
+import com.ctsi.system.sysUserRole.entity.po.SysUserRolePO;
+import com.ctsi.system.sysUserRole.entity.SysUserRole;
+import com.ctsi.system.sysUserRole.entity.vo.SysUserRoleAddVO;
+import com.ctsi.system.sysUserRole.mapper.SysUserRoleMapper;
+import com.ctsi.system.sysUserRole.service.SysUserRoleService;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
@@ -41,12 +41,11 @@ public class SysUserRoleServiceImpl implements SysUserRoleService {
     /**
      * 分页查询
      *
-     * @param sysUserRole 筛选条件
      * @param current 当前页码
      * @param size  每页大小
      * @ return
      */
-    public Page<SysUserRole> paginQuery(SysUserRole sysUserRole, long current, long size){
+    public Page<SysUserRole> paginQuery(long current, long size){
         //1. 构建动态查询条件
         LambdaQueryWrapper<SysUserRole> queryWrapper = new LambdaQueryWrapper<>();
         //2. 执行分页查询

core/src/main/java/com/ctsi/utils/ApiResult.java

@@ -1,6 +1,6 @@
 package com.ctsi.utils;
 
-import com.ctsi.Enum.ErrorCodeEnum;
+import com.ctsi.anum.ErrorCodeEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

core/src/main/java/com/ctsi/utils/DicCodeUtils.java

@@ -1,6 +1,6 @@
 package com.ctsi.utils;
 
-import com.ctsi.System.SysDicItem.service.SysDicItemService;
+import com.ctsi.system.sysDicItem.service.SysDicItemService;
 import com.ctsi.annotation.DicCode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

core/src/main/java/com/ctsi/utils/RedisUtil.java

@@ -1,8 +1,6 @@
 package com.ctsi.utils;
 
 import jakarta.annotation.Resource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 
@@ -14,16 +12,14 @@ public final class RedisUtil {
     @Resource
     private RedisTemplate<String, Object> redisTemplate;
 
-    private static final Logger log = LoggerFactory.getLogger(RedisUtil.class);
-
     /**
      * 普通缓存获取
      *
      * @param key 键
      * @return 值
      */
-    public Object get(String key) {
-        return key == null ? null : redisTemplate.opsForValue().get(key);
+    public String getValueToString(String key) {
+        return key == null ? null : (String) redisTemplate.opsForValue().get(key);
     }
 
     /**
@@ -32,19 +28,12 @@ public final class RedisUtil {
      * @param key   键
      * @param value 值
      * @param time  时间(秒) time要大于0 如果time小于等于0 将设置无限期
-     * @return true成功 false 失败
      */
-    public boolean set(String key, Object value, long time) {
-        try {
-            if (time > 0) {
-                redisTemplate.opsForValue().set(key, value, time, TimeUnit.SECONDS);
-            } else {
-                set(key, value);
-            }
-            return true;
-        } catch (Exception e) {
-            log.error(e.getMessage());
-            return false;
+    public void set(String key, Object value, long time) {
+        if (time > 0) {
+            redisTemplate.opsForValue().set(key, value, time, TimeUnit.SECONDS);
+        } else {
+            set(key, value);
         }
     }
 
@@ -53,17 +42,10 @@ public final class RedisUtil {
      *
      * @param key   键
      * @param value 值
-     * @return true成功 false失败
      */
 
-    public boolean set(String key, Object value) {
-        try {
-            redisTemplate.opsForValue().set(key, value);
-            return true;
-        } catch (Exception e) {
-            log.error(e.getMessage());
-            return false;
-        }
+    public void set(String key, Object value) {
+        redisTemplate.opsForValue().set(key, value);
     }
 
     /**

qodana.yaml

@@ -18,7 +18,7 @@ profile:
 #    paths:
 #      - <path/where/not/run/inspection>
 
-projectJDK: 8 #(Applied in CI/CD pipeline)
+projectJDK: "17" #(Applied in CI/CD pipeline)
 
 #Execute shell command before Qodana execution (Applied in CI/CD pipeline)
 #bootstrap: sh ./prepare-qodana.sh