平台业务调整

platform/src/main/java/com/jzg/entity/po/SysMenu.java → commons/src/main/java/com/jzg/commons/entity/po/SysMenu.java

@@ -1,4 +1,4 @@
-package com.jzg.entity.po;
+package com.jzg.commons.entity.po;
 
 import lombok.Data;
 

platform/src/main/java/com/jzg/entity/po/SysOperLog.java → commons/src/main/java/com/jzg/commons/entity/po/SysOperLog.java

@@ -1,9 +1,8 @@
-package com.jzg.entity.po;
+package com.jzg.commons.entity.po;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
-import java.io.Serializable;
 import java.util.Date;
 
 /**

platform/src/main/java/com/jzg/entity/po/SysRole.java → commons/src/main/java/com/jzg/commons/entity/po/SysRole.java

@@ -1,4 +1,4 @@
-package com.jzg.entity.po;
+package com.jzg.commons.entity.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;

platform/src/main/java/com/jzg/entity/po/SysRoleMenu.java → commons/src/main/java/com/jzg/commons/entity/po/SysRoleMenu.java

@@ -1,4 +1,4 @@
-package com.jzg.entity.po;
+package com.jzg.commons.entity.po;
 
 import lombok.Data;
 

platform/src/main/java/com/jzg/entity/po/SysRolePerms.java → commons/src/main/java/com/jzg/commons/entity/po/SysRolePerms.java

@@ -1,4 +1,4 @@
-package com.jzg.entity.po;
+package com.jzg.commons.entity.po;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

platform/src/main/java/com/jzg/entity/po/SysSystem.java → commons/src/main/java/com/jzg/commons/entity/po/SysSystem.java

@@ -1,10 +1,6 @@
-package com.jzg.entity.po;
-
-import java.io.Serializable;
-import java.util.Date;
+package com.jzg.commons.entity.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.jzg.commons.core.base.BaseModel;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

platform/src/main/java/com/jzg/entity/po/SysSystemPerms.java → commons/src/main/java/com/jzg/commons/entity/po/SysSystemPerms.java

@@ -1,4 +1,4 @@
-package com.jzg.entity.po;
+package com.jzg.commons.entity.po;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

platform/src/main/java/com/jzg/entity/po/SysUploadFiles.java → commons/src/main/java/com/jzg/commons/entity/po/SysUploadFiles.java

@@ -1,4 +1,4 @@
-package com.jzg.entity.po;
+package com.jzg.commons.entity.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.v3.oas.annotations.media.Schema;

platform/src/main/java/com/jzg/entity/po/SysUser.java → commons/src/main/java/com/jzg/commons/entity/po/SysUser.java

@@ -1,16 +1,14 @@
-package com.jzg.entity.po;
+package com.jzg.commons.entity.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.jzg.commons.core.base.BaseModel;
-import com.jzg.entity.vo.SysSystemVo;
+import com.jzg.commons.entity.vo.SysSystemVo;
 import com.jzg.util.PasswordUtils;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.UUID;
-
 /**
  * 核心用户管理表实体 sys_user
  *

platform/src/main/java/com/jzg/entity/po/SysUserRole.java → commons/src/main/java/com/jzg/commons/entity/po/SysUserRole.java

@@ -1,4 +1,4 @@
-package com.jzg.entity.po;
+package com.jzg.commons.entity.po;
 
 import lombok.Data;
 

platform/src/main/java/com/jzg/entity/vo/SysRoleVo.java → commons/src/main/java/com/jzg/commons/entity/vo/SysRoleVo.java

@@ -1,8 +1,8 @@
-package com.jzg.entity.vo;
+package com.jzg.commons.entity.vo;
 
 import com.jzg.commons.core.base.PageRequest;
-import com.jzg.entity.po.SysRole;
-import com.jzg.entity.po.SysRolePerms;
+import com.jzg.commons.entity.po.SysRole;
+import com.jzg.commons.entity.po.SysRolePerms;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotEmpty;

platform/src/main/java/com/jzg/entity/vo/SysSystemPermsVo.java → commons/src/main/java/com/jzg/commons/entity/vo/SysSystemPermsVo.java

@@ -1,4 +1,4 @@
-package com.jzg.entity.vo;
+package com.jzg.commons.entity.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;

platform/src/main/java/com/jzg/entity/vo/SysSystemVo.java → commons/src/main/java/com/jzg/commons/entity/vo/SysSystemVo.java

@@ -1,4 +1,4 @@
-package com.jzg.entity.vo;
+package com.jzg.commons.entity.vo;
 
 import com.jzg.commons.core.base.PageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;

platform/src/main/java/com/jzg/entity/vo/SysUserVo.java → commons/src/main/java/com/jzg/commons/entity/vo/SysUserVo.java

@@ -1,4 +1,4 @@
-package com.jzg.entity.vo;
+package com.jzg.commons.entity.vo;
 
 import com.jzg.commons.core.base.PageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;

platform/src/main/java/com/jzg/mapper/SysMenuMapper.java → commons/src/main/java/com/jzg/commons/mapper/SysMenuMapper.java

@@ -1,7 +1,7 @@
-package com.jzg.mapper;
+package com.jzg.commons.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.jzg.entity.po.SysMenu;
+import com.jzg.commons.entity.po.SysMenu;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

platform/src/main/java/com/jzg/mapper/SysOperLogMapper.java → commons/src/main/java/com/jzg/commons/mapper/SysOperLogMapper.java

@@ -1,7 +1,7 @@
-package com.jzg.mapper;
+package com.jzg.commons.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.jzg.entity.po.SysOperLog;
+import com.jzg.commons.entity.po.SysOperLog;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

platform/src/main/java/com/jzg/mapper/SysRoleMapper.java → commons/src/main/java/com/jzg/commons/mapper/SysRoleMapper.java

@@ -1,7 +1,7 @@
-package com.jzg.mapper;
+package com.jzg.commons.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.jzg.entity.po.SysRole;
+import com.jzg.commons.entity.po.SysRole;
 import com.jzg.commons.entity.vo.RolePermissionVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

platform/src/main/java/com/jzg/mapper/SysRoleMenuMapper.java → commons/src/main/java/com/jzg/commons/mapper/SysRoleMenuMapper.java

@@ -1,7 +1,7 @@
-package com.jzg.mapper;
+package com.jzg.commons.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.jzg.entity.po.SysRoleMenu;
+import com.jzg.commons.entity.po.SysRoleMenu;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

platform/src/main/java/com/jzg/mapper/SysRolePermsMapper.java → commons/src/main/java/com/jzg/commons/mapper/SysRolePermsMapper.java

@@ -1,8 +1,7 @@
-package com.jzg.mapper;
+package com.jzg.commons.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.jzg.entity.po.SysMenu;
-import com.jzg.entity.po.SysRolePerms;
+import com.jzg.commons.entity.po.SysRolePerms;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

platform/src/main/java/com/jzg/mapper/SysSystemMapper.java → commons/src/main/java/com/jzg/commons/mapper/SysSystemMapper.java

@@ -1,7 +1,7 @@
-package com.jzg.mapper;
+package com.jzg.commons.mapper;
 
-import com.jzg.entity.po.SysSystem;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jzg.commons.entity.po.SysSystem;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

platform/src/main/java/com/jzg/mapper/SysSystemPermsMapper.java → commons/src/main/java/com/jzg/commons/mapper/SysSystemPermsMapper.java

@@ -1,8 +1,7 @@
-package com.jzg.mapper;
+package com.jzg.commons.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.jzg.entity.po.SysMenu;
-import com.jzg.entity.po.SysSystemPerms;
+import com.jzg.commons.entity.po.SysSystemPerms;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

platform/src/main/java/com/jzg/mapper/SysUploadFilesMapper.java → commons/src/main/java/com/jzg/commons/mapper/SysUploadFilesMapper.java

@@ -1,8 +1,7 @@
-package com.jzg.mapper;
+package com.jzg.commons.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.jzg.entity.po.SysUploadFiles;
-import com.jzg.entity.po.SysUserRole;
+import com.jzg.commons.entity.po.SysUploadFiles;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

platform/src/main/java/com/jzg/mapper/SysUserMapper.java → commons/src/main/java/com/jzg/commons/mapper/SysUserMapper.java

@@ -1,7 +1,7 @@
-package com.jzg.mapper;
+package com.jzg.commons.mapper;
 
-import com.jzg.entity.po.SysUser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jzg.commons.entity.po.SysUser;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

platform/src/main/java/com/jzg/mapper/SysUserRoleMapper.java → commons/src/main/java/com/jzg/commons/mapper/SysUserRoleMapper.java

@@ -1,7 +1,7 @@
-package com.jzg.mapper;
+package com.jzg.commons.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.jzg.entity.po.SysUserRole;
+import com.jzg.commons.entity.po.SysUserRole;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

platform/src/main/java/com/jzg/service/SysOperLogService.java → commons/src/main/java/com/jzg/commons/service/SysOperLogService.java

@@ -1,6 +1,6 @@
-package com.jzg.service;
+package com.jzg.commons.service;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.jzg.entity.po.SysOperLog;
+import com.jzg.commons.entity.po.SysOperLog;
 
 import java.util.List;
 

platform/src/main/java/com/jzg/service/SysSystemService.java → commons/src/main/java/com/jzg/commons/service/SysSystemService.java

@@ -1,13 +1,12 @@
-package com.jzg.service;
+package com.jzg.commons.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jzg.commons.entity.vo.UpAndDownVo;
-import com.jzg.entity.po.SysSystem;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.jzg.entity.po.SysSystemPerms;
-import com.jzg.entity.vo.SysSystemPermsVo;
-import com.jzg.entity.vo.SysSystemVo;
-import jakarta.validation.constraints.NotEmpty;
+import com.jzg.commons.entity.po.SysSystem;
+import com.jzg.commons.entity.po.SysSystemPerms;
+import com.jzg.commons.entity.vo.SysSystemPermsVo;
+import com.jzg.commons.entity.vo.SysSystemVo;
+import com.jzg.commons.entity.vo.UpAndDownVo;
 
 import java.util.List;
 

platform/src/main/java/com/jzg/service/SysUserService.java → commons/src/main/java/com/jzg/commons/service/SysUserService.java

@@ -1,14 +1,10 @@
-package com.jzg.service;
+package com.jzg.commons.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jzg.commons.entity.vo.UpAndDownVo;
-import com.jzg.entity.po.SysUser;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.jzg.entity.vo.SysUserVo;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Pattern;
-import jakarta.validation.constraints.Size;
+import com.jzg.commons.entity.po.SysUser;
+import com.jzg.commons.entity.vo.SysUserVo;
+import com.jzg.commons.entity.vo.UpAndDownVo;
 
 import java.util.List;
 

platform/src/main/java/com/jzg/service/UserRoleService.java → commons/src/main/java/com/jzg/commons/service/UserRoleService.java

@@ -1,9 +1,9 @@
-package com.jzg.service;
+package com.jzg.commons.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.jzg.entity.po.SysRole;
+import com.jzg.commons.entity.po.SysRole;
 import com.jzg.commons.entity.vo.RolePermissionVo;
-import com.jzg.entity.vo.SysRoleVo;
+import com.jzg.commons.entity.vo.SysRoleVo;
 
 import java.util.List;
 

platform/src/main/java/com/jzg/service/impl/SysOperLogServiceImpl.java → commons/src/main/java/com/jzg/commons/service/impl/SysOperLogServiceImpl.java

@@ -1,9 +1,9 @@
-package com.jzg.service.impl;
+package com.jzg.commons.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jzg.entity.po.SysOperLog;
-import com.jzg.mapper.SysOperLogMapper;
-import com.jzg.service.SysOperLogService;
+import com.jzg.commons.entity.po.SysOperLog;
+import com.jzg.commons.mapper.SysOperLogMapper;
+import com.jzg.commons.service.SysOperLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

platform/src/main/java/com/jzg/service/impl/SysSystemServiceImpl.java → commons/src/main/java/com/jzg/commons/service/impl/SysSystemServiceImpl.java

@@ -1,4 +1,4 @@
-package com.jzg.service.impl;
+package com.jzg.commons.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
@@ -6,17 +6,17 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.entity.enums.YesNoEnum;
+import com.jzg.commons.entity.po.*;
+import com.jzg.commons.entity.vo.SysSystemPermsVo;
+import com.jzg.commons.entity.vo.SysSystemVo;
 import com.jzg.commons.entity.vo.UpAndDownVo;
-import com.jzg.entity.po.*;
-import com.jzg.entity.vo.SysSystemPermsVo;
-import com.jzg.entity.vo.SysSystemVo;
-import com.jzg.mapper.*;
-import com.jzg.service.SysSystemService;
-import com.jzg.util.PasswordUtils;
+import com.jzg.commons.mapper.*;
+import com.jzg.commons.service.SysSystemService;
 import com.jzg.commons.util.StringUtils;
 import com.jzg.commons.util.idgen.IdGenerate;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.jzg.util.PasswordUtils;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

platform/src/main/java/com/jzg/service/impl/SysUserServiceImpl.java → commons/src/main/java/com/jzg/commons/service/impl/SysUserServiceImpl.java

@@ -1,22 +1,20 @@
-package com.jzg.service.impl;
+package com.jzg.commons.service.impl;
 
 import cn.hutool.core.convert.Convert;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.entity.enums.YesNoEnum;
+import com.jzg.commons.entity.po.SysRole;
+import com.jzg.commons.entity.po.SysUser;
+import com.jzg.commons.entity.po.SysUserRole;
+import com.jzg.commons.entity.vo.SysUserVo;
 import com.jzg.commons.entity.vo.UpAndDownVo;
-import com.jzg.entity.po.SysRole;
-import com.jzg.entity.po.SysSystem;
-import com.jzg.entity.po.SysUser;
-import com.jzg.entity.po.SysUserRole;
-import com.jzg.entity.vo.SysUserVo;
-import com.jzg.mapper.SysRoleMapper;
-import com.jzg.mapper.SysUserMapper;
-import com.jzg.mapper.SysUserRoleMapper;
-import com.jzg.service.SysUserService;
+import com.jzg.commons.mapper.SysRoleMapper;
+import com.jzg.commons.mapper.SysUserMapper;
+import com.jzg.commons.mapper.SysUserRoleMapper;
+import com.jzg.commons.service.SysUserService;
 import com.jzg.commons.util.StringUtils;
 import com.jzg.util.PasswordUtils;
 import org.springframework.beans.BeanUtils;

platform/src/main/java/com/jzg/service/impl/UserRoleServiceImpl.java → commons/src/main/java/com/jzg/commons/service/impl/UserRoleServiceImpl.java

@@ -1,20 +1,20 @@
-package com.jzg.service.impl;
+package com.jzg.commons.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.annotation.IgnoreTenant;
-import com.jzg.entity.po.SysRole;
-import com.jzg.entity.po.SysRolePerms;
-import com.jzg.entity.po.SysUserRole;
+import com.jzg.commons.entity.po.SysRole;
+import com.jzg.commons.entity.po.SysRolePerms;
+import com.jzg.commons.entity.po.SysUserRole;
 import com.jzg.commons.entity.vo.RolePermissionVo;
-import com.jzg.entity.vo.SysRoleVo;
+import com.jzg.commons.entity.vo.SysRoleVo;
 import com.jzg.commons.exception.SystemException;
-import com.jzg.mapper.SysMenuMapper;
-import com.jzg.mapper.SysRoleMapper;
-import com.jzg.mapper.SysRolePermsMapper;
-import com.jzg.mapper.SysUserRoleMapper;
-import com.jzg.service.SysSystemService;
-import com.jzg.service.UserRoleService;
+import com.jzg.commons.mapper.SysMenuMapper;
+import com.jzg.commons.mapper.SysRoleMapper;
+import com.jzg.commons.mapper.SysRolePermsMapper;
+import com.jzg.commons.mapper.SysUserRoleMapper;
+import com.jzg.commons.service.SysSystemService;
+import com.jzg.commons.service.UserRoleService;
 import com.jzg.commons.util.idgen.IdGenerate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

commons/src/main/java/com/jzg/commons/util/tree/INode.java

@@ -1,13 +0,0 @@
-package com.jzg.commons.util.tree;
-
-import java.util.List;
-/**
- * 树型节点
- * @author dongxin
- */
-public interface INode  {
-    public Object getId();
-    public Object getParentId();
-    public String getName();
-    public List<INode> getChildren();
-}

commons/src/main/java/com/jzg/commons/util/tree/IRecursionTree.java

@@ -1,21 +0,0 @@
-package com.jzg.commons.util.tree;
-
-/**
- * 树型递归接口
- * @author dongxin
- */
-public interface IRecursionTree<T,R> {
-    /**
-     * 先序处理
-     * @param t
-     * @param res
-     */
-    void rowHandleBefore(T t, R res);
-
-    /**
-     * 后序处理
-     * @param t
-     * @param res
-     */
-    void rowHandleAfter(T t,R res);
-}

commons/src/main/java/com/jzg/commons/util/tree/TreeTool.java

@@ -1,60 +0,0 @@
-package com.jzg.commons.util.tree;
-
-import cn.hutool.core.collection.CollectionUtil;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-/**
- * 树型工具
- * @author dongxin
- */
-public class TreeTool {
-    /**
-     * 列表转树
-     * @param list
-     * @param parentId
-     * @return
-     */
-    public static List<INode> listToTree(List<INode> list, Object parentId){
-        return listToTree(list, parentId, INode.class);
-    }
-    /**
-     * 列表转树
-     * @param list
-     * @param parentId
-     * @return
-     */
-    public static <T extends INode> List<T> listToTree(List<T> list, Object parentId, Class<T> clazz){
-        if(list == null || list.isEmpty()){
-            return new ArrayList<>();
-        }
-        List<T> res = list.stream().filter(item->{
-            return item.getParentId()!=null&&parentId!=null&&item.getParentId().equals(parentId);
-        }).collect(Collectors.toList());
-        if(!res.isEmpty()) {
-            res.forEach(item->{
-                item.getChildren().addAll(listToTree(list, item.getId(),clazz));
-            });
-        }
-        return res;
-    }
-
-    /**
-     * 递归树
-     * @param treeData 树型结构数据
-     * @param recursionTree 递归处理接口
-     * @param res 递归返回值
-     * @param <T>
-     * @param <R>
-     */
-    public static <T extends INode,R> void recursion(List<T> treeData, IRecursionTree<T,R> recursionTree, R res) {
-        if(CollectionUtil.isNotEmpty(treeData)) {
-            treeData.forEach(data->{
-                recursionTree.rowHandleBefore(data,res);
-                recursion((List<T>) data.getChildren(),recursionTree,res);
-                recursionTree.rowHandleAfter(data, res);
-            });
-        }
-    }
-}

platform/src/main/resources/mapper/SysOperLogMapper.xml → commons/src/main/resources/mapper/SysOperLogMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jzg.mapper.SysOperLogMapper">
+<mapper namespace="com.jzg.commons.mapper.SysOperLogMapper">
 
-	<resultMap type="com.jzg.entity.po.SysOperLog" id="SysOperLogResult">
+	<resultMap type="com.jzg.commons.entity.po.SysOperLog" id="SysOperLogResult">
 		<id     property="id"         column="id"        />
 		<result property="title"          column="title"          />
 		<result property="businessType"   column="business_type"  />
@@ -29,12 +29,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from sys_oper_log
     </sql>
     
-	<insert id="insertOperlog" parameterType="com.jzg.entity.po.SysOperLog">
+	<insert id="insertOperlog" parameterType="com.jzg.commons.entity.po.SysOperLog">
 		insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name,dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, cost_time, oper_time)
         values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName} ,#{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, #{costTime}, sysdate())
 	</insert>
 	
-	<select id="selectOperLogList" parameterType="com.jzg.entity.po.SysOperLog" resultMap="SysOperLogResult">
+	<select id="selectOperLogList" parameterType="com.jzg.commons.entity.po.SysOperLog" resultMap="SysOperLogResult">
 		<include refid="selectOperLogVo"/>
 		<where>
 			<if test="operIp != null and operIp != ''">

platform/src/main/resources/mapper/SysRoleMapper.xml → commons/src/main/resources/mapper/SysRoleMapper.xml

@@ -1,6 +1,6 @@
 <?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.jzg.mapper.SysRoleMapper">
+<mapper namespace="com.jzg.commons.mapper.SysRoleMapper">
     <resultMap id="RoleMenuMap" type="com.jzg.commons.entity.vo.RolePermissionVo">
         <result column="id" property="id"/>
         <result column="systemCode" property="systemCode"/>
@@ -34,7 +34,7 @@
                 LEFT JOIN sys_role sr ON sr.system_code = ss.sys_code
                 LEFT JOIN sys_role_perms srp ON sr.id = srp.role_id
     </select>
-    <select id="queryByUserIds" resultType="com.jzg.entity.po.SysRole">
+    <select id="queryByUserIds" resultType="com.jzg.commons.entity.po.SysRole">
         SELECT
             sur.user_id, sur.`name`
         FROM

platform/src/main/resources/mapper/SysSystemMapper.xml → commons/src/main/resources/mapper/SysSystemMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jzg.mapper.SysSystemMapper">
+<mapper namespace="com.jzg.commons.mapper.SysSystemMapper">
 
-    <resultMap id="SysSystemResult" type="com.jzg.entity.po.SysSystem">
+    <resultMap id="SysSystemResult" type="com.jzg.commons.entity.po.SysSystem">
             <id property="id" column="id" jdbcType="VARCHAR"/>
             <result property="sysCode" column="sys_code" jdbcType="VARCHAR"/>
             <result property="sysName" column="sys_name" jdbcType="VARCHAR"/>

platform/src/main/resources/mapper/SysUserMapper.xml → commons/src/main/resources/mapper/SysUserMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jzg.mapper.SysUserMapper">
+<mapper namespace="com.jzg.commons.mapper.SysUserMapper">
 
-    <resultMap id="SysUserResult" type="com.jzg.entity.po.SysUser">
+    <resultMap id="SysUserResult" type="com.jzg.commons.entity.po.SysUser">
             <id property="id" column="id" jdbcType="VARCHAR"/>
             <result property="username" column="username" jdbcType="VARCHAR"/>
             <result property="password" column="password" jdbcType="VARCHAR"/>

platform/src/main/java/com/jzg/aop/aspect/LogAspect.java

@@ -5,7 +5,7 @@ import com.jzg.commons.annotation.Log;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.entity.enums.BusinessStatus;
 import com.jzg.commons.entity.enums.HttpMethod;
-import com.jzg.entity.po.SysOperLog;
+import com.jzg.commons.entity.po.SysOperLog;
 import com.jzg.commons.filter.PropertyPreExcludeFilter;
 import com.jzg.manager.AsyncManager;
 import com.jzg.manager.factory.AsyncFactory;

platform/src/main/java/com/jzg/controller/FileUploadController.java

@@ -3,8 +3,8 @@ package com.jzg.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
-import com.jzg.entity.po.SysUploadFiles;
-import com.jzg.mapper.SysUploadFilesMapper;
+import com.jzg.commons.entity.po.SysUploadFiles;
+import com.jzg.commons.mapper.SysUploadFilesMapper;
 import com.jzg.commons.util.FileUtils;
 import com.jzg.commons.util.idgen.IdGenerate;
 import io.minio.*;

platform/src/main/java/com/jzg/controller/SysSystemController.java

@@ -4,10 +4,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jzg.commons.annotation.Log;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.enums.BusinessType;
+import com.jzg.commons.entity.vo.SysSystemPermsVo;
+import com.jzg.commons.entity.vo.SysSystemVo;
 import com.jzg.commons.entity.vo.UpAndDownVo;
-import com.jzg.entity.vo.SysSystemPermsVo;
-import com.jzg.entity.vo.SysSystemVo;
-import com.jzg.service.SysSystemService;
+import com.jzg.commons.service.SysSystemService;
 import com.jzg.commons.util.AssertionUtils;
 import com.jzg.commons.util.StringUtils;
 import io.swagger.v3.oas.annotations.Operation;

platform/src/main/java/com/jzg/controller/SysUserController.java

@@ -5,12 +5,11 @@ import com.jzg.commons.annotation.Log;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.enums.BusinessType;
+import com.jzg.commons.entity.vo.SysUserVo;
 import com.jzg.commons.entity.vo.UpAndDownVo;
+import com.jzg.commons.service.SysUserService;
 import com.jzg.commons.util.AssertionUtils;
 import com.jzg.commons.util.StringUtils;
-import com.jzg.entity.vo.SysSystemVo;
-import com.jzg.entity.vo.SysUserVo;
-import com.jzg.service.SysUserService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.constraints.NotEmpty;

platform/src/main/java/com/jzg/controller/UserRoleController.java

@@ -5,10 +5,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
-import com.jzg.entity.po.SysRole;
-import com.jzg.entity.vo.SysRoleVo;
+import com.jzg.commons.entity.po.SysRole;
+import com.jzg.commons.entity.vo.SysRoleVo;
 import com.jzg.commons.exception.ValidateException;
-import com.jzg.service.UserRoleService;
+import com.jzg.commons.service.UserRoleService;
 import com.jzg.commons.util.StringUtils;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

platform/src/main/java/com/jzg/event/PlatFormApplicationLister.java

@@ -3,7 +3,7 @@ package com.jzg.event;
 import com.alibaba.fastjson.JSONObject;
 import com.jzg.commons.constants.RedisKeyConstants;
 import com.jzg.commons.entity.vo.RolePermissionVo;
-import com.jzg.service.UserRoleService;
+import com.jzg.commons.service.UserRoleService;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.event.ApplicationReadyEvent;

platform/src/main/java/com/jzg/manager/factory/AsyncFactory.java

@@ -1,8 +1,7 @@
 package com.jzg.manager.factory;
 
-import com.jzg.entity.po.SysOperLog;
-import com.jzg.service.SysOperLogService;
-import com.jzg.service.impl.SysOperLogServiceImpl;
+import com.jzg.commons.entity.po.SysOperLog;
+import com.jzg.commons.service.SysOperLogService;
 import com.jzg.commons.util.ip.AddressUtils;
 import com.jzg.commons.util.spring.SpringUtils;
 import org.slf4j.Logger;

tenant/organization/src/main/java/com/jzg/organization/controller/DeptController.java

@@ -61,15 +61,5 @@ public class DeptController extends BaseController {
         return HttpResult.ok(deptTree);
     }
 
-    /**
-     * 查询租户机构树
-     * @param systemCode
-     * @return
-     */
-    @PostMapping("/tree")
-    @Operation(summary = "查询租户机构树")
-    public HttpResult<List<SysDept>> tree(String systemCode) {
-        return HttpResult.ok(sysDeptService.tree(systemCode));
-    }
 
 }

tenant/organization/src/main/java/com/jzg/organization/entity/po/SysDept.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.jzg.commons.core.base.BaseModel;
-import com.jzg.commons.util.tree.INode;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -17,7 +16,7 @@ import java.util.List;
 @TableName(value = "sys_dept")
 @Data
 @Schema(description = "机构管理")
-public class SysDept extends BaseModel implements Serializable ,INode {
+public class SysDept extends BaseModel implements Serializable{
     @TableId(value = "id")
     @Schema(description = "主键")
     private String id;
@@ -70,16 +69,4 @@ public class SysDept extends BaseModel implements Serializable ,INode {
     @Schema(description = "子机构")
     private List<SysDept> children;
 
-    @TableField(exist = false)
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<INode> childrenNode;
-
-    @Override
-    public List<INode> getChildren() {
-        if(childrenNode == null) {
-            childrenNode = new ArrayList<>();
-        }
-        return childrenNode;
-    }
-
 }

tenant/organization/src/main/java/com/jzg/organization/service/SysDeptService.java

@@ -38,11 +38,4 @@ public interface SysDeptService extends IService<SysDept> {
      * 机构树
      */
     List<SysDept> getDeptTree(String deptId);
-
-    /**
-     * 查询租户机构树
-     * @param systemCode
-     * @return
-     */
-    List<SysDept> tree(String systemCode);
 }

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysDeptServiceImpl.java

@@ -1,14 +1,11 @@
 package com.jzg.organization.service.impl;
 
-import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.commons.util.idgen.IdGenerate;
-import com.jzg.commons.util.tree.TreeTool;
 import com.jzg.organization.entity.po.SysDept;
 import com.jzg.organization.entity.po.SysSystem;
 import com.jzg.organization.entity.vo.SysDeptVo;
@@ -163,19 +160,4 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
         return newResultDept;
     }
 
-    @Override
-    public List<SysDept> tree(String systemCode) {
-        LambdaQueryWrapper<SysDept> lqw = buildQueryWrapper(systemCode);
-        List<SysDept> depts = sysDeptMapper.selectDeptList(lqw);
-        List<SysDept> treeData = TreeTool.listToTree(BeanUtil.copyToList(depts, SysDept.class),0L,SysDept.class);
-        return treeData;
-    }
-
-    private LambdaQueryWrapper<SysDept> buildQueryWrapper(String systemCode) {
-        LambdaQueryWrapper<SysDept> lqw = Wrappers.lambdaQuery();
-        lqw.eq(SysDept::getSystemCode, systemCode);
-        lqw.orderByAsc(SysDept::getParentId);
-        lqw.orderByAsc(SysDept::getOrderNum);
-        return lqw;
-    }
 }