zcy
/
MES-Springboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整包名称

pull/1/head
wangziyangyang 2020-03-14 08:19:44 +08:00
parent bab81c5031
commit c358c16de2
392 changed files with 320 additions and 324 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -51,10 +51,10 @@
* 后端 * 后端
* Hutool 是一个小而全的Java工具类库，通过静态方法封装，降低相关API的学习成本，提高工作效率，使Java拥有函数式语言般的优雅，让Java语言也可以“甜甜的”。 * Hutool 是一个小而全的Java工具类库，通过静态方法封装，降低相关API的学习成本，提高工作效率，使Java拥有函数式语言般的优雅，让Java语言也可以“甜甜的”。
* 枚举 * 枚举
* 公共枚举类：com.songpeng.sparchetype.common.enums.CommonEnum * 公共枚举类：CommonEnum
* 不同模块下的枚举：如 com.songpeng.sparchetype.system.enums * 不同模块下的枚举：如 com.songpeng.sparchetype.system.enums
* 请求参数 * 请求参数
* 每张表的分页查询参数，严格按照一张表对应一个请求参数对象进行开发，如系统用户分页查询参数：com.songpeng.sparchetype.system.request.SysUserPageReq * 每张表的分页查询参数，严格按照一张表对应一个请求参数对象进行开发，如系统用户分页查询参数：SysUserPageReq
# 总结 # 总结
欢迎想一起开发的小伙伴。。本人前端太弱，都是自己乱摸索。还请有一个前端选手能一起弄 欢迎想一起开发的小伙伴。。本人前端太弱，都是自己乱摸索。还请有一个前端选手能一起弄
## QQ Group87652870 ## QQ Group87652870

0
sparchetype/.gitignore → mes/.gitignore vendored
View File

0
sparchetype/mvnw → mes/mvnw vendored
View File

0
sparchetype/mvnw.cmd → mes/mvnw.cmd vendored
View File

0
sparchetype/pom.xml → mes/pom.xml
View File

0
sparchetype/src/main/docker/Dockerfile → mes/src/main/docker/Dockerfile
View File

4
sparchetype/src/main/java/com/songpeng/sparchetype/SparchetypeApplication.java → mes/src/main/java/com/wangziyang/mes/SparchetypeApplication.java
View File

@ -1,11 +1,11 @@
package com.songpeng.sparchetype; package com.wangziyang.mes;
import org.mybatis.spring.annotation.MapperScan; import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication @SpringBootApplication
@MapperScan("com.songpeng.sparchetype.**.mapper*") @MapperScan("com.wangziyang.mes.**.mapper*")
public class SparchetypeApplication { public class SparchetypeApplication {
public static void main(String[] args) { public static void main(String[] args) {

14
sparchetype/src/main/java/com/songpeng/sparchetype/basedata/common/controller/TableNameDataController.java → mes/src/main/java/com/wangziyang/mes/basedata/common/controller/TableNameDataController.java
View File

@ -1,12 +1,12 @@
package com.songpeng.sparchetype.basedata.common.controller; package com.wangziyang.mes.basedata.common.controller;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.songpeng.sparchetype.basedata.common.dto.CommonDto; import com.wangziyang.mes.basedata.common.dto.CommonDto;
import com.songpeng.sparchetype.basedata.common.request.QueryTableNameDataReq; import com.wangziyang.mes.basedata.common.request.QueryTableNameDataReq;
import com.songpeng.sparchetype.basedata.common.service.TableNameDataService; import com.wangziyang.mes.basedata.common.service.TableNameDataService;
import com.songpeng.sparchetype.common.BaseController; import com.wangziyang.mes.common.BaseController;
import com.songpeng.sparchetype.common.Result; import com.wangziyang.mes.common.Result;
import com.songpeng.sparchetype.system.entity.SysUser; import com.wangziyang.mes.system.entity.SysUser;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;

4
sparchetype/src/main/java/com/songpeng/sparchetype/basedata/common/dto/CommonDto.java → mes/src/main/java/com/wangziyang/mes/basedata/common/dto/CommonDto.java
View File

@ -1,6 +1,6 @@
package com.songpeng.sparchetype.basedata.common.dto; package com.wangziyang.mes.basedata.common.dto;
import com.songpeng.sparchetype.common.BaseEntity; import com.wangziyang.mes.common.BaseEntity;
/** /**
* 基础数据通用查询复杂对象 * 基础数据通用查询复杂对象

9
sparchetype/src/main/java/com/songpeng/sparchetype/basedata/common/mapper/QueryTableNameDataMapper.java → mes/src/main/java/com/wangziyang/mes/basedata/common/mapper/QueryTableNameDataMapper.java
View File

@ -1,10 +1,9 @@
package com.songpeng.sparchetype.basedata.common.mapper; package com.wangziyang.mes.basedata.common.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.songpeng.sparchetype.basedata.common.dto.CommonDto; import com.wangziyang.mes.basedata.common.dto.CommonDto;
import com.songpeng.sparchetype.basedata.common.request.QueryTableNameDataReq; import com.wangziyang.mes.basedata.common.request.QueryTableNameDataReq;
import com.songpeng.sparchetype.basedata.entity.SpTableManagerItem; import com.wangziyang.mes.basedata.entity.SpTableManagerItem;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

4
sparchetype/src/main/java/com/songpeng/sparchetype/basedata/common/request/QueryTableNameDataReq.java → mes/src/main/java/com/wangziyang/mes/basedata/common/request/QueryTableNameDataReq.java
View File

@ -1,6 +1,6 @@
package com.songpeng.sparchetype.basedata.common.request; package com.wangziyang.mes.basedata.common.request;
import com.songpeng.sparchetype.common.BasePageReq; import com.wangziyang.mes.common.BasePageReq;
/** /**
* @author wangziyang * @author wangziyang

8
sparchetype/src/main/java/com/songpeng/sparchetype/basedata/common/service/TableNameDataService.java → mes/src/main/java/com/wangziyang/mes/basedata/common/service/TableNameDataService.java
View File

@ -1,9 +1,9 @@
package com.songpeng.sparchetype.basedata.common.service; package com.wangziyang.mes.basedata.common.service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.songpeng.sparchetype.basedata.common.dto.CommonDto; import com.wangziyang.mes.basedata.common.dto.CommonDto;
import com.songpeng.sparchetype.basedata.common.request.QueryTableNameDataReq; import com.wangziyang.mes.basedata.common.request.QueryTableNameDataReq;
import com.songpeng.sparchetype.system.entity.SysUser; import com.wangziyang.mes.system.entity.SysUser;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.List; import java.util.List;

18
sparchetype/src/main/java/com/songpeng/sparchetype/basedata/common/service/impl/TableNameDataServiceImpl.java → mes/src/main/java/com/wangziyang/mes/basedata/common/service/impl/TableNameDataServiceImpl.java
View File

@ -1,14 +1,14 @@
package com.songpeng.sparchetype.basedata.common.service.impl; package com.wangziyang.mes.basedata.common.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.songpeng.sparchetype.basedata.common.dto.CommonDto; import com.wangziyang.mes.basedata.common.dto.CommonDto;
import com.songpeng.sparchetype.basedata.common.mapper.QueryTableNameDataMapper; import com.wangziyang.mes.basedata.common.mapper.QueryTableNameDataMapper;
import com.songpeng.sparchetype.basedata.common.request.QueryTableNameDataReq; import com.wangziyang.mes.basedata.common.request.QueryTableNameDataReq;
import com.songpeng.sparchetype.basedata.common.service.TableNameDataService; import com.wangziyang.mes.basedata.common.service.TableNameDataService;
import com.songpeng.sparchetype.basedata.entity.SpTableManagerItem; import com.wangziyang.mes.basedata.entity.SpTableManagerItem;
import com.songpeng.sparchetype.basedata.service.ISpTableManagerItemService; import com.wangziyang.mes.basedata.service.ISpTableManagerItemService;
import com.songpeng.sparchetype.common.util.IdUtil; import com.wangziyang.mes.common.util.IdUtil;
import com.songpeng.sparchetype.system.entity.SysUser; import com.wangziyang.mes.system.entity.SysUser;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

18
sparchetype/src/main/java/com/songpeng/sparchetype/basedata/controller/SpTableManagerController.java → mes/src/main/java/com/wangziyang/mes/basedata/controller/SpTableManagerController.java
View File

@ -1,16 +1,16 @@
package com.songpeng.sparchetype.basedata.controller; package com.wangziyang.mes.basedata.controller;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.songpeng.sparchetype.basedata.dto.SpTableManagerDto; import com.wangziyang.mes.basedata.dto.SpTableManagerDto;
import com.songpeng.sparchetype.basedata.entity.SpTableManager; import com.wangziyang.mes.basedata.entity.SpTableManager;
import com.songpeng.sparchetype.basedata.entity.SpTableManagerItem; import com.wangziyang.mes.basedata.entity.SpTableManagerItem;
import com.songpeng.sparchetype.basedata.request.SpTableManagerReq; import com.wangziyang.mes.basedata.request.SpTableManagerReq;
import com.songpeng.sparchetype.basedata.service.ISpTableManagerItemService; import com.wangziyang.mes.basedata.service.ISpTableManagerItemService;
import com.songpeng.sparchetype.basedata.service.ISpTableManagerService; import com.wangziyang.mes.basedata.service.ISpTableManagerService;
import com.songpeng.sparchetype.common.BaseController; import com.wangziyang.mes.common.BaseController;
import com.songpeng.sparchetype.common.Result; import com.wangziyang.mes.common.Result;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;

10
sparchetype/src/main/java/com/songpeng/sparchetype/basedata/controller/SpTableManagerItemController.java → mes/src/main/java/com/wangziyang/mes/basedata/controller/SpTableManagerItemController.java
View File

@ -1,10 +1,10 @@
package com.songpeng.sparchetype.basedata.controller; package com.wangziyang.mes.basedata.controller;
import com.songpeng.sparchetype.basedata.entity.SpTableManagerItem; import com.wangziyang.mes.basedata.entity.SpTableManagerItem;
import com.songpeng.sparchetype.basedata.service.ISpTableManagerItemService; import com.wangziyang.mes.basedata.service.ISpTableManagerItemService;
import com.songpeng.sparchetype.common.BaseController; import com.wangziyang.mes.common.BaseController;
import com.songpeng.sparchetype.common.Result; import com.wangziyang.mes.common.Result;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;

6
sparchetype/src/main/java/com/songpeng/sparchetype/basedata/dto/SpTableManagerDto.java → mes/src/main/java/com/wangziyang/mes/basedata/dto/SpTableManagerDto.java
View File

@ -1,7 +1,7 @@
package com.songpeng.sparchetype.basedata.dto; package com.wangziyang.mes.basedata.dto;
import com.songpeng.sparchetype.basedata.entity.SpTableManager; import com.wangziyang.mes.basedata.entity.SpTableManager;
import com.songpeng.sparchetype.basedata.entity.SpTableManagerItem; import com.wangziyang.mes.basedata.entity.SpTableManagerItem;
import java.util.List; import java.util.List;

6
sparchetype/src/main/java/com/songpeng/sparchetype/basedata/entity/SpTableManager.java → mes/src/main/java/com/wangziyang/mes/basedata/entity/SpTableManager.java
View File

@ -1,9 +1,7 @@
package com.songpeng.sparchetype.basedata.entity; package com.wangziyang.mes.basedata.entity;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.songpeng.sparchetype.common.BaseEntity; import com.wangziyang.mes.common.BaseEntity;
import java.util.List;
/** /**
* <p> * <p>

4
sparchetype/src/main/java/com/songpeng/sparchetype/basedata/entity/SpTableManagerItem.java → mes/src/main/java/com/wangziyang/mes/basedata/entity/SpTableManagerItem.java
View File

@ -1,7 +1,7 @@
package com.songpeng.sparchetype.basedata.entity; package com.wangziyang.mes.basedata.entity;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.songpeng.sparchetype.common.BaseEntity; import com.wangziyang.mes.common.BaseEntity;
/** /**
* <p> * <p>

4
sparchetype/src/main/java/com/songpeng/sparchetype/basedata/mapper/SpTableManagerItemMapper.java → mes/src/main/java/com/wangziyang/mes/basedata/mapper/SpTableManagerItemMapper.java
View File

@ -1,7 +1,7 @@
package com.songpeng.sparchetype.basedata.mapper; package com.wangziyang.mes.basedata.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.songpeng.sparchetype.basedata.entity.SpTableManagerItem; import com.wangziyang.mes.basedata.entity.SpTableManagerItem;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;

6
sparchetype/src/main/java/com/songpeng/sparchetype/basedata/mapper/SpTableManagerMapper.java → mes/src/main/java/com/wangziyang/mes/basedata/mapper/SpTableManagerMapper.java
View File

@ -1,8 +1,8 @@
package com.songpeng.sparchetype.basedata.mapper; package com.wangziyang.mes.basedata.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.songpeng.sparchetype.basedata.entity.SpTableManager; import com.wangziyang.mes.basedata.entity.SpTableManager;
import com.songpeng.sparchetype.basedata.entity.SpTableManagerItem; import com.wangziyang.mes.basedata.entity.SpTableManagerItem;
import java.util.List; import java.util.List;

9
mes/src/main/java/com/wangziyang/mes/basedata/request/SpTableManagerReq.java Normal file
View File

@ -0,0 +1,9 @@
package com.wangziyang.mes.basedata.request;
import com.wangziyang.mes.common.BasePageReq;
/**
*
*/
public class SpTableManagerReq extends BasePageReq {
}

4
sparchetype/src/main/java/com/songpeng/sparchetype/basedata/service/ISpTableManagerItemService.java → mes/src/main/java/com/wangziyang/mes/basedata/service/ISpTableManagerItemService.java
View File

@ -1,7 +1,7 @@
package com.songpeng.sparchetype.basedata.service; package com.wangziyang.mes.basedata.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.songpeng.sparchetype.basedata.entity.SpTableManagerItem; import com.wangziyang.mes.basedata.entity.SpTableManagerItem;
import java.util.List; import java.util.List;

6
sparchetype/src/main/java/com/songpeng/sparchetype/basedata/service/ISpTableManagerService.java → mes/src/main/java/com/wangziyang/mes/basedata/service/ISpTableManagerService.java
View File

@ -1,8 +1,8 @@
package com.songpeng.sparchetype.basedata.service; package com.wangziyang.mes.basedata.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.songpeng.sparchetype.basedata.entity.SpTableManager; import com.wangziyang.mes.basedata.entity.SpTableManager;
import com.songpeng.sparchetype.basedata.entity.SpTableManagerItem; import com.wangziyang.mes.basedata.entity.SpTableManagerItem;
import java.util.List; import java.util.List;

8
sparchetype/src/main/java/com/songpeng/sparchetype/basedata/service/impl/SpTableManagerItemServiceImpl.java → mes/src/main/java/com/wangziyang/mes/basedata/service/impl/SpTableManagerItemServiceImpl.java
View File

@ -1,9 +1,9 @@
package com.songpeng.sparchetype.basedata.service.impl; package com.wangziyang.mes.basedata.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.songpeng.sparchetype.basedata.entity.SpTableManagerItem; import com.wangziyang.mes.basedata.entity.SpTableManagerItem;
import com.songpeng.sparchetype.basedata.mapper.SpTableManagerItemMapper; import com.wangziyang.mes.basedata.mapper.SpTableManagerItemMapper;
import com.songpeng.sparchetype.basedata.service.ISpTableManagerItemService; import com.wangziyang.mes.basedata.service.ISpTableManagerItemService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

11
sparchetype/src/main/java/com/songpeng/sparchetype/basedata/service/impl/SpTableManagerServiceImpl.java → mes/src/main/java/com/wangziyang/mes/basedata/service/impl/SpTableManagerServiceImpl.java
View File

@ -1,12 +1,11 @@
package com.songpeng.sparchetype.basedata.service.impl; package com.wangziyang.mes.basedata.service.impl;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.songpeng.sparchetype.basedata.entity.SpTableManager; import com.wangziyang.mes.basedata.entity.SpTableManager;
import com.songpeng.sparchetype.basedata.entity.SpTableManagerItem; import com.wangziyang.mes.basedata.entity.SpTableManagerItem;
import com.songpeng.sparchetype.basedata.mapper.SpTableManagerMapper; import com.wangziyang.mes.basedata.mapper.SpTableManagerMapper;
import com.songpeng.sparchetype.basedata.service.ISpTableManagerService; import com.wangziyang.mes.basedata.service.ISpTableManagerService;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

4
sparchetype/src/main/java/com/songpeng/sparchetype/common/BaseController.java → mes/src/main/java/com/wangziyang/mes/common/BaseController.java
View File

@ -1,6 +1,6 @@
package com.songpeng.sparchetype.common; package com.wangziyang.mes.common;
import com.songpeng.sparchetype.system.entity.SysUser; import com.wangziyang.mes.system.entity.SysUser;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
/** /**

2
sparchetype/src/main/java/com/songpeng/sparchetype/common/BaseEntity.java → mes/src/main/java/com/wangziyang/mes/common/BaseEntity.java
View File

@ -1,4 +1,4 @@
package com.songpeng.sparchetype.common; package com.wangziyang.mes.common;
import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;

2
sparchetype/src/main/java/com/songpeng/sparchetype/common/BasePageReq.java → mes/src/main/java/com/wangziyang/mes/common/BasePageReq.java
View File

@ -1,4 +1,4 @@
package com.songpeng.sparchetype.common; package com.wangziyang.mes.common;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

2
sparchetype/src/main/java/com/songpeng/sparchetype/common/Result.java → mes/src/main/java/com/wangziyang/mes/common/Result.java
View File

@ -1,4 +1,4 @@
package com.songpeng.sparchetype.common; package com.wangziyang.mes.common;
import java.util.HashMap; import java.util.HashMap;

6
sparchetype/src/main/java/com/songpeng/sparchetype/common/advice/ExceptionAdvice.java → mes/src/main/java/com/wangziyang/mes/common/advice/ExceptionAdvice.java
View File

@ -1,7 +1,7 @@
package com.songpeng.sparchetype.common.advice; package com.wangziyang.mes.common.advice;
import com.songpeng.sparchetype.common.Result; import com.wangziyang.mes.common.Result;
import com.songpeng.sparchetype.common.util.HttpUtil; import com.wangziyang.mes.common.util.HttpUtil;
import org.apache.shiro.authz.AuthorizationException; import org.apache.shiro.authz.AuthorizationException;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

2
sparchetype/src/main/java/com/songpeng/sparchetype/common/advice/MyErrorViewResolver.java → mes/src/main/java/com/wangziyang/mes/common/advice/MyErrorViewResolver.java
View File

@ -1,4 +1,4 @@
package com.songpeng.sparchetype.common.advice; package com.wangziyang.mes.common.advice;
import org.springframework.boot.web.server.ErrorPage; import org.springframework.boot.web.server.ErrorPage;
import org.springframework.boot.web.server.ErrorPageRegistrar; import org.springframework.boot.web.server.ErrorPageRegistrar;

2
sparchetype/src/main/java/com/songpeng/sparchetype/common/config/JsonConfig.java → mes/src/main/java/com/wangziyang/mes/common/config/JsonConfig.java
View File

@ -1,4 +1,4 @@
package com.songpeng.sparchetype.common.config; package com.wangziyang.mes.common.config;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;

4
sparchetype/src/main/java/com/songpeng/sparchetype/common/config/MybatisPlusConfig.java → mes/src/main/java/com/wangziyang/mes/common/config/MybatisPlusConfig.java
View File

@ -1,4 +1,4 @@
package com.songpeng.sparchetype.common.config; package com.wangziyang.mes.common.config;
import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
import org.mybatis.spring.annotation.MapperScan; import org.mybatis.spring.annotation.MapperScan;
@ -12,7 +12,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
*/ */
@EnableTransactionManagement @EnableTransactionManagement
@Configuration @Configuration
@MapperScan("com.songpeng.sparchetype.*.mapper*") @MapperScan("com.wangziyang.mes.*.mapper*")
public class MybatisPlusConfig { public class MybatisPlusConfig {
@Bean @Bean

2
sparchetype/src/main/java/com/songpeng/sparchetype/common/config/ShiroTagsFreeMarkerConfig.java → mes/src/main/java/com/wangziyang/mes/common/config/ShiroTagsFreeMarkerConfig.java
View File

@ -1,4 +1,4 @@
package com.songpeng.sparchetype.common.config; package com.wangziyang.mes.common.config;
import com.jagregory.shiro.freemarker.ShiroTags; import com.jagregory.shiro.freemarker.ShiroTags;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

4
sparchetype/src/main/java/com/songpeng/sparchetype/common/config/SpMetaObjectHandler.java → mes/src/main/java/com/wangziyang/mes/common/config/SpMetaObjectHandler.java
View File

@ -1,7 +1,7 @@
package com.songpeng.sparchetype.common.config; package com.wangziyang.mes.common.config;
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
import com.songpeng.sparchetype.system.entity.SysUser; import com.wangziyang.mes.system.entity.SysUser;
import org.apache.ibatis.reflection.MetaObject; import org.apache.ibatis.reflection.MetaObject;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
import org.slf4j.Logger; import org.slf4j.Logger;

2
sparchetype/src/main/java/com/songpeng/sparchetype/common/controller/admin/CommonController.java → mes/src/main/java/com/wangziyang/mes/common/controller/admin/CommonController.java
View File

@ -1,4 +1,4 @@
package com.songpeng.sparchetype.common.controller.admin; package com.wangziyang.mes.common.controller.admin;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;

2
sparchetype/src/main/java/com/songpeng/sparchetype/common/enums/CommonEnum.java → mes/src/main/java/com/wangziyang/mes/common/enums/CommonEnum.java
View File

@ -1,4 +1,4 @@
package com.songpeng.sparchetype.common.enums; package com.wangziyang.mes.common.enums;
/** /**
* 系统用户枚举 * 系统用户枚举

2
sparchetype/src/main/java/com/songpeng/sparchetype/common/util/ByteUtil.java → mes/src/main/java/com/wangziyang/mes/common/util/ByteUtil.java
View File

@ -1,4 +1,4 @@
package com.songpeng.sparchetype.common.util; package com.wangziyang.mes.common.util;
import java.util.regex.Pattern; import java.util.regex.Pattern;

8
sparchetype/src/main/java/com/songpeng/sparchetype/common/util/CodeGenerator.java → mes/src/main/java/com/wangziyang/mes/common/util/CodeGenerator.java
View File

@ -1,4 +1,4 @@
package com.songpeng.sparchetype.common.util; package com.wangziyang.mes.common.util;
import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
import com.baomidou.mybatisplus.core.toolkit.StringPool; import com.baomidou.mybatisplus.core.toolkit.StringPool;
@ -50,7 +50,7 @@ public class CodeGenerator {
// 包配置 // 包配置
PackageConfig pc = new PackageConfig(); PackageConfig pc = new PackageConfig();
pc.setModuleName(scanner("模块名")); pc.setModuleName(scanner("模块名"));
pc.setParent("com.songpeng.sparchetype"); pc.setParent("com.wangziyang.mes");
mpg.setPackageInfo(pc); mpg.setPackageInfo(pc);
// 自定义配置 // 自定义配置
@ -104,12 +104,12 @@ public class CodeGenerator {
StrategyConfig strategy = new StrategyConfig(); StrategyConfig strategy = new StrategyConfig();
strategy.setNaming(NamingStrategy.underline_to_camel); strategy.setNaming(NamingStrategy.underline_to_camel);
strategy.setColumnNaming(NamingStrategy.underline_to_camel); strategy.setColumnNaming(NamingStrategy.underline_to_camel);
strategy.setSuperEntityClass("com.songpeng.sparchetype.common.BaseEntity"); strategy.setSuperEntityClass("com.wangziyang.mes.common.BaseEntity");
strategy.setEntityLombokModel(true); strategy.setEntityLombokModel(true);
//strategy.setRestControllerStyle(true); //strategy.setRestControllerStyle(true);
strategy.setRestControllerStyle(false); strategy.setRestControllerStyle(false);
// 公共父类 // 公共父类
strategy.setSuperControllerClass("com.songpeng.sparchetype.common.BaseController"); strategy.setSuperControllerClass("com.wangziyang.mes.common.BaseController");
// 写于父类中的公共字段 // 写于父类中的公共字段
strategy.setSuperEntityColumns("id", "create_time", "create_username", "update_time", "update_username"); strategy.setSuperEntityColumns("id", "create_time", "create_username", "update_time", "update_username");
strategy.setInclude(scanner("表名，多个英文逗号分割").split(",")); strategy.setInclude(scanner("表名，多个英文逗号分割").split(","));

2
sparchetype/src/main/java/com/songpeng/sparchetype/common/util/HashUtil.java → mes/src/main/java/com/wangziyang/mes/common/util/HashUtil.java
View File

@ -1,4 +1,4 @@
package com.songpeng.sparchetype.common.util; package com.wangziyang.mes.common.util;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.security.GeneralSecurityException; import java.security.GeneralSecurityException;

2
sparchetype/src/main/java/com/songpeng/sparchetype/common/util/HttpUtil.java → mes/src/main/java/com/wangziyang/mes/common/util/HttpUtil.java
View File

@ -1,4 +1,4 @@
package com.songpeng.sparchetype.common.util; package com.wangziyang.mes.common.util;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;

2
sparchetype/src/main/java/com/songpeng/sparchetype/common/util/IdUtil.java → mes/src/main/java/com/wangziyang/mes/common/util/IdUtil.java
View File

@ -1,4 +1,4 @@
package com.songpeng.sparchetype.common.util; package com.wangziyang.mes.common.util;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

2
sparchetype/src/main/java/com/songpeng/sparchetype/common/util/RandomVerificationCodeUtil.java → mes/src/main/java/com/wangziyang/mes/common/util/RandomVerificationCodeUtil.java
View File

@ -1,4 +1,4 @@
package com.songpeng.sparchetype.common.util; package com.wangziyang.mes.common.util;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

4
sparchetype/src/main/java/com/songpeng/sparchetype/common/util/TreeUtil.java → mes/src/main/java/com/wangziyang/mes/common/util/TreeUtil.java
View File

@ -1,6 +1,6 @@
package com.songpeng.sparchetype.common.util; package com.wangziyang.mes.common.util;
import com.songpeng.sparchetype.system.vo.TreeVO; import com.wangziyang.mes.system.vo.TreeVO;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

2
sparchetype/src/main/java/com/songpeng/sparchetype/company/client/CompanyController.java → mes/src/main/java/com/wangziyang/mes/company/client/CompanyController.java
View File

@ -1,4 +1,4 @@
package com.songpeng.sparchetype.company.client; package com.wangziyang.mes.company.client;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;

2
sparchetype/src/main/java/com/songpeng/sparchetype/package-info.java → mes/src/main/java/com/wangziyang/mes/package-info.java
View File

@ -16,4 +16,4 @@
* 5） 删除的方法用 remove/delete 做前缀。 * 5） 删除的方法用 remove/delete 做前缀。
* 6） 修改的方法用 update 做前缀。 * 6） 修改的方法用 update 做前缀。
*/ */
package com.songpeng.sparchetype; package com.wangziyang.mes;

4
mes/src/main/java/com/wangziyang/mes/system/config/package-info.java Normal file
View File

@ -0,0 +1,4 @@
/**
* 系统配置
*/
package com.wangziyang.mes.system.config;

2
sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/RedisCache.java → mes/src/main/java/com/wangziyang/mes/system/config/shiro/RedisCache.java
View File

@ -1,4 +1,4 @@
package com.songpeng.sparchetype.system.config.shiro; package com.wangziyang.mes.system.config.shiro;
import org.apache.shiro.cache.Cache; import org.apache.shiro.cache.Cache;
import org.apache.shiro.cache.CacheException; import org.apache.shiro.cache.CacheException;

2
sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/RedisCacheManager.java → mes/src/main/java/com/wangziyang/mes/system/config/shiro/RedisCacheManager.java
View File

@ -1,4 +1,4 @@
package com.songpeng.sparchetype.system.config.shiro; package com.wangziyang.mes.system.config.shiro;
import org.apache.shiro.cache.Cache; import org.apache.shiro.cache.Cache;
import org.apache.shiro.cache.CacheException; import org.apache.shiro.cache.CacheException;

2
sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/RedisManager.java → mes/src/main/java/com/wangziyang/mes/system/config/shiro/RedisManager.java
View File

@ -1,4 +1,4 @@
package com.songpeng.sparchetype.system.config.shiro; package com.wangziyang.mes.system.config.shiro;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import redis.clients.jedis.Jedis; import redis.clients.jedis.Jedis;

2
sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/RedisSessionDAO.java → mes/src/main/java/com/wangziyang/mes/system/config/shiro/RedisSessionDAO.java
View File

@ -1,4 +1,4 @@
package com.songpeng.sparchetype.system.config.shiro; package com.wangziyang.mes.system.config.shiro;
import org.apache.shiro.session.Session; import org.apache.shiro.session.Session;
import org.apache.shiro.session.UnknownSessionException; import org.apache.shiro.session.UnknownSessionException;

2
sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/RetryLimitCredentialsMatcher.java → mes/src/main/java/com/wangziyang/mes/system/config/shiro/RetryLimitCredentialsMatcher.java
View File

@ -1,4 +1,4 @@
package com.songpeng.sparchetype.system.config.shiro; package com.wangziyang.mes.system.config.shiro;
import org.apache.shiro.authc.AuthenticationInfo; import org.apache.shiro.authc.AuthenticationInfo;
import org.apache.shiro.authc.AuthenticationToken; import org.apache.shiro.authc.AuthenticationToken;

2
sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/SerializeUtils.java → mes/src/main/java/com/wangziyang/mes/system/config/shiro/SerializeUtils.java
View File

@ -1,4 +1,4 @@
package com.songpeng.sparchetype.system.config.shiro; package com.wangziyang.mes.system.config.shiro;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

2
sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/ShiroConfig.java → mes/src/main/java/com/wangziyang/mes/system/config/shiro/ShiroConfig.java
View File

@ -1,4 +1,4 @@
package com.songpeng.sparchetype.system.config.shiro; package com.wangziyang.mes.system.config.shiro;
import org.apache.shiro.cache.ehcache.EhCacheManager; import org.apache.shiro.cache.ehcache.EhCacheManager;
import org.apache.shiro.mgt.SecurityManager; import org.apache.shiro.mgt.SecurityManager;

12
sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/ShiroRealm.java → mes/src/main/java/com/wangziyang/mes/system/config/shiro/ShiroRealm.java
View File

@ -1,10 +1,10 @@
package com.songpeng.sparchetype.system.config.shiro; package com.wangziyang.mes.system.config.shiro;
import com.songpeng.sparchetype.system.dto.SysMenuDTO; import com.wangziyang.mes.system.dto.SysMenuDTO;
import com.songpeng.sparchetype.system.dto.SysRoleDTO; import com.wangziyang.mes.system.dto.SysRoleDTO;
import com.songpeng.sparchetype.system.dto.SysUserDTO; import com.wangziyang.mes.system.dto.SysUserDTO;
import com.songpeng.sparchetype.system.enums.SysUserEnum; import com.wangziyang.mes.system.enums.SysUserEnum;
import com.songpeng.sparchetype.system.service.ISysUserService; import com.wangziyang.mes.system.service.ISysUserService;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authc.*; import org.apache.shiro.authc.*;

4
sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/SpLoginFormFilter.java → mes/src/main/java/com/wangziyang/mes/system/config/shiro/SpLoginFormFilter.java
View File

@ -1,6 +1,6 @@
package com.songpeng.sparchetype.system.config.shiro; package com.wangziyang.mes.system.config.shiro;
import com.songpeng.sparchetype.common.util.HttpUtil; import com.wangziyang.mes.common.util.HttpUtil;
import org.apache.shiro.web.filter.authc.FormAuthenticationFilter; import org.apache.shiro.web.filter.authc.FormAuthenticationFilter;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

2
sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/SpSessionListener.java → mes/src/main/java/com/wangziyang/mes/system/config/shiro/SpSessionListener.java
View File

@ -1,4 +1,4 @@
package com.songpeng.sparchetype.system.config.shiro; package com.wangziyang.mes.system.config.shiro;
import org.apache.shiro.session.Session; import org.apache.shiro.session.Session;
import org.apache.shiro.session.SessionListener; import org.apache.shiro.session.SessionListener;

2
sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/SpUsernamePasswordToken.java → mes/src/main/java/com/wangziyang/mes/system/config/shiro/SpUsernamePasswordToken.java
View File

@ -1,4 +1,4 @@
package com.songpeng.sparchetype.system.config.shiro; package com.wangziyang.mes.system.config.shiro;
import org.apache.shiro.authc.UsernamePasswordToken; import org.apache.shiro.authc.UsernamePasswordToken;

2
sparchetype/src/main/java/com/songpeng/sparchetype/system/config/swagger/SwaggerConfig.java → mes/src/main/java/com/wangziyang/mes/system/config/swagger/SwaggerConfig.java
View File

@ -1,4 +1,4 @@
package com.songpeng.sparchetype.system.config.swagger; package com.wangziyang.mes.system.config.swagger;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;

14
sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysDepartmentController.java → mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysDepartmentController.java
View File

@ -1,13 +1,13 @@
package com.songpeng.sparchetype.system.controller.admin; package com.wangziyang.mes.system.controller.admin;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.songpeng.sparchetype.common.BaseController; import com.wangziyang.mes.common.BaseController;
import com.songpeng.sparchetype.common.Result; import com.wangziyang.mes.common.Result;
import com.songpeng.sparchetype.system.entity.SysDepartment; import com.wangziyang.mes.system.entity.SysDepartment;
import com.songpeng.sparchetype.system.entity.SysDict; import com.wangziyang.mes.system.entity.SysDict;
import com.songpeng.sparchetype.system.request.SysDepartmentPageReq; import com.wangziyang.mes.system.request.SysDepartmentPageReq;
import com.songpeng.sparchetype.system.service.ISysDepartmentService; import com.wangziyang.mes.system.service.ISysDepartmentService;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;

12
sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysDictController.java → mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysDictController.java
View File

@ -1,12 +1,12 @@
package com.songpeng.sparchetype.system.controller.admin; package com.wangziyang.mes.system.controller.admin;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.songpeng.sparchetype.common.BaseController; import com.wangziyang.mes.common.BaseController;
import com.songpeng.sparchetype.common.Result; import com.wangziyang.mes.common.Result;
import com.songpeng.sparchetype.system.entity.SysDict; import com.wangziyang.mes.system.entity.SysDict;
import com.songpeng.sparchetype.system.request.SysDictPageReq; import com.wangziyang.mes.system.request.SysDictPageReq;
import com.songpeng.sparchetype.system.service.ISysDictService; import com.wangziyang.mes.system.service.ISysDictService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;

8
sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysLoginController.java → mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysLoginController.java
View File

@ -1,8 +1,8 @@
package com.songpeng.sparchetype.system.controller.admin; package com.wangziyang.mes.system.controller.admin;
import com.songpeng.sparchetype.common.BaseController; import com.wangziyang.mes.common.BaseController;
import com.songpeng.sparchetype.common.Result; import com.wangziyang.mes.common.Result;
import com.songpeng.sparchetype.system.service.ISysMenuService; import com.wangziyang.mes.system.service.ISysMenuService;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

14
sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysMenuController.java → mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysMenuController.java
View File

@ -1,13 +1,13 @@
package com.songpeng.sparchetype.system.controller.admin; package com.wangziyang.mes.system.controller.admin;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.songpeng.sparchetype.common.BaseController; import com.wangziyang.mes.common.BaseController;
import com.songpeng.sparchetype.common.Result; import com.wangziyang.mes.common.Result;
import com.songpeng.sparchetype.system.entity.SysMenu; import com.wangziyang.mes.system.entity.SysMenu;
import com.songpeng.sparchetype.system.request.SysMenuPageReq; import com.wangziyang.mes.system.request.SysMenuPageReq;
import com.songpeng.sparchetype.system.service.ISysMenuService; import com.wangziyang.mes.system.service.ISysMenuService;
import com.songpeng.sparchetype.system.vo.TreeVO; import com.wangziyang.mes.system.vo.TreeVO;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

12
sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysRoleController.java → mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysRoleController.java
View File

@ -1,13 +1,13 @@
package com.songpeng.sparchetype.system.controller.admin; package com.wangziyang.mes.system.controller.admin;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.songpeng.sparchetype.common.BaseController; import com.wangziyang.mes.common.BaseController;
import com.songpeng.sparchetype.common.Result; import com.wangziyang.mes.common.Result;
import com.songpeng.sparchetype.system.entity.SysRole; import com.wangziyang.mes.system.entity.SysRole;
import com.songpeng.sparchetype.system.request.SysRolePageReq; import com.wangziyang.mes.system.request.SysRolePageReq;
import com.songpeng.sparchetype.system.service.ISysRoleService; import com.wangziyang.mes.system.service.ISysRoleService;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;

4
sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysToolController.java → mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysToolController.java
View File

@ -1,7 +1,7 @@
package com.songpeng.sparchetype.system.controller.admin; package com.wangziyang.mes.system.controller.admin;
import com.songpeng.sparchetype.common.BaseController; import com.wangziyang.mes.common.BaseController;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;

18
sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysUserController.java → mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysUserController.java
View File

@ -1,15 +1,15 @@
package com.songpeng.sparchetype.system.controller.admin; package com.wangziyang.mes.system.controller.admin;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.songpeng.sparchetype.common.BaseController; import com.wangziyang.mes.common.BaseController;
import com.songpeng.sparchetype.common.Result; import com.wangziyang.mes.common.Result;
import com.songpeng.sparchetype.system.dto.SysRoleDTO; import com.wangziyang.mes.system.dto.SysRoleDTO;
import com.songpeng.sparchetype.system.dto.SysUserDTO; import com.wangziyang.mes.system.dto.SysUserDTO;
import com.songpeng.sparchetype.system.entity.SysUser; import com.wangziyang.mes.system.entity.SysUser;
import com.songpeng.sparchetype.system.request.SysUserPageReq; import com.wangziyang.mes.system.request.SysUserPageReq;
import com.songpeng.sparchetype.system.service.ISysRoleService; import com.wangziyang.mes.system.service.ISysRoleService;
import com.songpeng.sparchetype.system.service.ISysUserService; import com.wangziyang.mes.system.service.ISysUserService;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

8
sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/client/SysLoginController.java → mes/src/main/java/com/wangziyang/mes/system/controller/client/SysLoginController.java
View File

@ -1,8 +1,8 @@
package com.songpeng.sparchetype.system.controller.client; package com.wangziyang.mes.system.controller.client;
import com.songpeng.sparchetype.common.Result; import com.wangziyang.mes.common.Result;
import com.songpeng.sparchetype.common.util.RandomVerificationCodeUtil; import com.wangziyang.mes.common.util.RandomVerificationCodeUtil;
import com.songpeng.sparchetype.system.config.shiro.SpUsernamePasswordToken; import com.wangziyang.mes.system.config.shiro.SpUsernamePasswordToken;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.*; import org.apache.shiro.authc.*;

10
mes/src/main/java/com/wangziyang/mes/system/dto/SysDictDTO.java Normal file
View File

@ -0,0 +1,10 @@
package com.wangziyang.mes.system.dto;
import com.wangziyang.mes.system.entity.SysDict;
/**
* @author SongPeng
* @date 2019/9/30 9:49
*/
public class SysDictDTO extends SysDict {
}

4
sparchetype/src/main/java/com/songpeng/sparchetype/system/dto/SysMenuDTO.java → mes/src/main/java/com/wangziyang/mes/system/dto/SysMenuDTO.java
View File

@ -1,6 +1,6 @@
package com.songpeng.sparchetype.system.dto; package com.wangziyang.mes.system.dto;
import com.songpeng.sparchetype.system.entity.SysMenu; import com.wangziyang.mes.system.entity.SysMenu;
/** /**
* <p> * <p>

4
sparchetype/src/main/java/com/songpeng/sparchetype/system/dto/SysRoleDTO.java → mes/src/main/java/com/wangziyang/mes/system/dto/SysRoleDTO.java
View File

@ -1,6 +1,6 @@
package com.songpeng.sparchetype.system.dto; package com.wangziyang.mes.system.dto;
import com.songpeng.sparchetype.system.entity.SysRole; import com.wangziyang.mes.system.entity.SysRole;
import java.util.List; import java.util.List;

4
sparchetype/src/main/java/com/songpeng/sparchetype/system/dto/SysUserDTO.java → mes/src/main/java/com/wangziyang/mes/system/dto/SysUserDTO.java
View File

@ -1,6 +1,6 @@
package com.songpeng.sparchetype.system.dto; package com.wangziyang.mes.system.dto;
import com.songpeng.sparchetype.system.entity.SysUser; import com.wangziyang.mes.system.entity.SysUser;
import java.util.List; import java.util.List;

4
sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysDepartment.java → mes/src/main/java/com/wangziyang/mes/system/entity/SysDepartment.java
View File

@ -1,7 +1,7 @@
package com.songpeng.sparchetype.system.entity; package com.wangziyang.mes.system.entity;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.songpeng.sparchetype.common.BaseEntity; import com.wangziyang.mes.common.BaseEntity;
/** /**
* <p> * <p>

4
sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysDict.java → mes/src/main/java/com/wangziyang/mes/system/entity/SysDict.java
View File

@ -1,8 +1,8 @@
package com.songpeng.sparchetype.system.entity; package com.wangziyang.mes.system.entity;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.songpeng.sparchetype.common.BaseEntity; import com.wangziyang.mes.common.BaseEntity;
/** /**
* <p> * <p>

4
sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysMenu.java → mes/src/main/java/com/wangziyang/mes/system/entity/SysMenu.java
View File

@ -1,7 +1,7 @@
package com.songpeng.sparchetype.system.entity; package com.wangziyang.mes.system.entity;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.songpeng.sparchetype.common.BaseEntity; import com.wangziyang.mes.common.BaseEntity;
/** /**
* <p> * <p>

4
sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysRole.java → mes/src/main/java/com/wangziyang/mes/system/entity/SysRole.java
View File

@ -1,8 +1,8 @@
package com.songpeng.sparchetype.system.entity; package com.wangziyang.mes.system.entity;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.songpeng.sparchetype.common.BaseEntity; import com.wangziyang.mes.common.BaseEntity;
/** /**
* <p> * <p>

4
sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysRoleMenu.java → mes/src/main/java/com/wangziyang/mes/system/entity/SysRoleMenu.java
View File

@ -1,7 +1,7 @@
package com.songpeng.sparchetype.system.entity; package com.wangziyang.mes.system.entity;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.songpeng.sparchetype.common.BaseEntity; import com.wangziyang.mes.common.BaseEntity;
/** /**
* <p> * <p>

4
sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysUser.java → mes/src/main/java/com/wangziyang/mes/system/entity/SysUser.java
View File

@ -1,8 +1,8 @@
package com.songpeng.sparchetype.system.entity; package com.wangziyang.mes.system.entity;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.songpeng.sparchetype.common.BaseEntity; import com.wangziyang.mes.common.BaseEntity;
import java.time.LocalDateTime; import java.time.LocalDateTime;

4
sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysUserRole.java → mes/src/main/java/com/wangziyang/mes/system/entity/SysUserRole.java
View File

@ -1,7 +1,7 @@
package com.songpeng.sparchetype.system.entity; package com.wangziyang.mes.system.entity;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.songpeng.sparchetype.common.BaseEntity; import com.wangziyang.mes.common.BaseEntity;
/** /**
* <p> * <p>

2
sparchetype/src/main/java/com/songpeng/sparchetype/system/enums/SysMenuEnum.java → mes/src/main/java/com/wangziyang/mes/system/enums/SysMenuEnum.java
View File

@ -1,4 +1,4 @@
package com.songpeng.sparchetype.system.enums; package com.wangziyang.mes.system.enums;
/** /**
* 系统用户枚举 * 系统用户枚举

2
sparchetype/src/main/java/com/songpeng/sparchetype/system/enums/SysRoleEnum.java → mes/src/main/java/com/wangziyang/mes/system/enums/SysRoleEnum.java
View File

@ -1,4 +1,4 @@
package com.songpeng.sparchetype.system.enums; package com.wangziyang.mes.system.enums;
/** /**
* 系统用户枚举 * 系统用户枚举

2
sparchetype/src/main/java/com/songpeng/sparchetype/system/enums/SysUserEnum.java → mes/src/main/java/com/wangziyang/mes/system/enums/SysUserEnum.java
View File

@ -1,4 +1,4 @@
package com.songpeng.sparchetype.system.enums; package com.wangziyang.mes.system.enums;
/** /**
* 系统用户枚举 * 系统用户枚举

4
sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysDepartmentMapper.java → mes/src/main/java/com/wangziyang/mes/system/mapper/SysDepartmentMapper.java
View File

@ -1,7 +1,7 @@
package com.songpeng.sparchetype.system.mapper; package com.wangziyang.mes.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.songpeng.sparchetype.system.entity.SysDepartment; import com.wangziyang.mes.system.entity.SysDepartment;
/** /**
* <p> * <p>

4
sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysDictMapper.java → mes/src/main/java/com/wangziyang/mes/system/mapper/SysDictMapper.java
View File

@ -1,7 +1,7 @@
package com.songpeng.sparchetype.system.mapper; package com.wangziyang.mes.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.songpeng.sparchetype.system.entity.SysDict; import com.wangziyang.mes.system.entity.SysDict;
/** /**
* <p> * <p>

6
sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysMenuMapper.java → mes/src/main/java/com/wangziyang/mes/system/mapper/SysMenuMapper.java
View File

@ -1,8 +1,8 @@
package com.songpeng.sparchetype.system.mapper; package com.wangziyang.mes.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.songpeng.sparchetype.system.dto.SysMenuDTO; import com.wangziyang.mes.system.dto.SysMenuDTO;
import com.songpeng.sparchetype.system.entity.SysMenu; import com.wangziyang.mes.system.entity.SysMenu;
import java.util.List; import java.util.List;

4
sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysRoleMapper.java → mes/src/main/java/com/wangziyang/mes/system/mapper/SysRoleMapper.java
View File

@ -1,7 +1,7 @@
package com.songpeng.sparchetype.system.mapper; package com.wangziyang.mes.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.songpeng.sparchetype.system.entity.SysRole; import com.wangziyang.mes.system.entity.SysRole;
import java.util.List; import java.util.List;

4
sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysRoleMenuMapper.java → mes/src/main/java/com/wangziyang/mes/system/mapper/SysRoleMenuMapper.java
View File

@ -1,7 +1,7 @@
package com.songpeng.sparchetype.system.mapper; package com.wangziyang.mes.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.songpeng.sparchetype.system.entity.SysRoleMenu; import com.wangziyang.mes.system.entity.SysRoleMenu;
/** /**
* <p> * <p>

6
sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysUserMapper.java → mes/src/main/java/com/wangziyang/mes/system/mapper/SysUserMapper.java
View File

@ -1,8 +1,8 @@
package com.songpeng.sparchetype.system.mapper; package com.wangziyang.mes.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.songpeng.sparchetype.system.dto.SysUserDTO; import com.wangziyang.mes.system.dto.SysUserDTO;
import com.songpeng.sparchetype.system.entity.SysUser; import com.wangziyang.mes.system.entity.SysUser;
/** /**
* <p> * <p>

4
sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysUserRoleMapper.java → mes/src/main/java/com/wangziyang/mes/system/mapper/SysUserRoleMapper.java
View File

@ -1,7 +1,7 @@
package com.songpeng.sparchetype.system.mapper; package com.wangziyang.mes.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.songpeng.sparchetype.system.entity.SysUserRole; import com.wangziyang.mes.system.entity.SysUserRole;
/** /**
* <p> * <p>

4
sparchetype/src/main/java/com/songpeng/sparchetype/system/request/SysDepartmentPageReq.java → mes/src/main/java/com/wangziyang/mes/system/request/SysDepartmentPageReq.java
View File

@ -1,6 +1,6 @@
package com.songpeng.sparchetype.system.request; package com.wangziyang.mes.system.request;
import com.songpeng.sparchetype.common.BasePageReq; import com.wangziyang.mes.common.BasePageReq;
/** /**
* <p> * <p>

4
sparchetype/src/main/java/com/songpeng/sparchetype/system/request/SysDictPageReq.java → mes/src/main/java/com/wangziyang/mes/system/request/SysDictPageReq.java
View File

@ -1,6 +1,6 @@
package com.songpeng.sparchetype.system.request; package com.wangziyang.mes.system.request;
import com.songpeng.sparchetype.common.BasePageReq; import com.wangziyang.mes.common.BasePageReq;
/** /**
* <p> * <p>

4
sparchetype/src/main/java/com/songpeng/sparchetype/system/request/SysMenuPageReq.java → mes/src/main/java/com/wangziyang/mes/system/request/SysMenuPageReq.java
View File

@ -1,6 +1,6 @@
package com.songpeng.sparchetype.system.request; package com.wangziyang.mes.system.request;
import com.songpeng.sparchetype.common.BasePageReq; import com.wangziyang.mes.common.BasePageReq;
/** /**
* <p> * <p>

4
sparchetype/src/main/java/com/songpeng/sparchetype/system/request/SysRolePageReq.java → mes/src/main/java/com/wangziyang/mes/system/request/SysRolePageReq.java
View File

@ -1,6 +1,6 @@
package com.songpeng.sparchetype.system.request; package com.wangziyang.mes.system.request;
import com.songpeng.sparchetype.common.BasePageReq; import com.wangziyang.mes.common.BasePageReq;
/** /**
* <p> * <p>

4
sparchetype/src/main/java/com/songpeng/sparchetype/system/request/SysUserPageReq.java → mes/src/main/java/com/wangziyang/mes/system/request/SysUserPageReq.java
View File

@ -1,6 +1,6 @@
package com.songpeng.sparchetype.system.request; package com.wangziyang.mes.system.request;
import com.songpeng.sparchetype.common.BasePageReq; import com.wangziyang.mes.common.BasePageReq;
/** /**
* <p> * <p>

4
sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysDepartmentService.java → mes/src/main/java/com/wangziyang/mes/system/service/ISysDepartmentService.java
View File

@ -1,7 +1,7 @@
package com.songpeng.sparchetype.system.service; package com.wangziyang.mes.system.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.songpeng.sparchetype.system.entity.SysDepartment; import com.wangziyang.mes.system.entity.SysDepartment;
/** /**
* <p> * <p>

4
sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysDictService.java → mes/src/main/java/com/wangziyang/mes/system/service/ISysDictService.java
View File

@ -1,7 +1,7 @@
package com.songpeng.sparchetype.system.service; package com.wangziyang.mes.system.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.songpeng.sparchetype.system.entity.SysDict; import com.wangziyang.mes.system.entity.SysDict;
/** /**
* <p> * <p>

8
sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysMenuService.java → mes/src/main/java/com/wangziyang/mes/system/service/ISysMenuService.java
View File

@ -1,9 +1,9 @@
package com.songpeng.sparchetype.system.service; package com.wangziyang.mes.system.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.songpeng.sparchetype.system.dto.SysMenuDTO; import com.wangziyang.mes.system.dto.SysMenuDTO;
import com.songpeng.sparchetype.system.entity.SysMenu; import com.wangziyang.mes.system.entity.SysMenu;
import com.songpeng.sparchetype.system.vo.TreeVO; import com.wangziyang.mes.system.vo.TreeVO;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

4
sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysRoleMenuService.java → mes/src/main/java/com/wangziyang/mes/system/service/ISysRoleMenuService.java
View File

@ -1,7 +1,7 @@
package com.songpeng.sparchetype.system.service; package com.wangziyang.mes.system.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.songpeng.sparchetype.system.entity.SysRoleMenu; import com.wangziyang.mes.system.entity.SysRoleMenu;
/** /**
* <p> * <p>

8
sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysRoleService.java → mes/src/main/java/com/wangziyang/mes/system/service/ISysRoleService.java
View File

@ -1,10 +1,10 @@
package com.songpeng.sparchetype.system.service; package com.wangziyang.mes.system.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.songpeng.sparchetype.system.dto.SysRoleDTO; import com.wangziyang.mes.system.dto.SysRoleDTO;
import com.songpeng.sparchetype.system.dto.SysUserDTO; import com.wangziyang.mes.system.dto.SysUserDTO;
import com.songpeng.sparchetype.system.entity.SysRole; import com.wangziyang.mes.system.entity.SysRole;
import java.util.List; import java.util.List;

4
sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysUserRoleService.java → mes/src/main/java/com/wangziyang/mes/system/service/ISysUserRoleService.java
View File

@ -1,7 +1,7 @@
package com.songpeng.sparchetype.system.service; package com.wangziyang.mes.system.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.songpeng.sparchetype.system.entity.SysUserRole; import com.wangziyang.mes.system.entity.SysUserRole;
/** /**
* <p> * <p>

6
sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysUserService.java → mes/src/main/java/com/wangziyang/mes/system/service/ISysUserService.java
View File

@ -1,8 +1,8 @@
package com.songpeng.sparchetype.system.service; package com.wangziyang.mes.system.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.songpeng.sparchetype.system.dto.SysUserDTO; import com.wangziyang.mes.system.dto.SysUserDTO;
import com.songpeng.sparchetype.system.entity.SysUser; import com.wangziyang.mes.system.entity.SysUser;
/** /**
* <p> * <p>

Some files were not shown because too many files have changed in this diff Show More