diff --git a/README.md b/README.md index e4b1280..6cfaaf3 100644 --- a/README.md +++ b/README.md @@ -51,10 +51,10 @@ * 后端 * Hutool 是一个小而全的Java工具类库,通过静态方法封装,降低相关API的学习成本,提高工作效率,使Java拥有函数式语言般的优雅,让Java语言也可以“甜甜的”。 * 枚举 - * 公共枚举类:com.songpeng.sparchetype.common.enums.CommonEnum + * 公共枚举类:CommonEnum * 不同模块下的枚举:如 com.songpeng.sparchetype.system.enums * 请求参数 - * 每张表的分页查询参数,严格按照一张表对应一个请求参数对象进行开发,如系统用户分页查询参数:com.songpeng.sparchetype.system.request.SysUserPageReq + * 每张表的分页查询参数,严格按照一张表对应一个请求参数对象进行开发,如系统用户分页查询参数:SysUserPageReq # 总结 欢迎想一起开发的小伙伴。。本人前端太弱,都是自己乱摸索。还请有一个前端选手能一起弄 ## QQ Group87652870 diff --git a/sparchetype/.gitignore b/mes/.gitignore similarity index 100% rename from sparchetype/.gitignore rename to mes/.gitignore diff --git a/sparchetype/mvnw b/mes/mvnw similarity index 100% rename from sparchetype/mvnw rename to mes/mvnw diff --git a/sparchetype/mvnw.cmd b/mes/mvnw.cmd similarity index 100% rename from sparchetype/mvnw.cmd rename to mes/mvnw.cmd diff --git a/sparchetype/pom.xml b/mes/pom.xml similarity index 100% rename from sparchetype/pom.xml rename to mes/pom.xml diff --git a/sparchetype/src/main/docker/Dockerfile b/mes/src/main/docker/Dockerfile similarity index 100% rename from sparchetype/src/main/docker/Dockerfile rename to mes/src/main/docker/Dockerfile diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/SparchetypeApplication.java b/mes/src/main/java/com/wangziyang/mes/SparchetypeApplication.java similarity index 80% rename from sparchetype/src/main/java/com/songpeng/sparchetype/SparchetypeApplication.java rename to mes/src/main/java/com/wangziyang/mes/SparchetypeApplication.java index 41b8c00..e54d879 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/SparchetypeApplication.java +++ b/mes/src/main/java/com/wangziyang/mes/SparchetypeApplication.java @@ -1,11 +1,11 @@ -package com.songpeng.sparchetype; +package com.wangziyang.mes; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication -@MapperScan("com.songpeng.sparchetype.**.mapper*") +@MapperScan("com.wangziyang.mes.**.mapper*") public class SparchetypeApplication { public static void main(String[] args) { diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/common/controller/TableNameDataController.java b/mes/src/main/java/com/wangziyang/mes/basedata/common/controller/TableNameDataController.java similarity index 89% rename from sparchetype/src/main/java/com/songpeng/sparchetype/basedata/common/controller/TableNameDataController.java rename to mes/src/main/java/com/wangziyang/mes/basedata/common/controller/TableNameDataController.java index f5b8164..a5a382c 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/common/controller/TableNameDataController.java +++ b/mes/src/main/java/com/wangziyang/mes/basedata/common/controller/TableNameDataController.java @@ -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.songpeng.sparchetype.basedata.common.dto.CommonDto; -import com.songpeng.sparchetype.basedata.common.request.QueryTableNameDataReq; -import com.songpeng.sparchetype.basedata.common.service.TableNameDataService; -import com.songpeng.sparchetype.common.BaseController; -import com.songpeng.sparchetype.common.Result; -import com.songpeng.sparchetype.system.entity.SysUser; +import com.wangziyang.mes.basedata.common.dto.CommonDto; +import com.wangziyang.mes.basedata.common.request.QueryTableNameDataReq; +import com.wangziyang.mes.basedata.common.service.TableNameDataService; +import com.wangziyang.mes.common.BaseController; +import com.wangziyang.mes.common.Result; +import com.wangziyang.mes.system.entity.SysUser; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/common/dto/CommonDto.java b/mes/src/main/java/com/wangziyang/mes/basedata/common/dto/CommonDto.java similarity index 93% rename from sparchetype/src/main/java/com/songpeng/sparchetype/basedata/common/dto/CommonDto.java rename to mes/src/main/java/com/wangziyang/mes/basedata/common/dto/CommonDto.java index 2234c8a..9236448 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/common/dto/CommonDto.java +++ b/mes/src/main/java/com/wangziyang/mes/basedata/common/dto/CommonDto.java @@ -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; /** * 基础数据通用查询复杂对象 diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/common/mapper/QueryTableNameDataMapper.java b/mes/src/main/java/com/wangziyang/mes/basedata/common/mapper/QueryTableNameDataMapper.java similarity index 78% rename from sparchetype/src/main/java/com/songpeng/sparchetype/basedata/common/mapper/QueryTableNameDataMapper.java rename to mes/src/main/java/com/wangziyang/mes/basedata/common/mapper/QueryTableNameDataMapper.java index 480f865..0ccd507 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/common/mapper/QueryTableNameDataMapper.java +++ b/mes/src/main/java/com/wangziyang/mes/basedata/common/mapper/QueryTableNameDataMapper.java @@ -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.songpeng.sparchetype.basedata.common.dto.CommonDto; -import com.songpeng.sparchetype.basedata.common.request.QueryTableNameDataReq; -import com.songpeng.sparchetype.basedata.entity.SpTableManagerItem; -import org.apache.ibatis.annotations.Param; +import com.wangziyang.mes.basedata.common.dto.CommonDto; +import com.wangziyang.mes.basedata.common.request.QueryTableNameDataReq; +import com.wangziyang.mes.basedata.entity.SpTableManagerItem; import java.util.List; import java.util.Map; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/common/request/QueryTableNameDataReq.java b/mes/src/main/java/com/wangziyang/mes/basedata/common/request/QueryTableNameDataReq.java similarity index 91% rename from sparchetype/src/main/java/com/songpeng/sparchetype/basedata/common/request/QueryTableNameDataReq.java rename to mes/src/main/java/com/wangziyang/mes/basedata/common/request/QueryTableNameDataReq.java index fc1a079..011844d 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/common/request/QueryTableNameDataReq.java +++ b/mes/src/main/java/com/wangziyang/mes/basedata/common/request/QueryTableNameDataReq.java @@ -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 diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/common/service/TableNameDataService.java b/mes/src/main/java/com/wangziyang/mes/basedata/common/service/TableNameDataService.java similarity index 85% rename from sparchetype/src/main/java/com/songpeng/sparchetype/basedata/common/service/TableNameDataService.java rename to mes/src/main/java/com/wangziyang/mes/basedata/common/service/TableNameDataService.java index e517f25..a5686df 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/common/service/TableNameDataService.java +++ b/mes/src/main/java/com/wangziyang/mes/basedata/common/service/TableNameDataService.java @@ -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.songpeng.sparchetype.basedata.common.dto.CommonDto; -import com.songpeng.sparchetype.basedata.common.request.QueryTableNameDataReq; -import com.songpeng.sparchetype.system.entity.SysUser; +import com.wangziyang.mes.basedata.common.dto.CommonDto; +import com.wangziyang.mes.basedata.common.request.QueryTableNameDataReq; +import com.wangziyang.mes.system.entity.SysUser; import javax.servlet.http.HttpServletRequest; import java.util.List; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/common/service/impl/TableNameDataServiceImpl.java b/mes/src/main/java/com/wangziyang/mes/basedata/common/service/impl/TableNameDataServiceImpl.java similarity index 90% rename from sparchetype/src/main/java/com/songpeng/sparchetype/basedata/common/service/impl/TableNameDataServiceImpl.java rename to mes/src/main/java/com/wangziyang/mes/basedata/common/service/impl/TableNameDataServiceImpl.java index ccec333..a8f6deb 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/common/service/impl/TableNameDataServiceImpl.java +++ b/mes/src/main/java/com/wangziyang/mes/basedata/common/service/impl/TableNameDataServiceImpl.java @@ -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.songpeng.sparchetype.basedata.common.dto.CommonDto; -import com.songpeng.sparchetype.basedata.common.mapper.QueryTableNameDataMapper; -import com.songpeng.sparchetype.basedata.common.request.QueryTableNameDataReq; -import com.songpeng.sparchetype.basedata.common.service.TableNameDataService; -import com.songpeng.sparchetype.basedata.entity.SpTableManagerItem; -import com.songpeng.sparchetype.basedata.service.ISpTableManagerItemService; -import com.songpeng.sparchetype.common.util.IdUtil; -import com.songpeng.sparchetype.system.entity.SysUser; +import com.wangziyang.mes.basedata.common.dto.CommonDto; +import com.wangziyang.mes.basedata.common.mapper.QueryTableNameDataMapper; +import com.wangziyang.mes.basedata.common.request.QueryTableNameDataReq; +import com.wangziyang.mes.basedata.common.service.TableNameDataService; +import com.wangziyang.mes.basedata.entity.SpTableManagerItem; +import com.wangziyang.mes.basedata.service.ISpTableManagerItemService; +import com.wangziyang.mes.common.util.IdUtil; +import com.wangziyang.mes.system.entity.SysUser; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/controller/SpTableManagerController.java b/mes/src/main/java/com/wangziyang/mes/basedata/controller/SpTableManagerController.java similarity index 90% rename from sparchetype/src/main/java/com/songpeng/sparchetype/basedata/controller/SpTableManagerController.java rename to mes/src/main/java/com/wangziyang/mes/basedata/controller/SpTableManagerController.java index ea6c35b..cc41294 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/controller/SpTableManagerController.java +++ b/mes/src/main/java/com/wangziyang/mes/basedata/controller/SpTableManagerController.java @@ -1,16 +1,16 @@ -package com.songpeng.sparchetype.basedata.controller; +package com.wangziyang.mes.basedata.controller; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.songpeng.sparchetype.basedata.dto.SpTableManagerDto; -import com.songpeng.sparchetype.basedata.entity.SpTableManager; -import com.songpeng.sparchetype.basedata.entity.SpTableManagerItem; -import com.songpeng.sparchetype.basedata.request.SpTableManagerReq; -import com.songpeng.sparchetype.basedata.service.ISpTableManagerItemService; -import com.songpeng.sparchetype.basedata.service.ISpTableManagerService; -import com.songpeng.sparchetype.common.BaseController; -import com.songpeng.sparchetype.common.Result; +import com.wangziyang.mes.basedata.dto.SpTableManagerDto; +import com.wangziyang.mes.basedata.entity.SpTableManager; +import com.wangziyang.mes.basedata.entity.SpTableManagerItem; +import com.wangziyang.mes.basedata.request.SpTableManagerReq; +import com.wangziyang.mes.basedata.service.ISpTableManagerItemService; +import com.wangziyang.mes.basedata.service.ISpTableManagerService; +import com.wangziyang.mes.common.BaseController; +import com.wangziyang.mes.common.Result; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/controller/SpTableManagerItemController.java b/mes/src/main/java/com/wangziyang/mes/basedata/controller/SpTableManagerItemController.java similarity index 85% rename from sparchetype/src/main/java/com/songpeng/sparchetype/basedata/controller/SpTableManagerItemController.java rename to mes/src/main/java/com/wangziyang/mes/basedata/controller/SpTableManagerItemController.java index 3380a38..158d00c 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/controller/SpTableManagerItemController.java +++ b/mes/src/main/java/com/wangziyang/mes/basedata/controller/SpTableManagerItemController.java @@ -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.songpeng.sparchetype.basedata.service.ISpTableManagerItemService; -import com.songpeng.sparchetype.common.BaseController; -import com.songpeng.sparchetype.common.Result; +import com.wangziyang.mes.basedata.entity.SpTableManagerItem; +import com.wangziyang.mes.basedata.service.ISpTableManagerItemService; +import com.wangziyang.mes.common.BaseController; +import com.wangziyang.mes.common.Result; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/dto/SpTableManagerDto.java b/mes/src/main/java/com/wangziyang/mes/basedata/dto/SpTableManagerDto.java similarity index 78% rename from sparchetype/src/main/java/com/songpeng/sparchetype/basedata/dto/SpTableManagerDto.java rename to mes/src/main/java/com/wangziyang/mes/basedata/dto/SpTableManagerDto.java index cbb9a8a..31bac3f 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/dto/SpTableManagerDto.java +++ b/mes/src/main/java/com/wangziyang/mes/basedata/dto/SpTableManagerDto.java @@ -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.songpeng.sparchetype.basedata.entity.SpTableManagerItem; +import com.wangziyang.mes.basedata.entity.SpTableManager; +import com.wangziyang.mes.basedata.entity.SpTableManagerItem; import java.util.List; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/entity/SpTableManager.java b/mes/src/main/java/com/wangziyang/mes/basedata/entity/SpTableManager.java similarity index 95% rename from sparchetype/src/main/java/com/songpeng/sparchetype/basedata/entity/SpTableManager.java rename to mes/src/main/java/com/wangziyang/mes/basedata/entity/SpTableManager.java index 65b53f5..0d190d6 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/entity/SpTableManager.java +++ b/mes/src/main/java/com/wangziyang/mes/basedata/entity/SpTableManager.java @@ -1,9 +1,7 @@ -package com.songpeng.sparchetype.basedata.entity; +package com.wangziyang.mes.basedata.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.songpeng.sparchetype.common.BaseEntity; - -import java.util.List; +import com.wangziyang.mes.common.BaseEntity; /** *
diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/entity/SpTableManagerItem.java b/mes/src/main/java/com/wangziyang/mes/basedata/entity/SpTableManagerItem.java similarity index 95% rename from sparchetype/src/main/java/com/songpeng/sparchetype/basedata/entity/SpTableManagerItem.java rename to mes/src/main/java/com/wangziyang/mes/basedata/entity/SpTableManagerItem.java index 41884b8..4c024f2 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/entity/SpTableManagerItem.java +++ b/mes/src/main/java/com/wangziyang/mes/basedata/entity/SpTableManagerItem.java @@ -1,7 +1,7 @@ -package com.songpeng.sparchetype.basedata.entity; +package com.wangziyang.mes.basedata.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.songpeng.sparchetype.common.BaseEntity; +import com.wangziyang.mes.common.BaseEntity; /** *
diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/mapper/SpTableManagerItemMapper.java b/mes/src/main/java/com/wangziyang/mes/basedata/mapper/SpTableManagerItemMapper.java similarity index 85% rename from sparchetype/src/main/java/com/songpeng/sparchetype/basedata/mapper/SpTableManagerItemMapper.java rename to mes/src/main/java/com/wangziyang/mes/basedata/mapper/SpTableManagerItemMapper.java index e16e4a0..605b008 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/mapper/SpTableManagerItemMapper.java +++ b/mes/src/main/java/com/wangziyang/mes/basedata/mapper/SpTableManagerItemMapper.java @@ -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.songpeng.sparchetype.basedata.entity.SpTableManagerItem; +import com.wangziyang.mes.basedata.entity.SpTableManagerItem; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/mapper/SpTableManagerMapper.java b/mes/src/main/java/com/wangziyang/mes/basedata/mapper/SpTableManagerMapper.java similarity index 70% rename from sparchetype/src/main/java/com/songpeng/sparchetype/basedata/mapper/SpTableManagerMapper.java rename to mes/src/main/java/com/wangziyang/mes/basedata/mapper/SpTableManagerMapper.java index dd30a61..507edef 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/mapper/SpTableManagerMapper.java +++ b/mes/src/main/java/com/wangziyang/mes/basedata/mapper/SpTableManagerMapper.java @@ -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.songpeng.sparchetype.basedata.entity.SpTableManager; -import com.songpeng.sparchetype.basedata.entity.SpTableManagerItem; +import com.wangziyang.mes.basedata.entity.SpTableManager; +import com.wangziyang.mes.basedata.entity.SpTableManagerItem; import java.util.List; diff --git a/mes/src/main/java/com/wangziyang/mes/basedata/request/SpTableManagerReq.java b/mes/src/main/java/com/wangziyang/mes/basedata/request/SpTableManagerReq.java new file mode 100644 index 0000000..b20ccac --- /dev/null +++ b/mes/src/main/java/com/wangziyang/mes/basedata/request/SpTableManagerReq.java @@ -0,0 +1,9 @@ +package com.wangziyang.mes.basedata.request; + +import com.wangziyang.mes.common.BasePageReq; + +/** + * + */ +public class SpTableManagerReq extends BasePageReq { +} diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/service/ISpTableManagerItemService.java b/mes/src/main/java/com/wangziyang/mes/basedata/service/ISpTableManagerItemService.java similarity index 84% rename from sparchetype/src/main/java/com/songpeng/sparchetype/basedata/service/ISpTableManagerItemService.java rename to mes/src/main/java/com/wangziyang/mes/basedata/service/ISpTableManagerItemService.java index 4244dbc..ffa431f 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/service/ISpTableManagerItemService.java +++ b/mes/src/main/java/com/wangziyang/mes/basedata/service/ISpTableManagerItemService.java @@ -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.songpeng.sparchetype.basedata.entity.SpTableManagerItem; +import com.wangziyang.mes.basedata.entity.SpTableManagerItem; import java.util.List; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/service/ISpTableManagerService.java b/mes/src/main/java/com/wangziyang/mes/basedata/service/ISpTableManagerService.java similarity index 71% rename from sparchetype/src/main/java/com/songpeng/sparchetype/basedata/service/ISpTableManagerService.java rename to mes/src/main/java/com/wangziyang/mes/basedata/service/ISpTableManagerService.java index 05771ab..dcf6dec 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/service/ISpTableManagerService.java +++ b/mes/src/main/java/com/wangziyang/mes/basedata/service/ISpTableManagerService.java @@ -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.songpeng.sparchetype.basedata.entity.SpTableManager; -import com.songpeng.sparchetype.basedata.entity.SpTableManagerItem; +import com.wangziyang.mes.basedata.entity.SpTableManager; +import com.wangziyang.mes.basedata.entity.SpTableManagerItem; import java.util.List; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/service/impl/SpTableManagerItemServiceImpl.java b/mes/src/main/java/com/wangziyang/mes/basedata/service/impl/SpTableManagerItemServiceImpl.java similarity index 80% rename from sparchetype/src/main/java/com/songpeng/sparchetype/basedata/service/impl/SpTableManagerItemServiceImpl.java rename to mes/src/main/java/com/wangziyang/mes/basedata/service/impl/SpTableManagerItemServiceImpl.java index b0f6105..0860a18 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/service/impl/SpTableManagerItemServiceImpl.java +++ b/mes/src/main/java/com/wangziyang/mes/basedata/service/impl/SpTableManagerItemServiceImpl.java @@ -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.songpeng.sparchetype.basedata.entity.SpTableManagerItem; -import com.songpeng.sparchetype.basedata.mapper.SpTableManagerItemMapper; -import com.songpeng.sparchetype.basedata.service.ISpTableManagerItemService; +import com.wangziyang.mes.basedata.entity.SpTableManagerItem; +import com.wangziyang.mes.basedata.mapper.SpTableManagerItemMapper; +import com.wangziyang.mes.basedata.service.ISpTableManagerItemService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/service/impl/SpTableManagerServiceImpl.java b/mes/src/main/java/com/wangziyang/mes/basedata/service/impl/SpTableManagerServiceImpl.java similarity index 75% rename from sparchetype/src/main/java/com/songpeng/sparchetype/basedata/service/impl/SpTableManagerServiceImpl.java rename to mes/src/main/java/com/wangziyang/mes/basedata/service/impl/SpTableManagerServiceImpl.java index 2394dbb..68c28e9 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/service/impl/SpTableManagerServiceImpl.java +++ b/mes/src/main/java/com/wangziyang/mes/basedata/service/impl/SpTableManagerServiceImpl.java @@ -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 com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.songpeng.sparchetype.basedata.entity.SpTableManager; -import com.songpeng.sparchetype.basedata.entity.SpTableManagerItem; -import com.songpeng.sparchetype.basedata.mapper.SpTableManagerMapper; -import com.songpeng.sparchetype.basedata.service.ISpTableManagerService; -import org.apache.ibatis.annotations.Param; +import com.wangziyang.mes.basedata.entity.SpTableManager; +import com.wangziyang.mes.basedata.entity.SpTableManagerItem; +import com.wangziyang.mes.basedata.mapper.SpTableManagerMapper; +import com.wangziyang.mes.basedata.service.ISpTableManagerService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/common/BaseController.java b/mes/src/main/java/com/wangziyang/mes/common/BaseController.java similarity index 73% rename from sparchetype/src/main/java/com/songpeng/sparchetype/common/BaseController.java rename to mes/src/main/java/com/wangziyang/mes/common/BaseController.java index 938c968..f2a7c93 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/common/BaseController.java +++ b/mes/src/main/java/com/wangziyang/mes/common/BaseController.java @@ -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; /** diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/common/BaseEntity.java b/mes/src/main/java/com/wangziyang/mes/common/BaseEntity.java similarity index 97% rename from sparchetype/src/main/java/com/songpeng/sparchetype/common/BaseEntity.java rename to mes/src/main/java/com/wangziyang/mes/common/BaseEntity.java index f8a1896..083ebdb 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/common/BaseEntity.java +++ b/mes/src/main/java/com/wangziyang/mes/common/BaseEntity.java @@ -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.IdType; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/common/BasePageReq.java b/mes/src/main/java/com/wangziyang/mes/common/BasePageReq.java similarity index 90% rename from sparchetype/src/main/java/com/songpeng/sparchetype/common/BasePageReq.java rename to mes/src/main/java/com/wangziyang/mes/common/BasePageReq.java index ed8e7ca..63cab61 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/common/BasePageReq.java +++ b/mes/src/main/java/com/wangziyang/mes/common/BasePageReq.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype.common; +package com.wangziyang.mes.common; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/common/Result.java b/mes/src/main/java/com/wangziyang/mes/common/Result.java similarity index 96% rename from sparchetype/src/main/java/com/songpeng/sparchetype/common/Result.java rename to mes/src/main/java/com/wangziyang/mes/common/Result.java index af0fd30..29680ac 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/common/Result.java +++ b/mes/src/main/java/com/wangziyang/mes/common/Result.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype.common; +package com.wangziyang.mes.common; import java.util.HashMap; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/common/advice/ExceptionAdvice.java b/mes/src/main/java/com/wangziyang/mes/common/advice/ExceptionAdvice.java similarity index 91% rename from sparchetype/src/main/java/com/songpeng/sparchetype/common/advice/ExceptionAdvice.java rename to mes/src/main/java/com/wangziyang/mes/common/advice/ExceptionAdvice.java index c7f3e4e..d3f0e4b 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/common/advice/ExceptionAdvice.java +++ b/mes/src/main/java/com/wangziyang/mes/common/advice/ExceptionAdvice.java @@ -1,7 +1,7 @@ -package com.songpeng.sparchetype.common.advice; +package com.wangziyang.mes.common.advice; -import com.songpeng.sparchetype.common.Result; -import com.songpeng.sparchetype.common.util.HttpUtil; +import com.wangziyang.mes.common.Result; +import com.wangziyang.mes.common.util.HttpUtil; import org.apache.shiro.authz.AuthorizationException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/common/advice/MyErrorViewResolver.java b/mes/src/main/java/com/wangziyang/mes/common/advice/MyErrorViewResolver.java similarity index 91% rename from sparchetype/src/main/java/com/songpeng/sparchetype/common/advice/MyErrorViewResolver.java rename to mes/src/main/java/com/wangziyang/mes/common/advice/MyErrorViewResolver.java index 5bcdbd1..d3703ec 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/common/advice/MyErrorViewResolver.java +++ b/mes/src/main/java/com/wangziyang/mes/common/advice/MyErrorViewResolver.java @@ -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.ErrorPageRegistrar; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/common/config/JsonConfig.java b/mes/src/main/java/com/wangziyang/mes/common/config/JsonConfig.java similarity index 98% rename from sparchetype/src/main/java/com/songpeng/sparchetype/common/config/JsonConfig.java rename to mes/src/main/java/com/wangziyang/mes/common/config/JsonConfig.java index c640f63..e340076 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/common/config/JsonConfig.java +++ b/mes/src/main/java/com/wangziyang/mes/common/config/JsonConfig.java @@ -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.datatype.jdk8.Jdk8Module; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/common/config/MybatisPlusConfig.java b/mes/src/main/java/com/wangziyang/mes/common/config/MybatisPlusConfig.java similarity index 90% rename from sparchetype/src/main/java/com/songpeng/sparchetype/common/config/MybatisPlusConfig.java rename to mes/src/main/java/com/wangziyang/mes/common/config/MybatisPlusConfig.java index 3abfdfd..74c8193 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/common/config/MybatisPlusConfig.java +++ b/mes/src/main/java/com/wangziyang/mes/common/config/MybatisPlusConfig.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype.common.config; +package com.wangziyang.mes.common.config; import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; import org.mybatis.spring.annotation.MapperScan; @@ -12,7 +12,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; */ @EnableTransactionManagement @Configuration -@MapperScan("com.songpeng.sparchetype.*.mapper*") +@MapperScan("com.wangziyang.mes.*.mapper*") public class MybatisPlusConfig { @Bean diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/common/config/ShiroTagsFreeMarkerConfig.java b/mes/src/main/java/com/wangziyang/mes/common/config/ShiroTagsFreeMarkerConfig.java similarity index 92% rename from sparchetype/src/main/java/com/songpeng/sparchetype/common/config/ShiroTagsFreeMarkerConfig.java rename to mes/src/main/java/com/wangziyang/mes/common/config/ShiroTagsFreeMarkerConfig.java index 8524369..0c085a0 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/common/config/ShiroTagsFreeMarkerConfig.java +++ b/mes/src/main/java/com/wangziyang/mes/common/config/ShiroTagsFreeMarkerConfig.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype.common.config; +package com.wangziyang.mes.common.config; import com.jagregory.shiro.freemarker.ShiroTags; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/common/config/SpMetaObjectHandler.java b/mes/src/main/java/com/wangziyang/mes/common/config/SpMetaObjectHandler.java similarity index 93% rename from sparchetype/src/main/java/com/songpeng/sparchetype/common/config/SpMetaObjectHandler.java rename to mes/src/main/java/com/wangziyang/mes/common/config/SpMetaObjectHandler.java index a75d50e..fdb4ac3 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/common/config/SpMetaObjectHandler.java +++ b/mes/src/main/java/com/wangziyang/mes/common/config/SpMetaObjectHandler.java @@ -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.songpeng.sparchetype.system.entity.SysUser; +import com.wangziyang.mes.system.entity.SysUser; import org.apache.ibatis.reflection.MetaObject; import org.apache.shiro.SecurityUtils; import org.slf4j.Logger; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/common/controller/admin/CommonController.java b/mes/src/main/java/com/wangziyang/mes/common/controller/admin/CommonController.java similarity index 91% rename from sparchetype/src/main/java/com/songpeng/sparchetype/common/controller/admin/CommonController.java rename to mes/src/main/java/com/wangziyang/mes/common/controller/admin/CommonController.java index b531893..57adcb6 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/common/controller/admin/CommonController.java +++ b/mes/src/main/java/com/wangziyang/mes/common/controller/admin/CommonController.java @@ -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.web.bind.annotation.GetMapping; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/common/enums/CommonEnum.java b/mes/src/main/java/com/wangziyang/mes/common/enums/CommonEnum.java similarity index 95% rename from sparchetype/src/main/java/com/songpeng/sparchetype/common/enums/CommonEnum.java rename to mes/src/main/java/com/wangziyang/mes/common/enums/CommonEnum.java index 1a9dbf1..807438a 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/common/enums/CommonEnum.java +++ b/mes/src/main/java/com/wangziyang/mes/common/enums/CommonEnum.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype.common.enums; +package com.wangziyang.mes.common.enums; /** * 系统用户枚举 diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/common/util/ByteUtil.java b/mes/src/main/java/com/wangziyang/mes/common/util/ByteUtil.java similarity index 98% rename from sparchetype/src/main/java/com/songpeng/sparchetype/common/util/ByteUtil.java rename to mes/src/main/java/com/wangziyang/mes/common/util/ByteUtil.java index 9d7e14d..12e14bb 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/common/util/ByteUtil.java +++ b/mes/src/main/java/com/wangziyang/mes/common/util/ByteUtil.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype.common.util; +package com.wangziyang.mes.common.util; import java.util.regex.Pattern; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/common/util/CodeGenerator.java b/mes/src/main/java/com/wangziyang/mes/common/util/CodeGenerator.java similarity index 94% rename from sparchetype/src/main/java/com/songpeng/sparchetype/common/util/CodeGenerator.java rename to mes/src/main/java/com/wangziyang/mes/common/util/CodeGenerator.java index efd7f5d..d8fc0ab 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/common/util/CodeGenerator.java +++ b/mes/src/main/java/com/wangziyang/mes/common/util/CodeGenerator.java @@ -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.toolkit.StringPool; @@ -50,7 +50,7 @@ public class CodeGenerator { // 包配置 PackageConfig pc = new PackageConfig(); pc.setModuleName(scanner("模块名")); - pc.setParent("com.songpeng.sparchetype"); + pc.setParent("com.wangziyang.mes"); mpg.setPackageInfo(pc); // 自定义配置 @@ -104,12 +104,12 @@ public class CodeGenerator { StrategyConfig strategy = new StrategyConfig(); strategy.setNaming(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.setRestControllerStyle(true); 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.setInclude(scanner("表名,多个英文逗号分割").split(",")); diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/common/util/HashUtil.java b/mes/src/main/java/com/wangziyang/mes/common/util/HashUtil.java similarity index 99% rename from sparchetype/src/main/java/com/songpeng/sparchetype/common/util/HashUtil.java rename to mes/src/main/java/com/wangziyang/mes/common/util/HashUtil.java index 896bd89..d316e00 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/common/util/HashUtil.java +++ b/mes/src/main/java/com/wangziyang/mes/common/util/HashUtil.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype.common.util; +package com.wangziyang.mes.common.util; import java.nio.charset.StandardCharsets; import java.security.GeneralSecurityException; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/common/util/HttpUtil.java b/mes/src/main/java/com/wangziyang/mes/common/util/HttpUtil.java similarity index 93% rename from sparchetype/src/main/java/com/songpeng/sparchetype/common/util/HttpUtil.java rename to mes/src/main/java/com/wangziyang/mes/common/util/HttpUtil.java index ca9c5ea..aebfd71 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/common/util/HttpUtil.java +++ b/mes/src/main/java/com/wangziyang/mes/common/util/HttpUtil.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype.common.util; +package com.wangziyang.mes.common.util; import org.apache.commons.lang3.StringUtils; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/common/util/IdUtil.java b/mes/src/main/java/com/wangziyang/mes/common/util/IdUtil.java similarity index 99% rename from sparchetype/src/main/java/com/songpeng/sparchetype/common/util/IdUtil.java rename to mes/src/main/java/com/wangziyang/mes/common/util/IdUtil.java index 174c9da..e6a8bdf 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/common/util/IdUtil.java +++ b/mes/src/main/java/com/wangziyang/mes/common/util/IdUtil.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype.common.util; +package com.wangziyang.mes.common.util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/common/util/RandomVerificationCodeUtil.java b/mes/src/main/java/com/wangziyang/mes/common/util/RandomVerificationCodeUtil.java similarity index 98% rename from sparchetype/src/main/java/com/songpeng/sparchetype/common/util/RandomVerificationCodeUtil.java rename to mes/src/main/java/com/wangziyang/mes/common/util/RandomVerificationCodeUtil.java index a53f9df..12ef914 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/common/util/RandomVerificationCodeUtil.java +++ b/mes/src/main/java/com/wangziyang/mes/common/util/RandomVerificationCodeUtil.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype.common.util; +package com.wangziyang.mes.common.util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/common/util/TreeUtil.java b/mes/src/main/java/com/wangziyang/mes/common/util/TreeUtil.java similarity index 95% rename from sparchetype/src/main/java/com/songpeng/sparchetype/common/util/TreeUtil.java rename to mes/src/main/java/com/wangziyang/mes/common/util/TreeUtil.java index 3b963cb..845a4b9 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/common/util/TreeUtil.java +++ b/mes/src/main/java/com/wangziyang/mes/common/util/TreeUtil.java @@ -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.List; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/company/client/CompanyController.java b/mes/src/main/java/com/wangziyang/mes/company/client/CompanyController.java similarity index 97% rename from sparchetype/src/main/java/com/songpeng/sparchetype/company/client/CompanyController.java rename to mes/src/main/java/com/wangziyang/mes/company/client/CompanyController.java index 58942bc..a2d5906 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/company/client/CompanyController.java +++ b/mes/src/main/java/com/wangziyang/mes/company/client/CompanyController.java @@ -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.ApiImplicitParam; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/package-info.java b/mes/src/main/java/com/wangziyang/mes/package-info.java similarity index 94% rename from sparchetype/src/main/java/com/songpeng/sparchetype/package-info.java rename to mes/src/main/java/com/wangziyang/mes/package-info.java index cfc5a30..15314d0 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/package-info.java +++ b/mes/src/main/java/com/wangziyang/mes/package-info.java @@ -16,4 +16,4 @@ * 5) 删除的方法用 remove/delete 做前缀。 * 6) 修改的方法用 update 做前缀。 */ -package com.songpeng.sparchetype; \ No newline at end of file +package com.wangziyang.mes; \ No newline at end of file diff --git a/mes/src/main/java/com/wangziyang/mes/system/config/package-info.java b/mes/src/main/java/com/wangziyang/mes/system/config/package-info.java new file mode 100644 index 0000000..4024626 --- /dev/null +++ b/mes/src/main/java/com/wangziyang/mes/system/config/package-info.java @@ -0,0 +1,4 @@ +/** + * 系统配置 + */ +package com.wangziyang.mes.system.config; \ No newline at end of file diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/RedisCache.java b/mes/src/main/java/com/wangziyang/mes/system/config/shiro/RedisCache.java similarity index 98% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/RedisCache.java rename to mes/src/main/java/com/wangziyang/mes/system/config/shiro/RedisCache.java index 08c5cd4..08d413e 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/RedisCache.java +++ b/mes/src/main/java/com/wangziyang/mes/system/config/shiro/RedisCache.java @@ -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.CacheException; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/RedisCacheManager.java b/mes/src/main/java/com/wangziyang/mes/system/config/shiro/RedisCacheManager.java similarity index 97% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/RedisCacheManager.java rename to mes/src/main/java/com/wangziyang/mes/system/config/shiro/RedisCacheManager.java index a0a6b36..951a1d9 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/RedisCacheManager.java +++ b/mes/src/main/java/com/wangziyang/mes/system/config/shiro/RedisCacheManager.java @@ -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.CacheException; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/RedisManager.java b/mes/src/main/java/com/wangziyang/mes/system/config/shiro/RedisManager.java similarity index 98% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/RedisManager.java rename to mes/src/main/java/com/wangziyang/mes/system/config/shiro/RedisManager.java index 6e0eecd..3689900 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/RedisManager.java +++ b/mes/src/main/java/com/wangziyang/mes/system/config/shiro/RedisManager.java @@ -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 redis.clients.jedis.Jedis; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/RedisSessionDAO.java b/mes/src/main/java/com/wangziyang/mes/system/config/shiro/RedisSessionDAO.java similarity index 98% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/RedisSessionDAO.java rename to mes/src/main/java/com/wangziyang/mes/system/config/shiro/RedisSessionDAO.java index d6eee84..515944a 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/RedisSessionDAO.java +++ b/mes/src/main/java/com/wangziyang/mes/system/config/shiro/RedisSessionDAO.java @@ -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.UnknownSessionException; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/RetryLimitCredentialsMatcher.java b/mes/src/main/java/com/wangziyang/mes/system/config/shiro/RetryLimitCredentialsMatcher.java similarity index 97% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/RetryLimitCredentialsMatcher.java rename to mes/src/main/java/com/wangziyang/mes/system/config/shiro/RetryLimitCredentialsMatcher.java index 70ff6a2..6f5f7a6 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/RetryLimitCredentialsMatcher.java +++ b/mes/src/main/java/com/wangziyang/mes/system/config/shiro/RetryLimitCredentialsMatcher.java @@ -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.AuthenticationToken; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/SerializeUtils.java b/mes/src/main/java/com/wangziyang/mes/system/config/shiro/SerializeUtils.java similarity index 97% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/SerializeUtils.java rename to mes/src/main/java/com/wangziyang/mes/system/config/shiro/SerializeUtils.java index fbe51af..383856e 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/SerializeUtils.java +++ b/mes/src/main/java/com/wangziyang/mes/system/config/shiro/SerializeUtils.java @@ -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.LoggerFactory; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/ShiroConfig.java b/mes/src/main/java/com/wangziyang/mes/system/config/shiro/ShiroConfig.java similarity index 99% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/ShiroConfig.java rename to mes/src/main/java/com/wangziyang/mes/system/config/shiro/ShiroConfig.java index 813d731..83f6dd5 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/ShiroConfig.java +++ b/mes/src/main/java/com/wangziyang/mes/system/config/shiro/ShiroConfig.java @@ -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.mgt.SecurityManager; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/ShiroRealm.java b/mes/src/main/java/com/wangziyang/mes/system/config/shiro/ShiroRealm.java similarity index 90% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/ShiroRealm.java rename to mes/src/main/java/com/wangziyang/mes/system/config/shiro/ShiroRealm.java index 191a7fe..da667b4 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/ShiroRealm.java +++ b/mes/src/main/java/com/wangziyang/mes/system/config/shiro/ShiroRealm.java @@ -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.songpeng.sparchetype.system.dto.SysRoleDTO; -import com.songpeng.sparchetype.system.dto.SysUserDTO; -import com.songpeng.sparchetype.system.enums.SysUserEnum; -import com.songpeng.sparchetype.system.service.ISysUserService; +import com.wangziyang.mes.system.dto.SysMenuDTO; +import com.wangziyang.mes.system.dto.SysRoleDTO; +import com.wangziyang.mes.system.dto.SysUserDTO; +import com.wangziyang.mes.system.enums.SysUserEnum; +import com.wangziyang.mes.system.service.ISysUserService; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authc.*; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/SpLoginFormFilter.java b/mes/src/main/java/com/wangziyang/mes/system/config/shiro/SpLoginFormFilter.java similarity index 94% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/SpLoginFormFilter.java rename to mes/src/main/java/com/wangziyang/mes/system/config/shiro/SpLoginFormFilter.java index 49e3f40..3b180ae 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/SpLoginFormFilter.java +++ b/mes/src/main/java/com/wangziyang/mes/system/config/shiro/SpLoginFormFilter.java @@ -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.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/SpSessionListener.java b/mes/src/main/java/com/wangziyang/mes/system/config/shiro/SpSessionListener.java similarity index 91% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/SpSessionListener.java rename to mes/src/main/java/com/wangziyang/mes/system/config/shiro/SpSessionListener.java index e2031aa..3802576 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/SpSessionListener.java +++ b/mes/src/main/java/com/wangziyang/mes/system/config/shiro/SpSessionListener.java @@ -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.SessionListener; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/SpUsernamePasswordToken.java b/mes/src/main/java/com/wangziyang/mes/system/config/shiro/SpUsernamePasswordToken.java similarity index 90% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/SpUsernamePasswordToken.java rename to mes/src/main/java/com/wangziyang/mes/system/config/shiro/SpUsernamePasswordToken.java index 8ef7296..4577a14 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/SpUsernamePasswordToken.java +++ b/mes/src/main/java/com/wangziyang/mes/system/config/shiro/SpUsernamePasswordToken.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype.system.config.shiro; +package com.wangziyang.mes.system.config.shiro; import org.apache.shiro.authc.UsernamePasswordToken; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/swagger/SwaggerConfig.java b/mes/src/main/java/com/wangziyang/mes/system/config/swagger/SwaggerConfig.java similarity index 96% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/config/swagger/SwaggerConfig.java rename to mes/src/main/java/com/wangziyang/mes/system/config/swagger/SwaggerConfig.java index d332e06..4f3e024 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/swagger/SwaggerConfig.java +++ b/mes/src/main/java/com/wangziyang/mes/system/config/swagger/SwaggerConfig.java @@ -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.boot.context.properties.ConfigurationProperties; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysDepartmentController.java b/mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysDepartmentController.java similarity index 84% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysDepartmentController.java rename to mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysDepartmentController.java index 8215ce6..8541a8f 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysDepartmentController.java +++ b/mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysDepartmentController.java @@ -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.songpeng.sparchetype.common.BaseController; -import com.songpeng.sparchetype.common.Result; -import com.songpeng.sparchetype.system.entity.SysDepartment; -import com.songpeng.sparchetype.system.entity.SysDict; -import com.songpeng.sparchetype.system.request.SysDepartmentPageReq; -import com.songpeng.sparchetype.system.service.ISysDepartmentService; +import com.wangziyang.mes.common.BaseController; +import com.wangziyang.mes.common.Result; +import com.wangziyang.mes.system.entity.SysDepartment; +import com.wangziyang.mes.system.entity.SysDict; +import com.wangziyang.mes.system.request.SysDepartmentPageReq; +import com.wangziyang.mes.system.service.ISysDepartmentService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysDictController.java b/mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysDictController.java similarity index 86% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysDictController.java rename to mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysDictController.java index 803f51b..99feeb2 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysDictController.java +++ b/mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysDictController.java @@ -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.songpeng.sparchetype.common.BaseController; -import com.songpeng.sparchetype.common.Result; -import com.songpeng.sparchetype.system.entity.SysDict; -import com.songpeng.sparchetype.system.request.SysDictPageReq; -import com.songpeng.sparchetype.system.service.ISysDictService; +import com.wangziyang.mes.common.BaseController; +import com.wangziyang.mes.common.Result; +import com.wangziyang.mes.system.entity.SysDict; +import com.wangziyang.mes.system.request.SysDictPageReq; +import com.wangziyang.mes.system.service.ISysDictService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysLoginController.java b/mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysLoginController.java similarity index 87% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysLoginController.java rename to mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysLoginController.java index 441c166..23f7312 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysLoginController.java +++ b/mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysLoginController.java @@ -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.songpeng.sparchetype.common.Result; -import com.songpeng.sparchetype.system.service.ISysMenuService; +import com.wangziyang.mes.common.BaseController; +import com.wangziyang.mes.common.Result; +import com.wangziyang.mes.system.service.ISysMenuService; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysMenuController.java b/mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysMenuController.java similarity index 83% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysMenuController.java rename to mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysMenuController.java index bc86b8b..fdfe6c0 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysMenuController.java +++ b/mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysMenuController.java @@ -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.songpeng.sparchetype.common.BaseController; -import com.songpeng.sparchetype.common.Result; -import com.songpeng.sparchetype.system.entity.SysMenu; -import com.songpeng.sparchetype.system.request.SysMenuPageReq; -import com.songpeng.sparchetype.system.service.ISysMenuService; -import com.songpeng.sparchetype.system.vo.TreeVO; +import com.wangziyang.mes.common.BaseController; +import com.wangziyang.mes.common.Result; +import com.wangziyang.mes.system.entity.SysMenu; +import com.wangziyang.mes.system.request.SysMenuPageReq; +import com.wangziyang.mes.system.service.ISysMenuService; +import com.wangziyang.mes.system.vo.TreeVO; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysRoleController.java b/mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysRoleController.java similarity index 83% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysRoleController.java rename to mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysRoleController.java index 0a04bff..c2ad168 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysRoleController.java +++ b/mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysRoleController.java @@ -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.metadata.IPage; -import com.songpeng.sparchetype.common.BaseController; -import com.songpeng.sparchetype.common.Result; -import com.songpeng.sparchetype.system.entity.SysRole; -import com.songpeng.sparchetype.system.request.SysRolePageReq; -import com.songpeng.sparchetype.system.service.ISysRoleService; +import com.wangziyang.mes.common.BaseController; +import com.wangziyang.mes.common.Result; +import com.wangziyang.mes.system.entity.SysRole; +import com.wangziyang.mes.system.request.SysRolePageReq; +import com.wangziyang.mes.system.service.ISysRoleService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysToolController.java b/mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysToolController.java similarity index 93% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysToolController.java rename to mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysToolController.java index 70a0556..3385458 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysToolController.java +++ b/mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysToolController.java @@ -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.LoggerFactory; import org.springframework.stereotype.Controller; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysUserController.java b/mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysUserController.java similarity index 83% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysUserController.java rename to mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysUserController.java index 76365df..533b26d 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysUserController.java +++ b/mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysUserController.java @@ -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.metadata.IPage; -import com.songpeng.sparchetype.common.BaseController; -import com.songpeng.sparchetype.common.Result; -import com.songpeng.sparchetype.system.dto.SysRoleDTO; -import com.songpeng.sparchetype.system.dto.SysUserDTO; -import com.songpeng.sparchetype.system.entity.SysUser; -import com.songpeng.sparchetype.system.request.SysUserPageReq; -import com.songpeng.sparchetype.system.service.ISysRoleService; -import com.songpeng.sparchetype.system.service.ISysUserService; +import com.wangziyang.mes.common.BaseController; +import com.wangziyang.mes.common.Result; +import com.wangziyang.mes.system.dto.SysRoleDTO; +import com.wangziyang.mes.system.dto.SysUserDTO; +import com.wangziyang.mes.system.entity.SysUser; +import com.wangziyang.mes.system.request.SysUserPageReq; +import com.wangziyang.mes.system.service.ISysRoleService; +import com.wangziyang.mes.system.service.ISysUserService; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/client/SysLoginController.java b/mes/src/main/java/com/wangziyang/mes/system/controller/client/SysLoginController.java similarity index 94% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/client/SysLoginController.java rename to mes/src/main/java/com/wangziyang/mes/system/controller/client/SysLoginController.java index 2eef3d9..7db2f06 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/client/SysLoginController.java +++ b/mes/src/main/java/com/wangziyang/mes/system/controller/client/SysLoginController.java @@ -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.songpeng.sparchetype.common.util.RandomVerificationCodeUtil; -import com.songpeng.sparchetype.system.config.shiro.SpUsernamePasswordToken; +import com.wangziyang.mes.common.Result; +import com.wangziyang.mes.common.util.RandomVerificationCodeUtil; +import com.wangziyang.mes.system.config.shiro.SpUsernamePasswordToken; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authc.*; diff --git a/mes/src/main/java/com/wangziyang/mes/system/dto/SysDictDTO.java b/mes/src/main/java/com/wangziyang/mes/system/dto/SysDictDTO.java new file mode 100644 index 0000000..38d5fad --- /dev/null +++ b/mes/src/main/java/com/wangziyang/mes/system/dto/SysDictDTO.java @@ -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 { +} diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/dto/SysMenuDTO.java b/mes/src/main/java/com/wangziyang/mes/system/dto/SysMenuDTO.java similarity index 53% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/dto/SysMenuDTO.java rename to mes/src/main/java/com/wangziyang/mes/system/dto/SysMenuDTO.java index cd25aa1..a210434 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/dto/SysMenuDTO.java +++ b/mes/src/main/java/com/wangziyang/mes/system/dto/SysMenuDTO.java @@ -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; /** *
diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/dto/SysRoleDTO.java b/mes/src/main/java/com/wangziyang/mes/system/dto/SysRoleDTO.java similarity index 86% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/dto/SysRoleDTO.java rename to mes/src/main/java/com/wangziyang/mes/system/dto/SysRoleDTO.java index 6671e16..f1f895d 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/dto/SysRoleDTO.java +++ b/mes/src/main/java/com/wangziyang/mes/system/dto/SysRoleDTO.java @@ -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; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/dto/SysUserDTO.java b/mes/src/main/java/com/wangziyang/mes/system/dto/SysUserDTO.java similarity index 87% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/dto/SysUserDTO.java rename to mes/src/main/java/com/wangziyang/mes/system/dto/SysUserDTO.java index 7dfa91c..55a4056 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/dto/SysUserDTO.java +++ b/mes/src/main/java/com/wangziyang/mes/system/dto/SysUserDTO.java @@ -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; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysDepartment.java b/mes/src/main/java/com/wangziyang/mes/system/entity/SysDepartment.java similarity index 91% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysDepartment.java rename to mes/src/main/java/com/wangziyang/mes/system/entity/SysDepartment.java index 2de0a3b..bf64ed3 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysDepartment.java +++ b/mes/src/main/java/com/wangziyang/mes/system/entity/SysDepartment.java @@ -1,7 +1,7 @@ -package com.songpeng.sparchetype.system.entity; +package com.wangziyang.mes.system.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.songpeng.sparchetype.common.BaseEntity; +import com.wangziyang.mes.common.BaseEntity; /** *
diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysDict.java b/mes/src/main/java/com/wangziyang/mes/system/entity/SysDict.java similarity index 94% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysDict.java rename to mes/src/main/java/com/wangziyang/mes/system/entity/SysDict.java index cabb8a5..a76a423 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysDict.java +++ b/mes/src/main/java/com/wangziyang/mes/system/entity/SysDict.java @@ -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.TableName; -import com.songpeng.sparchetype.common.BaseEntity; +import com.wangziyang.mes.common.BaseEntity; /** *
diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysMenu.java b/mes/src/main/java/com/wangziyang/mes/system/entity/SysMenu.java similarity index 95% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysMenu.java rename to mes/src/main/java/com/wangziyang/mes/system/entity/SysMenu.java index 76b0805..12e6d47 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysMenu.java +++ b/mes/src/main/java/com/wangziyang/mes/system/entity/SysMenu.java @@ -1,7 +1,7 @@ -package com.songpeng.sparchetype.system.entity; +package com.wangziyang.mes.system.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.songpeng.sparchetype.common.BaseEntity; +import com.wangziyang.mes.common.BaseEntity; /** *
diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysRole.java b/mes/src/main/java/com/wangziyang/mes/system/entity/SysRole.java similarity index 91% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysRole.java rename to mes/src/main/java/com/wangziyang/mes/system/entity/SysRole.java index be8d516..e024136 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysRole.java +++ b/mes/src/main/java/com/wangziyang/mes/system/entity/SysRole.java @@ -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.TableName; -import com.songpeng.sparchetype.common.BaseEntity; +import com.wangziyang.mes.common.BaseEntity; /** *
diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysRoleMenu.java b/mes/src/main/java/com/wangziyang/mes/system/entity/SysRoleMenu.java similarity index 87% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysRoleMenu.java rename to mes/src/main/java/com/wangziyang/mes/system/entity/SysRoleMenu.java index 9300e1f..5cdbcb8 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysRoleMenu.java +++ b/mes/src/main/java/com/wangziyang/mes/system/entity/SysRoleMenu.java @@ -1,7 +1,7 @@ -package com.songpeng.sparchetype.system.entity; +package com.wangziyang.mes.system.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.songpeng.sparchetype.common.BaseEntity; +import com.wangziyang.mes.common.BaseEntity; /** *
diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysUser.java b/mes/src/main/java/com/wangziyang/mes/system/entity/SysUser.java similarity index 97% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysUser.java rename to mes/src/main/java/com/wangziyang/mes/system/entity/SysUser.java index 2906a96..24fab90 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysUser.java +++ b/mes/src/main/java/com/wangziyang/mes/system/entity/SysUser.java @@ -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.TableName; -import com.songpeng.sparchetype.common.BaseEntity; +import com.wangziyang.mes.common.BaseEntity; import java.time.LocalDateTime; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysUserRole.java b/mes/src/main/java/com/wangziyang/mes/system/entity/SysUserRole.java similarity index 87% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysUserRole.java rename to mes/src/main/java/com/wangziyang/mes/system/entity/SysUserRole.java index 31a41ec..9b08cfd 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysUserRole.java +++ b/mes/src/main/java/com/wangziyang/mes/system/entity/SysUserRole.java @@ -1,7 +1,7 @@ -package com.songpeng.sparchetype.system.entity; +package com.wangziyang.mes.system.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.songpeng.sparchetype.common.BaseEntity; +import com.wangziyang.mes.common.BaseEntity; /** *
diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/enums/SysMenuEnum.java b/mes/src/main/java/com/wangziyang/mes/system/enums/SysMenuEnum.java similarity index 92% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/enums/SysMenuEnum.java rename to mes/src/main/java/com/wangziyang/mes/system/enums/SysMenuEnum.java index 6b73da9..27b4bc9 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/enums/SysMenuEnum.java +++ b/mes/src/main/java/com/wangziyang/mes/system/enums/SysMenuEnum.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype.system.enums; +package com.wangziyang.mes.system.enums; /** * 系统用户枚举 diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/enums/SysRoleEnum.java b/mes/src/main/java/com/wangziyang/mes/system/enums/SysRoleEnum.java similarity index 91% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/enums/SysRoleEnum.java rename to mes/src/main/java/com/wangziyang/mes/system/enums/SysRoleEnum.java index fa03b62..334094f 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/enums/SysRoleEnum.java +++ b/mes/src/main/java/com/wangziyang/mes/system/enums/SysRoleEnum.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype.system.enums; +package com.wangziyang.mes.system.enums; /** * 系统用户枚举 diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/enums/SysUserEnum.java b/mes/src/main/java/com/wangziyang/mes/system/enums/SysUserEnum.java similarity index 91% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/enums/SysUserEnum.java rename to mes/src/main/java/com/wangziyang/mes/system/enums/SysUserEnum.java index b770f03..2c29cdb 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/enums/SysUserEnum.java +++ b/mes/src/main/java/com/wangziyang/mes/system/enums/SysUserEnum.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype.system.enums; +package com.wangziyang.mes.system.enums; /** * 系统用户枚举 diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysDepartmentMapper.java b/mes/src/main/java/com/wangziyang/mes/system/mapper/SysDepartmentMapper.java similarity index 66% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysDepartmentMapper.java rename to mes/src/main/java/com/wangziyang/mes/system/mapper/SysDepartmentMapper.java index 31df9dd..c99b93b 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysDepartmentMapper.java +++ b/mes/src/main/java/com/wangziyang/mes/system/mapper/SysDepartmentMapper.java @@ -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.songpeng.sparchetype.system.entity.SysDepartment; +import com.wangziyang.mes.system.entity.SysDepartment; /** *
diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysDictMapper.java b/mes/src/main/java/com/wangziyang/mes/system/mapper/SysDictMapper.java similarity index 68% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysDictMapper.java rename to mes/src/main/java/com/wangziyang/mes/system/mapper/SysDictMapper.java index 4556dbb..ab4e9b5 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysDictMapper.java +++ b/mes/src/main/java/com/wangziyang/mes/system/mapper/SysDictMapper.java @@ -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.songpeng.sparchetype.system.entity.SysDict; +import com.wangziyang.mes.system.entity.SysDict; /** *
diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysMenuMapper.java b/mes/src/main/java/com/wangziyang/mes/system/mapper/SysMenuMapper.java similarity index 71% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysMenuMapper.java rename to mes/src/main/java/com/wangziyang/mes/system/mapper/SysMenuMapper.java index a35ffb9..e900981 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysMenuMapper.java +++ b/mes/src/main/java/com/wangziyang/mes/system/mapper/SysMenuMapper.java @@ -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.songpeng.sparchetype.system.dto.SysMenuDTO; -import com.songpeng.sparchetype.system.entity.SysMenu; +import com.wangziyang.mes.system.dto.SysMenuDTO; +import com.wangziyang.mes.system.entity.SysMenu; import java.util.List; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysRoleMapper.java b/mes/src/main/java/com/wangziyang/mes/system/mapper/SysRoleMapper.java similarity index 79% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysRoleMapper.java rename to mes/src/main/java/com/wangziyang/mes/system/mapper/SysRoleMapper.java index f473376..d5f0356 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysRoleMapper.java +++ b/mes/src/main/java/com/wangziyang/mes/system/mapper/SysRoleMapper.java @@ -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.songpeng.sparchetype.system.entity.SysRole; +import com.wangziyang.mes.system.entity.SysRole; import java.util.List; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysRoleMenuMapper.java b/mes/src/main/java/com/wangziyang/mes/system/mapper/SysRoleMenuMapper.java similarity index 66% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysRoleMenuMapper.java rename to mes/src/main/java/com/wangziyang/mes/system/mapper/SysRoleMenuMapper.java index ec46c3f..77f6353 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysRoleMenuMapper.java +++ b/mes/src/main/java/com/wangziyang/mes/system/mapper/SysRoleMenuMapper.java @@ -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.songpeng.sparchetype.system.entity.SysRoleMenu; +import com.wangziyang.mes.system.entity.SysRoleMenu; /** *
diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysUserMapper.java b/mes/src/main/java/com/wangziyang/mes/system/mapper/SysUserMapper.java similarity index 64% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysUserMapper.java rename to mes/src/main/java/com/wangziyang/mes/system/mapper/SysUserMapper.java index 8d16115..62b64de 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysUserMapper.java +++ b/mes/src/main/java/com/wangziyang/mes/system/mapper/SysUserMapper.java @@ -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.songpeng.sparchetype.system.dto.SysUserDTO; -import com.songpeng.sparchetype.system.entity.SysUser; +import com.wangziyang.mes.system.dto.SysUserDTO; +import com.wangziyang.mes.system.entity.SysUser; /** *
diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysUserRoleMapper.java b/mes/src/main/java/com/wangziyang/mes/system/mapper/SysUserRoleMapper.java similarity index 66% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysUserRoleMapper.java rename to mes/src/main/java/com/wangziyang/mes/system/mapper/SysUserRoleMapper.java index 6d91334..463addf 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysUserRoleMapper.java +++ b/mes/src/main/java/com/wangziyang/mes/system/mapper/SysUserRoleMapper.java @@ -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.songpeng.sparchetype.system.entity.SysUserRole; +import com.wangziyang.mes.system.entity.SysUserRole; /** *
diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/request/SysDepartmentPageReq.java b/mes/src/main/java/com/wangziyang/mes/system/request/SysDepartmentPageReq.java similarity index 61% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/request/SysDepartmentPageReq.java rename to mes/src/main/java/com/wangziyang/mes/system/request/SysDepartmentPageReq.java index 7088560..fba25b8 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/request/SysDepartmentPageReq.java +++ b/mes/src/main/java/com/wangziyang/mes/system/request/SysDepartmentPageReq.java @@ -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; /** *
diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/request/SysDictPageReq.java b/mes/src/main/java/com/wangziyang/mes/system/request/SysDictPageReq.java similarity index 60% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/request/SysDictPageReq.java rename to mes/src/main/java/com/wangziyang/mes/system/request/SysDictPageReq.java index 73ce072..7c5749e 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/request/SysDictPageReq.java +++ b/mes/src/main/java/com/wangziyang/mes/system/request/SysDictPageReq.java @@ -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; /** *
diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/request/SysMenuPageReq.java b/mes/src/main/java/com/wangziyang/mes/system/request/SysMenuPageReq.java similarity index 60% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/request/SysMenuPageReq.java rename to mes/src/main/java/com/wangziyang/mes/system/request/SysMenuPageReq.java index ca3f9e9..0f5ae8f 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/request/SysMenuPageReq.java +++ b/mes/src/main/java/com/wangziyang/mes/system/request/SysMenuPageReq.java @@ -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; /** *
diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/request/SysRolePageReq.java b/mes/src/main/java/com/wangziyang/mes/system/request/SysRolePageReq.java similarity index 60% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/request/SysRolePageReq.java rename to mes/src/main/java/com/wangziyang/mes/system/request/SysRolePageReq.java index 99ab4c0..98752f0 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/request/SysRolePageReq.java +++ b/mes/src/main/java/com/wangziyang/mes/system/request/SysRolePageReq.java @@ -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; /** *
diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/request/SysUserPageReq.java b/mes/src/main/java/com/wangziyang/mes/system/request/SysUserPageReq.java similarity index 85% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/request/SysUserPageReq.java rename to mes/src/main/java/com/wangziyang/mes/system/request/SysUserPageReq.java index df13e92..06983e7 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/request/SysUserPageReq.java +++ b/mes/src/main/java/com/wangziyang/mes/system/request/SysUserPageReq.java @@ -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; /** *
diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysDepartmentService.java b/mes/src/main/java/com/wangziyang/mes/system/service/ISysDepartmentService.java similarity index 66% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysDepartmentService.java rename to mes/src/main/java/com/wangziyang/mes/system/service/ISysDepartmentService.java index 32a1708..c1307ea 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysDepartmentService.java +++ b/mes/src/main/java/com/wangziyang/mes/system/service/ISysDepartmentService.java @@ -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.songpeng.sparchetype.system.entity.SysDepartment; +import com.wangziyang.mes.system.entity.SysDepartment; /** *
diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysDictService.java b/mes/src/main/java/com/wangziyang/mes/system/service/ISysDictService.java similarity index 68% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysDictService.java rename to mes/src/main/java/com/wangziyang/mes/system/service/ISysDictService.java index 10b500f..350ac70 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysDictService.java +++ b/mes/src/main/java/com/wangziyang/mes/system/service/ISysDictService.java @@ -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.songpeng.sparchetype.system.entity.SysDict; +import com.wangziyang.mes.system.entity.SysDict; /** *
diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysMenuService.java b/mes/src/main/java/com/wangziyang/mes/system/service/ISysMenuService.java similarity index 79% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysMenuService.java rename to mes/src/main/java/com/wangziyang/mes/system/service/ISysMenuService.java index 2c65dfd..e327411 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysMenuService.java +++ b/mes/src/main/java/com/wangziyang/mes/system/service/ISysMenuService.java @@ -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.songpeng.sparchetype.system.dto.SysMenuDTO; -import com.songpeng.sparchetype.system.entity.SysMenu; -import com.songpeng.sparchetype.system.vo.TreeVO; +import com.wangziyang.mes.system.dto.SysMenuDTO; +import com.wangziyang.mes.system.entity.SysMenu; +import com.wangziyang.mes.system.vo.TreeVO; import java.util.List; import java.util.Map; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysRoleMenuService.java b/mes/src/main/java/com/wangziyang/mes/system/service/ISysRoleMenuService.java similarity index 66% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysRoleMenuService.java rename to mes/src/main/java/com/wangziyang/mes/system/service/ISysRoleMenuService.java index aa5bd98..6ec57cd 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysRoleMenuService.java +++ b/mes/src/main/java/com/wangziyang/mes/system/service/ISysRoleMenuService.java @@ -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.songpeng.sparchetype.system.entity.SysRoleMenu; +import com.wangziyang.mes.system.entity.SysRoleMenu; /** *
diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysRoleService.java b/mes/src/main/java/com/wangziyang/mes/system/service/ISysRoleService.java similarity index 75% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysRoleService.java rename to mes/src/main/java/com/wangziyang/mes/system/service/ISysRoleService.java index b2bfdab..d8ed6d5 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysRoleService.java +++ b/mes/src/main/java/com/wangziyang/mes/system/service/ISysRoleService.java @@ -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.songpeng.sparchetype.system.dto.SysRoleDTO; -import com.songpeng.sparchetype.system.dto.SysUserDTO; -import com.songpeng.sparchetype.system.entity.SysRole; +import com.wangziyang.mes.system.dto.SysRoleDTO; +import com.wangziyang.mes.system.dto.SysUserDTO; +import com.wangziyang.mes.system.entity.SysRole; import java.util.List; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysUserRoleService.java b/mes/src/main/java/com/wangziyang/mes/system/service/ISysUserRoleService.java similarity index 66% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysUserRoleService.java rename to mes/src/main/java/com/wangziyang/mes/system/service/ISysUserRoleService.java index 071d6c9..a09e398 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysUserRoleService.java +++ b/mes/src/main/java/com/wangziyang/mes/system/service/ISysUserRoleService.java @@ -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.songpeng.sparchetype.system.entity.SysUserRole; +import com.wangziyang.mes.system.entity.SysUserRole; /** *
diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysUserService.java b/mes/src/main/java/com/wangziyang/mes/system/service/ISysUserService.java similarity index 82% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysUserService.java rename to mes/src/main/java/com/wangziyang/mes/system/service/ISysUserService.java index 788fe2c..a92614f 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysUserService.java +++ b/mes/src/main/java/com/wangziyang/mes/system/service/ISysUserService.java @@ -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.songpeng.sparchetype.system.dto.SysUserDTO; -import com.songpeng.sparchetype.system.entity.SysUser; +import com.wangziyang.mes.system.dto.SysUserDTO; +import com.wangziyang.mes.system.entity.SysUser; /** *
diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysDepartmentServiceImpl.java b/mes/src/main/java/com/wangziyang/mes/system/service/impl/SysDepartmentServiceImpl.java
similarity index 57%
rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysDepartmentServiceImpl.java
rename to mes/src/main/java/com/wangziyang/mes/system/service/impl/SysDepartmentServiceImpl.java
index ec33587..57eb11f 100644
--- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysDepartmentServiceImpl.java
+++ b/mes/src/main/java/com/wangziyang/mes/system/service/impl/SysDepartmentServiceImpl.java
@@ -1,9 +1,9 @@
-package com.songpeng.sparchetype.system.service.impl;
+package com.wangziyang.mes.system.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.songpeng.sparchetype.system.entity.SysDepartment;
-import com.songpeng.sparchetype.system.mapper.SysDepartmentMapper;
-import com.songpeng.sparchetype.system.service.ISysDepartmentService;
+import com.wangziyang.mes.system.entity.SysDepartment;
+import com.wangziyang.mes.system.mapper.SysDepartmentMapper;
+import com.wangziyang.mes.system.service.ISysDepartmentService;
import org.springframework.stereotype.Service;
/**
diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysDictServiceImpl.java b/mes/src/main/java/com/wangziyang/mes/system/service/impl/SysDictServiceImpl.java
similarity index 66%
rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysDictServiceImpl.java
rename to mes/src/main/java/com/wangziyang/mes/system/service/impl/SysDictServiceImpl.java
index 3b17d13..85721e0 100644
--- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysDictServiceImpl.java
+++ b/mes/src/main/java/com/wangziyang/mes/system/service/impl/SysDictServiceImpl.java
@@ -1,9 +1,9 @@
-package com.songpeng.sparchetype.system.service.impl;
+package com.wangziyang.mes.system.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.songpeng.sparchetype.system.entity.SysDict;
-import com.songpeng.sparchetype.system.mapper.SysDictMapper;
-import com.songpeng.sparchetype.system.service.ISysDictService;
+import com.wangziyang.mes.system.entity.SysDict;
+import com.wangziyang.mes.system.mapper.SysDictMapper;
+import com.wangziyang.mes.system.service.ISysDictService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysMenuServiceImpl.java b/mes/src/main/java/com/wangziyang/mes/system/service/impl/SysMenuServiceImpl.java
similarity index 89%
rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysMenuServiceImpl.java
rename to mes/src/main/java/com/wangziyang/mes/system/service/impl/SysMenuServiceImpl.java
index fe41388..df152bc 100644
--- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysMenuServiceImpl.java
+++ b/mes/src/main/java/com/wangziyang/mes/system/service/impl/SysMenuServiceImpl.java
@@ -1,12 +1,12 @@
-package com.songpeng.sparchetype.system.service.impl;
+package com.wangziyang.mes.system.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.songpeng.sparchetype.common.util.TreeUtil;
-import com.songpeng.sparchetype.system.dto.SysMenuDTO;
-import com.songpeng.sparchetype.system.entity.SysMenu;
-import com.songpeng.sparchetype.system.mapper.SysMenuMapper;
-import com.songpeng.sparchetype.system.service.ISysMenuService;
-import com.songpeng.sparchetype.system.vo.TreeVO;
+import com.wangziyang.mes.common.util.TreeUtil;
+import com.wangziyang.mes.system.dto.SysMenuDTO;
+import com.wangziyang.mes.system.entity.SysMenu;
+import com.wangziyang.mes.system.mapper.SysMenuMapper;
+import com.wangziyang.mes.system.service.ISysMenuService;
+import com.wangziyang.mes.system.vo.TreeVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysRoleMenuServiceImpl.java b/mes/src/main/java/com/wangziyang/mes/system/service/impl/SysRoleMenuServiceImpl.java
similarity index 57%
rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysRoleMenuServiceImpl.java
rename to mes/src/main/java/com/wangziyang/mes/system/service/impl/SysRoleMenuServiceImpl.java
index aacbe1e..3b80cdc 100644
--- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysRoleMenuServiceImpl.java
+++ b/mes/src/main/java/com/wangziyang/mes/system/service/impl/SysRoleMenuServiceImpl.java
@@ -1,9 +1,9 @@
-package com.songpeng.sparchetype.system.service.impl;
+package com.wangziyang.mes.system.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.songpeng.sparchetype.system.entity.SysRoleMenu;
-import com.songpeng.sparchetype.system.mapper.SysRoleMenuMapper;
-import com.songpeng.sparchetype.system.service.ISysRoleMenuService;
+import com.wangziyang.mes.system.entity.SysRoleMenu;
+import com.wangziyang.mes.system.mapper.SysRoleMenuMapper;
+import com.wangziyang.mes.system.service.ISysRoleMenuService;
import org.springframework.stereotype.Service;
/**
diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysRoleServiceImpl.java b/mes/src/main/java/com/wangziyang/mes/system/service/impl/SysRoleServiceImpl.java
similarity index 82%
rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysRoleServiceImpl.java
rename to mes/src/main/java/com/wangziyang/mes/system/service/impl/SysRoleServiceImpl.java
index 84276b2..850cc3f 100644
--- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysRoleServiceImpl.java
+++ b/mes/src/main/java/com/wangziyang/mes/system/service/impl/SysRoleServiceImpl.java
@@ -1,16 +1,16 @@
-package com.songpeng.sparchetype.system.service.impl;
+package com.wangziyang.mes.system.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.songpeng.sparchetype.common.enums.CommonEnum;
-import com.songpeng.sparchetype.system.dto.SysRoleDTO;
-import com.songpeng.sparchetype.system.dto.SysUserDTO;
-import com.songpeng.sparchetype.system.entity.SysRole;
-import com.songpeng.sparchetype.system.entity.SysUserRole;
-import com.songpeng.sparchetype.system.enums.SysRoleEnum;
-import com.songpeng.sparchetype.system.mapper.SysRoleMapper;
-import com.songpeng.sparchetype.system.service.ISysRoleService;
-import com.songpeng.sparchetype.system.service.ISysUserRoleService;
+import com.wangziyang.mes.common.enums.CommonEnum;
+import com.wangziyang.mes.system.dto.SysRoleDTO;
+import com.wangziyang.mes.system.dto.SysUserDTO;
+import com.wangziyang.mes.system.entity.SysRole;
+import com.wangziyang.mes.system.entity.SysUserRole;
+import com.wangziyang.mes.system.enums.SysRoleEnum;
+import com.wangziyang.mes.system.mapper.SysRoleMapper;
+import com.wangziyang.mes.system.service.ISysRoleService;
+import com.wangziyang.mes.system.service.ISysUserRoleService;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysUserRoleServiceImpl.java b/mes/src/main/java/com/wangziyang/mes/system/service/impl/SysUserRoleServiceImpl.java
similarity index 57%
rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysUserRoleServiceImpl.java
rename to mes/src/main/java/com/wangziyang/mes/system/service/impl/SysUserRoleServiceImpl.java
index 81ce7a3..307b69a 100644
--- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysUserRoleServiceImpl.java
+++ b/mes/src/main/java/com/wangziyang/mes/system/service/impl/SysUserRoleServiceImpl.java
@@ -1,9 +1,9 @@
-package com.songpeng.sparchetype.system.service.impl;
+package com.wangziyang.mes.system.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.songpeng.sparchetype.system.entity.SysUserRole;
-import com.songpeng.sparchetype.system.mapper.SysUserRoleMapper;
-import com.songpeng.sparchetype.system.service.ISysUserRoleService;
+import com.wangziyang.mes.system.entity.SysUserRole;
+import com.wangziyang.mes.system.mapper.SysUserRoleMapper;
+import com.wangziyang.mes.system.service.ISysUserRoleService;
import org.springframework.stereotype.Service;
/**
diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysUserServiceImpl.java b/mes/src/main/java/com/wangziyang/mes/system/service/impl/SysUserServiceImpl.java
similarity index 78%
rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysUserServiceImpl.java
rename to mes/src/main/java/com/wangziyang/mes/system/service/impl/SysUserServiceImpl.java
index 9be7128..f292734 100644
--- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysUserServiceImpl.java
+++ b/mes/src/main/java/com/wangziyang/mes/system/service/impl/SysUserServiceImpl.java
@@ -1,14 +1,14 @@
-package com.songpeng.sparchetype.system.service.impl;
+package com.wangziyang.mes.system.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.songpeng.sparchetype.system.dto.SysMenuDTO;
-import com.songpeng.sparchetype.system.dto.SysRoleDTO;
-import com.songpeng.sparchetype.system.dto.SysUserDTO;
-import com.songpeng.sparchetype.system.entity.SysUser;
-import com.songpeng.sparchetype.system.mapper.SysUserMapper;
-import com.songpeng.sparchetype.system.service.ISysMenuService;
-import com.songpeng.sparchetype.system.service.ISysRoleService;
-import com.songpeng.sparchetype.system.service.ISysUserService;
+import com.wangziyang.mes.system.dto.SysMenuDTO;
+import com.wangziyang.mes.system.dto.SysRoleDTO;
+import com.wangziyang.mes.system.dto.SysUserDTO;
+import com.wangziyang.mes.system.entity.SysUser;
+import com.wangziyang.mes.system.mapper.SysUserMapper;
+import com.wangziyang.mes.system.service.ISysMenuService;
+import com.wangziyang.mes.system.service.ISysRoleService;
+import com.wangziyang.mes.system.service.ISysUserService;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/vo/TreeVO.java b/mes/src/main/java/com/wangziyang/mes/system/vo/TreeVO.java
similarity index 98%
rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/vo/TreeVO.java
rename to mes/src/main/java/com/wangziyang/mes/system/vo/TreeVO.java
index 86ede6d..aa062ae 100644
--- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/vo/TreeVO.java
+++ b/mes/src/main/java/com/wangziyang/mes/system/vo/TreeVO.java
@@ -1,4 +1,4 @@
-package com.songpeng.sparchetype.system.vo;
+package com.wangziyang.mes.system.vo;
import java.util.ArrayList;
import java.util.List;
diff --git a/sparchetype/src/main/resources/application-dev.yml b/mes/src/main/resources/application-dev.yml
similarity index 100%
rename from sparchetype/src/main/resources/application-dev.yml
rename to mes/src/main/resources/application-dev.yml
diff --git a/sparchetype/src/main/resources/application-pro.yml b/mes/src/main/resources/application-pro.yml
similarity index 100%
rename from sparchetype/src/main/resources/application-pro.yml
rename to mes/src/main/resources/application-pro.yml
diff --git a/sparchetype/src/main/resources/application.yml b/mes/src/main/resources/application.yml
similarity index 85%
rename from sparchetype/src/main/resources/application.yml
rename to mes/src/main/resources/application.yml
index 584e7ea..d1e5c5d 100644
--- a/sparchetype/src/main/resources/application.yml
+++ b/mes/src/main/resources/application.yml
@@ -9,7 +9,7 @@ spring:
config: classpath:config/ehcache.xml
swagger:
- controller: com.songpeng.sparchetype
+ controller: com.wangziyang.mes
description: MES接口管理
enable: true
license: wangziyang
diff --git a/sparchetype/src/main/resources/ehcache.xml b/mes/src/main/resources/ehcache.xml
similarity index 100%
rename from sparchetype/src/main/resources/ehcache.xml
rename to mes/src/main/resources/ehcache.xml
diff --git a/sparchetype/src/main/resources/logback.xml b/mes/src/main/resources/logback.xml
similarity index 100%
rename from sparchetype/src/main/resources/logback.xml
rename to mes/src/main/resources/logback.xml
diff --git a/sparchetype/src/main/resources/mapper/basedata/SpTableManagerItemMapper.xml b/mes/src/main/resources/mapper/basedata/SpTableManagerItemMapper.xml
similarity index 84%
rename from sparchetype/src/main/resources/mapper/basedata/SpTableManagerItemMapper.xml
rename to mes/src/main/resources/mapper/basedata/SpTableManagerItemMapper.xml
index 699c1f2..551f786 100644
--- a/sparchetype/src/main/resources/mapper/basedata/SpTableManagerItemMapper.xml
+++ b/mes/src/main/resources/mapper/basedata/SpTableManagerItemMapper.xml
@@ -1,7 +1,7 @@
-