#

luxiaotao1123

2024-02-17 32e256d44e014f848ccda6f5d09ad2c3392d42fd

#

 zy-asrs-framework/src/main/resources/templates/react/Controller.txt

@@ -1,4 +1,4 @@
package com.zy.asrs.wcs.sys.controller;
package com.zy.asrs.wcs.system.controller;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,8 +8,8 @@
import com.zy.asrs.wcs.common.domain.BaseParam;
import com.zy.asrs.wcs.common.domain.KeyValVo;
import com.zy.asrs.wcs.common.domain.PageParam;
import com.zy.asrs.wcs.sys.entity.Role;
import com.zy.asrs.wcs.sys.service.RoleService;
import com.zy.asrs.wcs.system.entity.Role;
import com.zy.asrs.wcs.system.service.RoleService;
import com.zy.asrs.wcs.utils.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/aspect/OperationLogAspect.java

@@ -4,9 +4,9 @@
import com.zy.asrs.common.utils.IpTools;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.wcs.common.annotation.OperationLog;
import com.zy.asrs.wcs.sys.entity.OperationRecord;
import com.zy.asrs.wcs.sys.entity.User;
import com.zy.asrs.wcs.sys.service.OperationRecordService;
import com.zy.asrs.wcs.system.entity.OperationRecord;
import com.zy.asrs.wcs.system.entity.User;
import com.zy.asrs.wcs.system.service.OperationRecordService;
import com.zy.asrs.wcs.utils.Utils;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.*;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/config/MybatisPlusConfig.java

@@ -4,7 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler;
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
import com.zy.asrs.wcs.sys.entity.User;
import com.zy.asrs.wcs.system.entity.User;
import net.sf.jsqlparser.expression.Expression;
import net.sf.jsqlparser.expression.LongValue;
import net.sf.jsqlparser.expression.NullValue;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/JwtAuthenticationFilter.java

@@ -3,11 +3,11 @@
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.wcs.common.config.ConfigProperties;
import com.zy.asrs.wcs.common.constant.Constants;
import com.zy.asrs.wcs.sys.entity.Menu;
import com.zy.asrs.wcs.sys.entity.User;
import com.zy.asrs.wcs.sys.entity.UserLogin;
import com.zy.asrs.wcs.sys.service.UserLoginService;
import com.zy.asrs.wcs.sys.service.UserService;
import com.zy.asrs.wcs.system.entity.Menu;
import com.zy.asrs.wcs.system.entity.User;
import com.zy.asrs.wcs.system.entity.UserLogin;
import com.zy.asrs.wcs.system.service.UserLoginService;
import com.zy.asrs.wcs.system.service.UserService;
import com.zy.asrs.wcs.utils.HttpUtils;
import com.zy.asrs.wcs.utils.JwtUtil;
import io.jsonwebtoken.Claims;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/DeptService.java

File was deleted

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/HostService.java

File was deleted

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/MenuService.java

File was deleted

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/RoleService.java

File was deleted

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/DeptServiceImpl.java

File was deleted

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/HostServiceImpl.java

File was deleted

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/MenuServiceImpl.java

File was deleted

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/RoleServiceImpl.java

File was deleted

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/AuthController.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/AuthController.java
@@ -1,19 +1,19 @@
package com.zy.asrs.wcs.sys.controller;
package com.zy.asrs.wcs.system.controller;

import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.wcs.common.annotation.OperationLog;
import com.zy.asrs.wcs.common.config.ConfigProperties;
import com.zy.asrs.wcs.common.security.JwtSubject;
import com.zy.asrs.wcs.sys.controller.param.LoginParam;
import com.zy.asrs.wcs.sys.controller.param.UpdatePasswordParam;
import com.zy.asrs.wcs.sys.controller.result.LoginResult;
import com.zy.asrs.wcs.sys.entity.Menu;
import com.zy.asrs.wcs.sys.entity.User;
import com.zy.asrs.wcs.sys.entity.UserLogin;
import com.zy.asrs.wcs.sys.service.RoleMenuService;
import com.zy.asrs.wcs.sys.service.UserLoginService;
import com.zy.asrs.wcs.sys.service.UserService;
import com.zy.asrs.wcs.system.controller.param.LoginParam;
import com.zy.asrs.wcs.system.controller.param.UpdatePasswordParam;
import com.zy.asrs.wcs.system.controller.result.LoginResult;
import com.zy.asrs.wcs.system.entity.Menu;
import com.zy.asrs.wcs.system.entity.User;
import com.zy.asrs.wcs.system.entity.UserLogin;
import com.zy.asrs.wcs.system.service.RoleMenuService;
import com.zy.asrs.wcs.system.service.UserLoginService;
import com.zy.asrs.wcs.system.service.UserService;
import com.zy.asrs.wcs.utils.JwtUtil;
import com.zy.asrs.wcs.utils.Utils;
import org.springframework.security.access.prepost.PreAuthorize;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/BaseController.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/BaseController.java
@@ -1,7 +1,7 @@
package com.zy.asrs.wcs.sys.controller;
package com.zy.asrs.wcs.system.controller;

import com.zy.asrs.wcs.common.domain.BaseParam;
import com.zy.asrs.wcs.sys.entity.User;
import com.zy.asrs.wcs.system.entity.User;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;


 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/HostController.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/HostController.java
@@ -1,12 +1,12 @@
package com.zy.asrs.wcs.sys.controller;
package com.zy.asrs.wcs.system.controller;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.wcs.common.domain.KeyValVo;
import com.zy.asrs.wcs.sys.entity.Host;
import com.zy.asrs.wcs.sys.service.HostService;
import com.zy.asrs.wcs.system.entity.Host;
import com.zy.asrs.wcs.system.service.HostService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.PostMapping;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/RoleController.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java
@@ -1,4 +1,4 @@
package com.zy.asrs.wcs.sys.controller;
package com.zy.asrs.wcs.system.controller;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,8 +8,8 @@
import com.zy.asrs.wcs.common.domain.BaseParam;
import com.zy.asrs.wcs.common.domain.KeyValVo;
import com.zy.asrs.wcs.common.domain.PageParam;
import com.zy.asrs.wcs.sys.entity.Role;
import com.zy.asrs.wcs.sys.service.RoleService;
import com.zy.asrs.wcs.system.entity.Role;
import com.zy.asrs.wcs.system.service.RoleService;
import com.zy.asrs.wcs.utils.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/param/LoginParam.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/param/LoginParam.java
@@ -1,4 +1,4 @@
package com.zy.asrs.wcs.sys.controller.param;
package com.zy.asrs.wcs.system.controller.param;

import lombok.Data;


 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/param/RoleParam.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/param/RoleParam.java
@@ -1,4 +1,4 @@
package com.zy.asrs.wcs.sys.controller.param;
package com.zy.asrs.wcs.system.controller.param;

import com.zy.asrs.wcs.common.domain.BaseParam;
import lombok.Data;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/param/UpdatePasswordParam.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/param/UpdatePasswordParam.java
@@ -1,4 +1,4 @@
package com.zy.asrs.wcs.sys.controller.param;
package com.zy.asrs.wcs.system.controller.param;

import lombok.Data;


 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/result/LoginResult.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/result/LoginResult.java
@@ -1,6 +1,6 @@
package com.zy.asrs.wcs.sys.controller.result;
package com.zy.asrs.wcs.system.controller.result;

import com.zy.asrs.wcs.sys.entity.User;
import com.zy.asrs.wcs.system.entity.User;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Dept.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/Dept.java
@@ -1,4 +1,4 @@
package com.zy.asrs.wcs.sys.entity;
package com.zy.asrs.wcs.system.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -6,8 +6,8 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.SpringUtils;
import com.zy.asrs.wcs.sys.service.HostService;
import com.zy.asrs.wcs.sys.service.UserService;
import com.zy.asrs.wcs.system.service.HostService;
import com.zy.asrs.wcs.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Host.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/Host.java
@@ -1,4 +1,4 @@
package com.zy.asrs.wcs.sys.entity;
package com.zy.asrs.wcs.system.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Menu.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/Menu.java
@@ -1,10 +1,10 @@
package com.zy.asrs.wcs.sys.entity;
package com.zy.asrs.wcs.system.entity;

import com.baomidou.mybatisplus.annotation.*;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.SpringUtils;
import com.zy.asrs.wcs.sys.service.HostService;
import com.zy.asrs.wcs.sys.service.UserService;
import com.zy.asrs.wcs.system.service.HostService;
import com.zy.asrs.wcs.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/OperationRecord.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/OperationRecord.java
@@ -1,12 +1,12 @@
package com.zy.asrs.wcs.sys.entity;
package com.zy.asrs.wcs.system.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.SpringUtils;
import com.zy.asrs.wcs.sys.service.HostService;
import com.zy.asrs.wcs.sys.service.UserService;
import com.zy.asrs.wcs.system.service.HostService;
import com.zy.asrs.wcs.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Role.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/Role.java
@@ -1,4 +1,4 @@
package com.zy.asrs.wcs.sys.entity;
package com.zy.asrs.wcs.system.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -6,7 +6,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.SpringUtils;
import com.zy.asrs.wcs.sys.service.HostService;
import com.zy.asrs.wcs.system.service.HostService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/RoleMenu.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/RoleMenu.java
@@ -1,4 +1,4 @@
package com.zy.asrs.wcs.sys.entity;
package com.zy.asrs.wcs.system.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/User.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/User.java
@@ -1,11 +1,11 @@
package com.zy.asrs.wcs.sys.entity;
package com.zy.asrs.wcs.system.entity;

import com.baomidou.mybatisplus.annotation.*;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.SpringUtils;
import com.zy.asrs.wcs.sys.service.DeptService;
import com.zy.asrs.wcs.sys.service.HostService;
import com.zy.asrs.wcs.sys.service.UserService;
import com.zy.asrs.wcs.system.service.DeptService;
import com.zy.asrs.wcs.system.service.HostService;
import com.zy.asrs.wcs.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/UserLogin.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/UserLogin.java
@@ -1,12 +1,12 @@
package com.zy.asrs.wcs.sys.entity;
package com.zy.asrs.wcs.system.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.SpringUtils;
import com.zy.asrs.wcs.sys.service.HostService;
import com.zy.asrs.wcs.sys.service.UserService;
import com.zy.asrs.wcs.system.service.HostService;
import com.zy.asrs.wcs.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/UserRole.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/UserRole.java
@@ -1,4 +1,4 @@
package com.zy.asrs.wcs.sys.entity;
package com.zy.asrs.wcs.system.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/DeptMapper.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/mapper/DeptMapper.java
@@ -1,6 +1,6 @@
package com.zy.asrs.wcs.sys.mapper;
package com.zy.asrs.wcs.system.mapper;

import com.zy.asrs.wcs.sys.entity.Dept;
import com.zy.asrs.wcs.system.entity.Dept;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/HostMapper.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/mapper/HostMapper.java
@@ -1,6 +1,6 @@
package com.zy.asrs.wcs.sys.mapper;
package com.zy.asrs.wcs.system.mapper;

import com.zy.asrs.wcs.sys.entity.Host;
import com.zy.asrs.wcs.system.entity.Host;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/MenuMapper.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/mapper/MenuMapper.java
@@ -1,6 +1,6 @@
package com.zy.asrs.wcs.sys.mapper;
package com.zy.asrs.wcs.system.mapper;

import com.zy.asrs.wcs.sys.entity.Menu;
import com.zy.asrs.wcs.system.entity.Menu;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/OperationRecordMapper.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/mapper/OperationRecordMapper.java
@@ -1,6 +1,6 @@
package com.zy.asrs.wcs.sys.mapper;
package com.zy.asrs.wcs.system.mapper;

import com.zy.asrs.wcs.sys.entity.OperationRecord;
import com.zy.asrs.wcs.system.entity.OperationRecord;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/RoleMapper.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/mapper/RoleMapper.java
@@ -1,6 +1,6 @@
package com.zy.asrs.wcs.sys.mapper;
package com.zy.asrs.wcs.system.mapper;

import com.zy.asrs.wcs.sys.entity.Role;
import com.zy.asrs.wcs.system.entity.Role;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/RoleMenuMapper.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/mapper/RoleMenuMapper.java
@@ -1,9 +1,9 @@
package com.zy.asrs.wcs.sys.mapper;
package com.zy.asrs.wcs.system.mapper;

import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.wcs.sys.entity.Menu;
import com.zy.asrs.wcs.sys.entity.RoleMenu;
import com.zy.asrs.wcs.system.entity.Menu;
import com.zy.asrs.wcs.system.entity.RoleMenu;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/UserLoginMapper.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/mapper/UserLoginMapper.java
@@ -1,6 +1,6 @@
package com.zy.asrs.wcs.sys.mapper;
package com.zy.asrs.wcs.system.mapper;

import com.zy.asrs.wcs.sys.entity.UserLogin;
import com.zy.asrs.wcs.system.entity.UserLogin;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/UserMapper.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/mapper/UserMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.wcs.sys.mapper;
package com.zy.asrs.wcs.system.mapper;

import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
import com.zy.asrs.wcs.sys.entity.User;
import com.zy.asrs.wcs.system.entity.User;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/UserRoleMapper.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/mapper/UserRoleMapper.java
@@ -1,8 +1,8 @@
package com.zy.asrs.wcs.sys.mapper;
package com.zy.asrs.wcs.system.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.wcs.sys.entity.Role;
import com.zy.asrs.wcs.sys.entity.UserRole;
import com.zy.asrs.wcs.system.entity.Role;
import com.zy.asrs.wcs.system.entity.UserRole;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/DeptService.java

New file
@@ -0,0 +1,8 @@
package com.zy.asrs.wcs.system.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.wcs.system.entity.Dept;

public interface DeptService extends IService<Dept> {

}

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/HostService.java

New file
@@ -0,0 +1,8 @@
package com.zy.asrs.wcs.system.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.wcs.system.entity.Host;

public interface HostService extends IService<Host> {

}

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/MenuService.java

New file
@@ -0,0 +1,8 @@
package com.zy.asrs.wcs.system.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.wcs.system.entity.Menu;

public interface MenuService extends IService<Menu> {

}

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/OperationRecordService.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/OperationRecordService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.wcs.sys.service;
package com.zy.asrs.wcs.system.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.wcs.sys.entity.OperationRecord;
import com.zy.asrs.wcs.system.entity.OperationRecord;

public interface OperationRecordService extends IService<OperationRecord> {


 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/RoleMenuService.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/RoleMenuService.java
@@ -1,8 +1,8 @@
package com.zy.asrs.wcs.sys.service;
package com.zy.asrs.wcs.system.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.wcs.sys.entity.Menu;
import com.zy.asrs.wcs.sys.entity.RoleMenu;
import com.zy.asrs.wcs.system.entity.Menu;
import com.zy.asrs.wcs.system.entity.RoleMenu;

import java.util.List;


 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/RoleService.java

New file
@@ -0,0 +1,8 @@
package com.zy.asrs.wcs.system.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.wcs.system.entity.Role;

public interface RoleService extends IService<Role> {

}

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/UserLoginService.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/UserLoginService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.wcs.sys.service;
package com.zy.asrs.wcs.system.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.wcs.sys.entity.UserLogin;
import com.zy.asrs.wcs.system.entity.UserLogin;

import javax.servlet.http.HttpServletRequest;


 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/UserRoleService.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/UserRoleService.java
@@ -1,8 +1,8 @@
package com.zy.asrs.wcs.sys.service;
package com.zy.asrs.wcs.system.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.wcs.sys.entity.Role;
import com.zy.asrs.wcs.sys.entity.UserRole;
import com.zy.asrs.wcs.system.entity.Role;
import com.zy.asrs.wcs.system.entity.UserRole;

import java.util.List;


 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/UserService.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/UserService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.wcs.sys.service;
package com.zy.asrs.wcs.system.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.wcs.sys.entity.User;
import com.zy.asrs.wcs.system.entity.User;

public interface UserService extends IService<User> {


 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/DeptServiceImpl.java

New file
@@ -0,0 +1,12 @@
package com.zy.asrs.wcs.system.service.impl;

import com.zy.asrs.wcs.system.mapper.DeptMapper;
import com.zy.asrs.wcs.system.entity.Dept;
import com.zy.asrs.wcs.system.service.DeptService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

@Service("deptService")
public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements DeptService {

}

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/HostServiceImpl.java

New file
@@ -0,0 +1,12 @@
package com.zy.asrs.wcs.system.service.impl;

import com.zy.asrs.wcs.system.mapper.HostMapper;
import com.zy.asrs.wcs.system.entity.Host;
import com.zy.asrs.wcs.system.service.HostService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

@Service("hostService")
public class HostServiceImpl extends ServiceImpl<HostMapper, Host> implements HostService {

}

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/MenuServiceImpl.java

New file
@@ -0,0 +1,12 @@
package com.zy.asrs.wcs.system.service.impl;

import com.zy.asrs.wcs.system.mapper.MenuMapper;
import com.zy.asrs.wcs.system.entity.Menu;
import com.zy.asrs.wcs.system.service.MenuService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

@Service("menuService")
public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements MenuService {

}

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/OperationRecordServiceImpl.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/OperationRecordServiceImpl.java
@@ -1,8 +1,8 @@
package com.zy.asrs.wcs.sys.service.impl;
package com.zy.asrs.wcs.system.service.impl;

import com.zy.asrs.wcs.sys.mapper.OperationRecordMapper;
import com.zy.asrs.wcs.sys.entity.OperationRecord;
import com.zy.asrs.wcs.sys.service.OperationRecordService;
import com.zy.asrs.wcs.system.mapper.OperationRecordMapper;
import com.zy.asrs.wcs.system.entity.OperationRecord;
import com.zy.asrs.wcs.system.service.OperationRecordService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/RoleMenuServiceImpl.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/RoleMenuServiceImpl.java
@@ -1,10 +1,10 @@
package com.zy.asrs.wcs.sys.service.impl;
package com.zy.asrs.wcs.system.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.wcs.sys.entity.Menu;
import com.zy.asrs.wcs.sys.entity.RoleMenu;
import com.zy.asrs.wcs.sys.mapper.RoleMenuMapper;
import com.zy.asrs.wcs.sys.service.RoleMenuService;
import com.zy.asrs.wcs.system.entity.Menu;
import com.zy.asrs.wcs.system.entity.RoleMenu;
import com.zy.asrs.wcs.system.mapper.RoleMenuMapper;
import com.zy.asrs.wcs.system.service.RoleMenuService;
import org.springframework.stereotype.Service;

import java.util.List;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/RoleServiceImpl.java

New file
@@ -0,0 +1,12 @@
package com.zy.asrs.wcs.system.service.impl;

import com.zy.asrs.wcs.system.mapper.RoleMapper;
import com.zy.asrs.wcs.system.entity.Role;
import com.zy.asrs.wcs.system.service.RoleService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

@Service("roleService")
public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements RoleService {

}

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/UserLoginServiceImpl.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/UserLoginServiceImpl.java
@@ -1,8 +1,8 @@
package com.zy.asrs.wcs.sys.service.impl;
package com.zy.asrs.wcs.system.service.impl;

import com.zy.asrs.wcs.sys.mapper.UserLoginMapper;
import com.zy.asrs.wcs.sys.entity.UserLogin;
import com.zy.asrs.wcs.sys.service.UserLoginService;
import com.zy.asrs.wcs.system.mapper.UserLoginMapper;
import com.zy.asrs.wcs.system.entity.UserLogin;
import com.zy.asrs.wcs.system.service.UserLoginService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/UserRoleServiceImpl.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/UserRoleServiceImpl.java
@@ -1,10 +1,10 @@
package com.zy.asrs.wcs.sys.service.impl;
package com.zy.asrs.wcs.system.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.wcs.sys.entity.Role;
import com.zy.asrs.wcs.sys.entity.UserRole;
import com.zy.asrs.wcs.sys.mapper.UserRoleMapper;
import com.zy.asrs.wcs.sys.service.UserRoleService;
import com.zy.asrs.wcs.system.entity.Role;
import com.zy.asrs.wcs.system.entity.UserRole;
import com.zy.asrs.wcs.system.mapper.UserRoleMapper;
import com.zy.asrs.wcs.system.service.UserRoleService;
import org.springframework.stereotype.Service;

import java.util.List;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/UserServiceImpl.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/UserServiceImpl.java
@@ -1,12 +1,12 @@
package com.zy.asrs.wcs.sys.service.impl;
package com.zy.asrs.wcs.system.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.wcs.sys.entity.User;
import com.zy.asrs.wcs.sys.mapper.UserMapper;
import com.zy.asrs.wcs.sys.service.RoleMenuService;
import com.zy.asrs.wcs.sys.service.UserRoleService;
import com.zy.asrs.wcs.sys.service.UserService;
import com.zy.asrs.wcs.system.entity.User;
import com.zy.asrs.wcs.system.mapper.UserMapper;
import com.zy.asrs.wcs.system.service.RoleMenuService;
import com.zy.asrs.wcs.system.service.UserRoleService;
import com.zy.asrs.wcs.system.service.UserService;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;


 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/CodeBuilder.java

@@ -23,7 +23,7 @@
//        generator.password="Zoneyung@zy56$";

        generator.table="sys_user_role";
        generator.packagePath="com.zy.asrs.wcs.sys";
        generator.packagePath="com.zy.asrs.wcs.system";

        generator.controller = false;
        generator.html = false;

 zy-asrs-wcs/src/main/resources/mapper/sys/DeptMapper.xml

File was deleted

 zy-asrs-wcs/src/main/resources/mapper/sys/HostMapper.xml

File was deleted

 zy-asrs-wcs/src/main/resources/mapper/sys/MenuMapper.xml

File was deleted

 zy-asrs-wcs/src/main/resources/mapper/sys/UserLoginMapper.xml

File was deleted

 zy-asrs-wcs/src/main/resources/mapper/system/DeptMapper.xml

File was renamed from zy-asrs-wcs/src/main/resources/mapper/sys/RoleMapper.xml
@@ -1,5 +1,5 @@
<?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.zy.asrs.wcs.sys.mapper.RoleMapper">
<mapper namespace="com.zy.asrs.wcs.system.mapper.DeptMapper">

</mapper>

 zy-asrs-wcs/src/main/resources/mapper/system/HostMapper.xml

copy from zy-asrs-wcs/src/main/resources/mapper/sys/RoleMapper.xml
copy to zy-asrs-wcs/src/main/resources/mapper/system/HostMapper.xml
File was copied from zy-asrs-wcs/src/main/resources/mapper/sys/RoleMapper.xml
@@ -1,5 +1,5 @@
<?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.zy.asrs.wcs.sys.mapper.RoleMapper">
<mapper namespace="com.zy.asrs.wcs.system.mapper.HostMapper">

</mapper>

 zy-asrs-wcs/src/main/resources/mapper/system/MenuMapper.xml

copy from zy-asrs-wcs/src/main/resources/mapper/sys/RoleMapper.xml
copy to zy-asrs-wcs/src/main/resources/mapper/system/MenuMapper.xml
File was copied from zy-asrs-wcs/src/main/resources/mapper/sys/RoleMapper.xml
@@ -1,5 +1,5 @@
<?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.zy.asrs.wcs.sys.mapper.RoleMapper">
<mapper namespace="com.zy.asrs.wcs.system.mapper.MenuMapper">

</mapper>

 zy-asrs-wcs/src/main/resources/mapper/system/OperationRecordMapper.xml

File was renamed from zy-asrs-wcs/src/main/resources/mapper/sys/OperationRecordMapper.xml
@@ -1,5 +1,5 @@
<?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.zy.asrs.wcs.sys.mapper.OperationRecordMapper">
<mapper namespace="com.zy.asrs.wcs.system.mapper.OperationRecordMapper">

</mapper>

 zy-asrs-wcs/src/main/resources/mapper/system/RoleMapper.xml

copy from zy-asrs-wcs/src/main/resources/mapper/sys/RoleMapper.xml
copy to zy-asrs-wcs/src/main/resources/mapper/system/RoleMapper.xml
File was copied from zy-asrs-wcs/src/main/resources/mapper/sys/RoleMapper.xml
@@ -1,5 +1,5 @@
<?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.zy.asrs.wcs.sys.mapper.RoleMapper">
<mapper namespace="com.zy.asrs.wcs.system.mapper.RoleMapper">

</mapper>

 zy-asrs-wcs/src/main/resources/mapper/system/RoleMenuMapper.xml

File was renamed from zy-asrs-wcs/src/main/resources/mapper/sys/RoleMenuMapper.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.zy.asrs.wcs.sys.mapper.RoleMenuMapper">
<mapper namespace="com.zy.asrs.wcs.system.mapper.RoleMenuMapper">

    <select id="listMenuByUserId" resultType="com.zy.asrs.wcs.sys.entity.Menu">
    <select id="listMenuByUserId" resultType="com.zy.asrs.wcs.system.entity.Menu">
        select * from sys_menu
        where 1=1
        <if test="type != null">

 zy-asrs-wcs/src/main/resources/mapper/system/UserLoginMapper.xml

copy from zy-asrs-wcs/src/main/resources/mapper/sys/RoleMapper.xml
copy to zy-asrs-wcs/src/main/resources/mapper/system/UserLoginMapper.xml
File was copied from zy-asrs-wcs/src/main/resources/mapper/sys/RoleMapper.xml
@@ -1,5 +1,5 @@
<?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.zy.asrs.wcs.sys.mapper.RoleMapper">
<mapper namespace="com.zy.asrs.wcs.system.mapper.UserLoginMapper">

</mapper>

 zy-asrs-wcs/src/main/resources/mapper/system/UserMapper.xml

File was renamed from zy-asrs-wcs/src/main/resources/mapper/sys/UserMapper.xml
@@ -1,9 +1,9 @@
<?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.zy.asrs.wcs.sys.mapper.UserMapper">
<mapper namespace="com.zy.asrs.wcs.system.mapper.UserMapper">

    <!-- 根据账号查询 -->
    <select id="selectByUsername" resultType="com.zy.asrs.wcs.sys.entity.User">
    <select id="selectByUsername" resultType="com.zy.asrs.wcs.system.entity.User">
        select * from sys_user
        where 1=1
        and deleted = 0

 zy-asrs-wcs/src/main/resources/mapper/system/UserRoleMapper.xml

File was renamed from zy-asrs-wcs/src/main/resources/mapper/sys/UserRoleMapper.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.zy.asrs.wcs.sys.mapper.UserRoleMapper">
<mapper namespace="com.zy.asrs.wcs.system.mapper.UserRoleMapper">

    <select id="selectByUserId" resultType="com.zy.asrs.wcs.sys.entity.Role">
    <select id="selectByUserId" resultType="com.zy.asrs.wcs.system.entity.Role">
        select *
        from sys_role
        where 1=1