平台业务调整

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

@@ -4,9 +4,9 @@ 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.commons.entity.po.SysUploadFiles;
-import com.jzg.commons.mapper.SysUploadFilesMapper;
 import com.jzg.commons.util.FileUtils;
 import com.jzg.commons.util.idgen.IdGenerate;
+import com.jzg.mapper.SysUploadFilesMapper;
 import io.minio.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;

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

@@ -7,9 +7,9 @@ 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.commons.service.SysSystemService;
 import com.jzg.commons.util.AssertionUtils;
 import com.jzg.commons.util.StringUtils;
+import com.jzg.service.SysSystemService;
 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/SysUserController.java

@@ -7,9 +7,9 @@ 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.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

@@ -2,14 +2,13 @@ package com.jzg.controller;
 
 
 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.commons.entity.po.SysRole;
 import com.jzg.commons.entity.vo.SysRoleVo;
 import com.jzg.commons.exception.ValidateException;
-import com.jzg.commons.service.UserRoleService;
 import com.jzg.commons.util.StringUtils;
+import com.jzg.service.UserRoleService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;

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.commons.service.UserRoleService;
+import com.jzg.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,9 +1,9 @@
 package com.jzg.manager.factory;
 
 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 com.jzg.service.SysOperLogService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

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

@@ -1,4 +1,4 @@
-package com.jzg.commons.mapper;
+package com.jzg.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jzg.commons.entity.po.SysMenu;

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

@@ -1,4 +1,4 @@
-package com.jzg.commons.mapper;
+package com.jzg.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jzg.commons.entity.po.SysOperLog;

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

@@ -1,4 +1,4 @@
-package com.jzg.commons.mapper;
+package com.jzg.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jzg.commons.entity.po.SysRole;

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

@@ -1,4 +1,4 @@
-package com.jzg.commons.mapper;
+package com.jzg.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jzg.commons.entity.po.SysRoleMenu;

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

@@ -1,4 +1,4 @@
-package com.jzg.commons.mapper;
+package com.jzg.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jzg.commons.entity.po.SysRolePerms;

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

@@ -1,4 +1,4 @@
-package com.jzg.commons.mapper;
+package com.jzg.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jzg.commons.entity.po.SysSystem;

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

@@ -1,4 +1,4 @@
-package com.jzg.commons.mapper;
+package com.jzg.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jzg.commons.entity.po.SysSystemPerms;

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

@@ -1,4 +1,4 @@
-package com.jzg.commons.mapper;
+package com.jzg.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jzg.commons.entity.po.SysUploadFiles;

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

@@ -1,4 +1,4 @@
-package com.jzg.commons.mapper;
+package com.jzg.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jzg.commons.entity.po.SysUser;

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

@@ -1,4 +1,4 @@
-package com.jzg.commons.mapper;
+package com.jzg.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jzg.commons.entity.po.SysUserRole;

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

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

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

@@ -1,4 +1,4 @@
-package com.jzg.commons.service;
+package com.jzg.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;

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

@@ -1,4 +1,4 @@
-package com.jzg.commons.service;
+package com.jzg.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;

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

@@ -1,4 +1,4 @@
-package com.jzg.commons.service;
+package com.jzg.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jzg.commons.entity.po.SysRole;

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

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

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

@@ -1,4 +1,4 @@
-package com.jzg.commons.service.impl;
+package com.jzg.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
@@ -11,9 +11,10 @@ import com.jzg.commons.entity.vo.SysSystemPermsVo;
 import com.jzg.commons.entity.vo.SysSystemVo;
 import com.jzg.commons.entity.vo.UpAndDownVo;
 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 com.jzg.mapper.*;
+import com.jzg.service.SysSystemService;
 import com.jzg.util.PasswordUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,4 +1,4 @@
-package com.jzg.commons.service.impl;
+package com.jzg.service.impl;
 
 import cn.hutool.core.convert.Convert;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -11,11 +11,11 @@ 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.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.mapper.SysRoleMapper;
+import com.jzg.mapper.SysUserMapper;
+import com.jzg.mapper.SysUserRoleMapper;
+import com.jzg.service.SysUserService;
 import com.jzg.util.PasswordUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,4 +1,4 @@
-package com.jzg.commons.service.impl;
+package com.jzg.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -9,13 +9,13 @@ import com.jzg.commons.entity.po.SysUserRole;
 import com.jzg.commons.entity.vo.RolePermissionVo;
 import com.jzg.commons.entity.vo.SysRoleVo;
 import com.jzg.commons.exception.SystemException;
-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 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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

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

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jzg.commons.mapper.SysOperLogMapper">
+<mapper namespace="com.jzg.mapper.SysOperLogMapper">
 
 	<resultMap type="com.jzg.commons.entity.po.SysOperLog" id="SysOperLogResult">
 		<id     property="id"         column="id"        />

commons/src/main/resources/mapper/SysRoleMapper.xml → platform/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.commons.mapper.SysRoleMapper">
+<mapper namespace="com.jzg.mapper.SysRoleMapper">
     <resultMap id="RoleMenuMap" type="com.jzg.commons.entity.vo.RolePermissionVo">
         <result column="id" property="id"/>
         <result column="systemCode" property="systemCode"/>

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

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

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

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