diff --git a/README.md b/README.md index cb4632fd27561de756107d5fd5ca66a7a2946e0b..693a6c4df4a6442940dbde6a937d67095eb3da0b 100644 --- a/README.md +++ b/README.md @@ -5,25 +5,32 @@ 为大规模微服务构建而创建的代码生成工具,属于天画项目中的基础产品 天画项目链接：https://gitee.com/sky-painting coderMaker 立足于低代码平台，致力于解决软件开发过程中的效率问题 -1. 不依赖任何代码生成工具 -2. 基于mysql + mybatis + spring boot生成项目增删改查等功能 -3. 项目工具目前主要是为了构建可复用的代码生成服务，后续会继续沉淀其他代码生成服务 -4. 总体目标是为构建大规模springboot应用的技术底座，提高开发效率，专注业务领域，数据模型。 -5. 目前已演化为支持多框架应用+动态ddd的Java代码生成平台 +1. 不依赖任何代码生成工具 +2. 本身基于mysql + mybatis + spring boot生成项目增删改查等功能 +3. 项目工具目前主要是为了构建可复用的代码生成服务 +4. 总体目标是为构建大规模分布式应用的技术底座，提高开发效率，专注业务领域，数据模型。 +5. 为高并发,分布式,大数据等场景提供业务应用代码支持,辅助学习者方便快捷构建大量分布式微服务应用。 +6. 支持多框架应用+动态ddd+动态调用方法绘制的Java代码生成平台 #### 项目计划 1. 参考todoList文件内容 2. 参考changeList文件内容 +#### 设计理念 +1. 所建即所得，文档即代码 +2. 数据库模型与领域模型同步支持 +3. 不做任何脚手架,不依赖任何特定框架版本 +4. 按开发者习惯支持多模式生成 + #### 功能列表 -0. 所建即所得，文档即代码的代码生成服务理念 -1. 提供便捷且所建即所得的代码生成服务 -2. 提供便捷的sql脚本(支持分库分表)生成服务 -3. 提供一键式的数据库e-r图生成服务，以及从plantUML-er图中解析还原到sql脚本的能力 -4. 提供基于springboot,cola,dubbo应用框架和架构下的应用级代码生成服务 -5. 提供基于plantuml类图的dynamic-ddd模块级的代码生成服务 -6. 支持基于数据库表的代码生成和支持plantuml领域文档的代码生成服务 -7. 支持基于数据库表+DDD+plantUML类图文档+plantUML调用时序文档的代码生成服务 +1. 提供数据库字段文本转sql脚本的能力 +2. 提供便捷的sql脚本(支持分库分表)生成服务，帮助初始化数据库 +3. 提供一键式的数据库e-r图生成服务，以及从plantUML-er图中解析还原到sql脚本的能力 +4. 提供基于springboot,cola,dubbo应用框架和架构下的应用级代码生成服务 +5. 提供基于plantuml类图的dynamic-ddd模块级的代码生成服务 +6. 支持基于数据库表的代码生成和支持plantuml领域文档的代码生成服务 +7. 支持基于数据库表+DDD+plantUML类图文档+plantUML调用时序文档的代码生成服务 +8. 支持可适配可拔插的组件化模块化代码生成(待架构升级) #### 软件架构 1. 整个项目分为多个工程模块 @@ -135,6 +142,24 @@ codemaker-cola:基于cola应用框架生成的代码会放在这里 13. 优化访问描述符和代码注释 14. 读取plantuml文件对于方法的解析将方法参数独立解析出来 +##### 版本-1.2.1-beta +1.支持默认带工具类SpringEventPublisher帮助事件发布与消费异步化 +2.重构读取plantUML文件的相关逻辑降低复杂度 +3.重新梳理读取plantUML文件的相关路径,优化为按项目维度分别存放 +4.支持复杂场景下的代码绘制能力,进行精细化控制(如listbo,listvo的转换,代码参数动态绘制引用等) +5.支持分页PageVO,PageDTO,PageBO生成到接口方法里 +6.支持通过时序图的调用方法列表补充构建接口和类的方法，辅助完善业务调用流程(如xxMapper.getByCode不在XXMapper里，则通过时序图里的信息进行动态补充) +7.根据动态调用方法绘制内容将return body也进行动态化绘制 +8.增加适配模块解除对codemaker本身的定制化类的依赖(ResultDto,ResultDataDto,PageVO,PageDTO)，可辅助二次开发增加企业适配能力 +9.基于数据库生成模式下的底层增加分页page查询方法和count查询方法 +10.重构app层下的springboot,cola,dubbo写文件实现逻辑，降低复杂度 +11.重构service层下的模版方法模式和建造者模式代码逻辑，降低复杂度 +12.增加mapper接口和controller接口的参数校验注解(要引用的注解类可先写死，后续优化) +13.增加时序图调用方法参数动态推导功能(如xxxGataWay.getBySystemName没有在领域文档中定义，在时序图中有定义但是没有写明参数，这里可以做动态推导) +14.补充bo关联表时缺失的主键id +15.增加!字符屏蔽不需要解析的planUML文档内容,便于调试代码生成 + + #### 配置文件说明 1.application.properties:代码生成服务的核心配置 ``` diff --git a/changeList b/changeList index 169e108ee3198bc2e5d81e1375954d64f0eda48a..530239db19a06573fae73ac55e7189c09211888d 100644 --- a/changeList +++ b/changeList @@ -79,13 +79,19 @@ -10. verison 1.2.1-beta 变更(todo) +10. verison 1.2.1-beta 变更 1.支持默认带工具类SpringEventPublisher帮助事件发布与消费异步化 - 2.支持事件发布异步化的代码绘制(产生事件->发布->消费事件) - 3.重构读取plantUML文件的相关逻辑降低复杂度 - 4.重新梳理读取plantUML文件的相关路径,优化为按项目维度分别存放 - 5.支持复杂场景下的代码绘制能力,进行精细化控制(如listbo,listvo的转换,代码参数动态绘制引用等) - 6.支持Page对象生成到代码里 - 7.支持通过时序图的调用方法列表补充构建接口和类的方法，辅助完善业务调用流程(如xxMapper.getByCode不在XXMapper里，则通过时序图里的信息进行动态补充) - 8.根据动态调用方法绘制内容将return body也进行动态化绘制 - 9.增加对基础设施层-适配层的调用绘制 \ No newline at end of file + 2.重构读取plantUML文件的相关逻辑降低复杂度 + 3.重新梳理读取plantUML文件的相关路径,优化为按项目维度分别存放 + 4.支持复杂场景下的代码绘制能力,进行精细化控制(如listbo,listvo的转换,代码参数动态绘制引用等) + 5.支持分页PageVO,PageDTO,PageBO生成到接口方法里 + 6.支持通过时序图的调用方法列表补充构建接口和类的方法，辅助完善业务调用流程(如xxMapper.getByCode不在XXMapper里，则通过时序图里的信息进行动态补充) + 7.根据动态调用方法绘制内容将return body也进行动态化绘制 + 8.增加适配模块解除对codemaker本身的定制化类的依赖(ResultDto,ResultDataDto,PageVO,PageDTO)，可辅助二次开发增加企业适配能力 + 9.基于数据库生成模式下的底层增加分页page查询方法和count查询方法 + 10.重构app层下的springboot,cola,dubbo写文件实现逻辑，降低复杂度 + 11.重构service层下的模版方法模式和建造者模式代码逻辑，降低复杂度 + 12.增加mapper接口和controller接口的参数校验注解(要引用的注解类可先写死，后续优化) + 13.增加时序图调用方法参数动态推导功能(如xxxGataWay.getBySystemName没有在领域文档中定义，在时序图中有定义但是没有写明参数，这里可以做动态推导) + 14.补充bo关联表时缺失的主键id + 15.增加!字符屏蔽不需要解析的planUML文档内容,便于调试代码生成 diff --git a/codemaker-cola/cola-adapter/pom.xml b/codemaker-cola/cola-adapter/pom.xml index feb1efb629576d2bef423428b0847ad1e999a21b..8f28093bd59902639e3ea8edc64845396c9a55ef 100644 --- a/codemaker-cola/cola-adapter/pom.xml +++ b/codemaker-cola/cola-adapter/pom.xml @@ -41,7 +41,7 @@ com.coderman.utils coderman-utils - 1.0.2-SNAPSHOT + 1.0.4-SNAPSHOT diff --git a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/AuthorityOperationController.java b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/AuthorityOperationController.java new file mode 100644 index 0000000000000000000000000000000000000000..5d197f4168b9f19ba0050ff693ecc34e3769fef1 --- /dev/null +++ b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/AuthorityOperationController.java @@ -0,0 +1,36 @@ +package com.coderman.infosys.auth.adapter.controller; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.adapter.vo.AuthorityVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +/** +* @Description:控制层 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@RestController +public class AuthorityOperationController { + + protected Logger logger = LoggerFactory.getLogger(AuthorityOperationController.class); + + + + /** + * + * @Description 给角色授权 + * @param authorityVO + * @return ResultDataDto + */ + @RequestMapping(value = "/authority/savetorole") + public ResultDataDto saveAuthority(@RequestBody AuthorityVO authorityVO){ + + return null; + } +} diff --git a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/AuthorityQueryController.java b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/AuthorityQueryController.java new file mode 100644 index 0000000000000000000000000000000000000000..44d4fcdd98845e64369bab85fc8a4c1a36a1b085 --- /dev/null +++ b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/AuthorityQueryController.java @@ -0,0 +1,48 @@ +package com.coderman.infosys.auth.adapter.controller; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.adapter.vo.AuthorityVO; +import com.coderman.utils.response.PageVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +/** +* @Description:控制层 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@RestController +public class AuthorityQueryController { + + protected Logger logger = LoggerFactory.getLogger(AuthorityQueryController.class); + + + + /** + * + * @Description 分页获取权限信息 + * @return ResultDataDto> + */ + @RequestMapping(value = "/authority/pagelist") + public ResultDataDto> getPageList(){ + + return null; + } + + /** + * + * @Description 获取权限信息 + * @param authCode + * @return ResultDataDto + */ + @RequestMapping(value = "/authority/getbycode") + public ResultDataDto getByCode(@RequestParam(value = "authCode", required = true) String authCode){ + + return null; + } +} diff --git a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/DataAuthorityController.java b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/DataAuthorityController.java new file mode 100644 index 0000000000000000000000000000000000000000..87171940d2bf6c267e3acb0969d011f8311887d6 --- /dev/null +++ b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/DataAuthorityController.java @@ -0,0 +1,36 @@ +package com.coderman.infosys.auth.adapter.controller; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.adapter.vo.DataAuthorityResponseVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +/** +* @Description:控制层 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@RestController +public class DataAuthorityController { + + protected Logger logger = LoggerFactory.getLogger(DataAuthorityController.class); + + + + /** + * + * @Description 获取权限信息 + * @param authCode + * @return ResultDataDto + */ + @RequestMapping(value = "/dataauthority/getbycode") + public ResultDataDto getByCode(@RequestParam(value = "authCode", required = true) String authCode){ + + return null; + } +} diff --git a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/DataColumnController.java b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/DataColumnController.java new file mode 100644 index 0000000000000000000000000000000000000000..e0e9088619360a7f9863e92eb7ffb9bbfffa2741 --- /dev/null +++ b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/DataColumnController.java @@ -0,0 +1,63 @@ +package com.coderman.infosys.auth.adapter.controller; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.infosys.auth.adapter.vo.DataColumnVO; +import java.util.List; +import com.coderman.utils.response.ResultDataDto; +import com.coderman.utils.response.PageVO; +import com.coderman.infosys.auth.api.dto.UpdateMenuRequestDTO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +/** +* @Description:控制层 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@RestController +public class DataColumnController { + + protected Logger logger = LoggerFactory.getLogger(DataColumnController.class); + + + + /** + * + * @Description 获取数据字段信息 + * @param busDataBase + * @return ResultDataDto> + */ + @RequestMapping(value = "/datacolumn/getbycode") + public ResultDataDto> getListByBusDataBase(@RequestParam(value = "busDataBase", required = true) String busDataBase){ + + return null; + } + + /** + * + * @Description 分页获取数据字段信息 + * @param pageVO + * @return ResultDataDto> + */ + @RequestMapping(value = "/datacolumn/pagelist") + public ResultDataDto> getPageList(@RequestParam(value = "pageVO", required = true) PageVO pageVO){ + + return null; + } + + /** + * + * @Description 导入数据字段列表 + * @param updateMenuRequestDTO + * @return ResultDataDto + */ + @RequestMapping(value = "/datacolumn/import") + public ResultDataDto importDataColumnList(@RequestBody List updateMenuRequestDTO){ + + return null; + } +} diff --git a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/MenuController.java b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/MenuController.java new file mode 100644 index 0000000000000000000000000000000000000000..aa271904689a684bb29c0f533e190f61f710b440 --- /dev/null +++ b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/MenuController.java @@ -0,0 +1,84 @@ +package com.coderman.infosys.auth.adapter.controller; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.infosys.auth.adapter.vo.MenuVO; +import java.util.List; +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.adapter.vo.UpdateMenuRequestVO; +import com.coderman.infosys.auth.adapter.vo.CreateMenuRequestVO; +import com.coderman.infosys.auth.domain.bo.MenuBO; +import com.coderman.infosys.auth.domain.gataway.SystemModuleRepository; +import com.coderman.infosys.auth.model.convert.MenuConverter; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +/** +* @Description:控制层 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@RestController +public class MenuController { + + protected Logger logger = LoggerFactory.getLogger(MenuController.class); + + @Autowired + private SystemModuleRepository systemModuleRepository; + + + /** + * + * @Description 修改按钮信息 + * @param updateMenuRequestVO + * @return ResultDataDto + */ + @RequestMapping(value = "/menu/updatemenu") + public ResultDataDto updateMenu(@RequestBody UpdateMenuRequestVO updateMenuRequestVO){ + MenuBO menuBO = MenuConverter.INSTANCE.vo2bo(updateMenuRequestVO); + Integer intVar = systemModuleRepository.updateMenu(menuBO); + + return null; + } + + /** + * + * @Description 创建按钮信息 + * @param createMenuRequestVO + * @return ResultDataDto + */ + @RequestMapping(value = "/menu/createmenu") + public ResultDataDto createMenu(@RequestBody CreateMenuRequestVO createMenuRequestVO){ + MenuBO menuBO = MenuConverter.INSTANCE.vo2bo(createMenuRequestVO); + Long longVar = systemModuleRepository.saveMenu(menuBO); + + return null; + } + + /** + * + * @Description 获取按钮详情信息 + * @param menuCode + * @return ResultDataDto + */ + @RequestMapping(value = "/menu/getbycode") + public ResultDataDto getByCode(@RequestParam(value = "menuCode", required = true) String menuCode){ + + return null; + } + + /** + * + * @Description 获取按钮列表信息 + * @param moduleCode + * @return ResultDataDto> + */ + @RequestMapping(value = "/menu/pagelist") + public ResultDataDto> getPageList(@RequestParam(value = "moduleCode", required = true) String moduleCode ){ + + return null; + } +} diff --git a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/ModuleController.java b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/ModuleController.java new file mode 100644 index 0000000000000000000000000000000000000000..ee6c32a4a4fee84f4a47037269064712aa913af1 --- /dev/null +++ b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/ModuleController.java @@ -0,0 +1,127 @@ +package com.coderman.infosys.auth.adapter.controller; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.List; +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.adapter.vo.CreateModuleRequestVO; +import com.coderman.infosys.auth.adapter.vo.ModuleVO; +import com.coderman.utils.response.PageVO; +import com.coderman.infosys.auth.api.dto.CreateModuleRequestDTO; +import com.coderman.infosys.auth.adapter.vo.UpdateModuleRequestVO; +import com.coderman.infosys.auth.domain.bo.ModuleBO; +import com.coderman.infosys.auth.model.convert.ModuleConverter; +import com.coderman.infosys.auth.domain.gataway.SystemModuleQueryGataWay; +import com.coderman.infosys.auth.domain.gataway.SystemModuleRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +/** +* @Description:控制层 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@RestController +public class ModuleController { + + protected Logger logger = LoggerFactory.getLogger(ModuleController.class); + + @Autowired + private SystemModuleQueryGataWay systemModuleQueryGataWay; + @Autowired + private SystemModuleRepository systemModuleRepository; + + + /** + * + * @Description 创建菜单信息 + * @param createRequest + * @return ResultDataDto> + */ + @RequestMapping(value = "/module/createmodule") + public ResultDataDto> createModule(@RequestBody CreateModuleRequestVO createRequest){ + ModuleBO moduleBO = ModuleConverter.INSTANCE.vo2bo(createRequest); + ModuleBO moduleBO = systemModuleQueryGataWay.getModuleByCode(moduleBO.getModuleCode()); + Long longVar = systemModuleRepository.saveModule(moduleBO); + + return null; + } + + /** + * + * @Description 创建菜单信息 + * @param updateRequest + * @return ResultDataDto> + */ + @RequestMapping(value = "/module/updatemodule") + public ResultDataDto> updateModule(@RequestBody UpdateModuleRequestVO updateRequest){ + ModuleBO moduleBO = ModuleConverter.INSTANCE.vo2bo(updateRequest); + Integer intVar = systemModuleRepository.updateModule(moduleBO); + + return null; + } + + /** + * + * @Description 获取系统菜单列表信息 + * @param systemCode + * @return ResultDataDto> + */ + @RequestMapping(value = "/module/getbysystemcode") + public ResultDataDto> getBySystemCode(@RequestParam(value = "systemCode", required = true) String systemCode){ + + return null; + } + + /** + * + * @Description 获取菜单信息 + * @param moduleCode + * @return ResultDataDto + */ + @RequestMapping(value = "/module/getbycode") + public ResultDataDto getByModuleCode(@RequestParam(value = "moduleCode", required = true) String moduleCode){ + ModuleBO moduleBO = systemModuleQueryGataWay.getModuleByCode(moduleCode); + ModuleVO moduleVO = ModuleConverter.INSTANCE.bo2VO(moduleBO); + + return ResultDataDto.success(moduleVO); + } + + /** + * + * @Description 分页获取菜单信息 + * @return ResultDataDto> + */ + @RequestMapping(value = "/module/pagelist") + public ResultDataDto> getPageList(){ + + return null; + } + + /** + * + * @Description 导入菜单信息 + * @param createRequest + * @return ResultDataDto + */ + @RequestMapping(value = "/module/import") + public ResultDataDto importModuleList(@RequestBody List createRequest){ + + return null; + } + + /** + * + * @Description 导出菜单信息 + * @param systemCode + * @return ResultDataDto + */ + @RequestMapping(value = "/module/export") + public ResultDataDto exportModuleList(@RequestParam(value = "systemCode", required = true) String systemCode){ + + return null; + } +} diff --git a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/RoleController.java b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/RoleController.java new file mode 100644 index 0000000000000000000000000000000000000000..3f63aa6e00ae501b5dbd3607047e409880c00da9 --- /dev/null +++ b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/RoleController.java @@ -0,0 +1,73 @@ +package com.coderman.infosys.auth.adapter.controller; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.adapter.vo.CreateRoleRequestVO; +import com.coderman.infosys.auth.adapter.vo.RoleVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +/** +* @Description:控制层 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@RestController +public class RoleController { + + protected Logger logger = LoggerFactory.getLogger(RoleController.class); + + + + /** + * + * @Description 创建角色 + * @param createRoleRequestVO + * @return ResultDataDto + */ + @RequestMapping(value = "/role/createrule") + public ResultDataDto createRole(@RequestBody CreateRoleRequestVO createRoleRequestVO){ + + return null; + } + + /** + * + * @Description 根据编码获取角色详情 + * @param roleCode + * @return ResultDataDto + */ + @RequestMapping(value = "/role/getbyrolecode") + public ResultDataDto getByRoleCode(@RequestParam(value = "roleCode", required = true) String roleCode){ + + return null; + } + + /** + * + * @Description 禁用角色 + * @param roleCode + * @return ResultDataDto + */ + @RequestMapping(value = "/role/disable") + public ResultDataDto disable(String roleCode){ + + return null; + } + + /** + * + * @Description 启用角色 + * @param roleCode + * @return ResultDataDto + */ + @RequestMapping(value = "/role/enable") + public ResultDataDto enable(String roleCode){ + + return null; + } +} diff --git a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/RoleGroupController.java b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/RoleGroupController.java new file mode 100644 index 0000000000000000000000000000000000000000..d7db5cd38790b8435eed1508df7d99cd6fc5a3e6 --- /dev/null +++ b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/RoleGroupController.java @@ -0,0 +1,37 @@ +package com.coderman.infosys.auth.adapter.controller; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.infosys.auth.adapter.vo.RoleGroupVO; +import com.coderman.utils.response.ResultDataDto; +import com.coderman.utils.response.PageVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +/** +* @Description:控制层 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@RestController +public class RoleGroupController { + + protected Logger logger = LoggerFactory.getLogger(RoleGroupController.class); + + + + /** + * + * @Description 分页获取用户组信息 + * @param pageVO + * @return ResultDataDto> + */ + @RequestMapping(value = "/role/pagelist") + public ResultDataDto> getPageList(@RequestParam(value = "pageVO", required = true) PageVO pageVO){ + + return null; + } +} diff --git a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/RoleQueryController.java b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/RoleQueryController.java new file mode 100644 index 0000000000000000000000000000000000000000..bed8a27fcc61675d5a7d52453eb6c3f522a7ca63 --- /dev/null +++ b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/RoleQueryController.java @@ -0,0 +1,37 @@ +package com.coderman.infosys.auth.adapter.controller; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.utils.response.PageVO; +import com.coderman.infosys.auth.adapter.vo.RoleVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +/** +* @Description:控制层 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@RestController +public class RoleQueryController { + + protected Logger logger = LoggerFactory.getLogger(RoleQueryController.class); + + + + /** + * + * @Description 分页获取用户组信息 + * @param pageVO + * @return ResultDataDto> + */ + @RequestMapping(value = "/role/pagelist") + public ResultDataDto> getPageList(@RequestParam(value = "pageVO", required = true) PageVO pageVO){ + + return null; + } +} diff --git a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/SystemAuthorityController.java b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/SystemAuthorityController.java new file mode 100644 index 0000000000000000000000000000000000000000..57aa3f029d4d1797bb86f48eea25987bbe921445 --- /dev/null +++ b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/SystemAuthorityController.java @@ -0,0 +1,49 @@ +package com.coderman.infosys.auth.adapter.controller; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.adapter.vo.SystemAuthorityVO; +import com.coderman.infosys.auth.adapter.vo.AuthorityVO; +import com.coderman.utils.response.PageVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +/** +* @Description:控制层 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@RestController +public class SystemAuthorityController { + + protected Logger logger = LoggerFactory.getLogger(SystemAuthorityController.class); + + + + /** + * + * @Description 获取权限信息 + * @param authCode + * @return ResultDataDto + */ + @RequestMapping(value = "/systemauthority/getbycode") + public ResultDataDto getByCode(@RequestParam(value = "authCode", required = true) String authCode){ + + return null; + } + + /** + * + * @Description 分页获取权限信息 + * @return ResultDataDto> + */ + @RequestMapping(value = "/systemauthority/pagelist") + public ResultDataDto> getPageList(){ + + return null; + } +} diff --git a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/SystemController.java b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/SystemController.java new file mode 100644 index 0000000000000000000000000000000000000000..a43bd3c0648af42a6409d180fef6e5c2112a8ed9 --- /dev/null +++ b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/SystemController.java @@ -0,0 +1,107 @@ +package com.coderman.infosys.auth.adapter.controller; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.List; +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.adapter.vo.CreateSystemRequestVO; +import com.coderman.infosys.auth.adapter.vo.SystemVO; +import com.coderman.utils.response.PageVO; +import com.coderman.infosys.auth.adapter.vo.UpdateSystemRequestVO; +import com.coderman.infosys.auth.domain.bo.SystemBO; +import com.coderman.infosys.auth.domain.gataway.SystemModuleQueryGataWay; +import com.coderman.infosys.auth.model.convert.SystemConverter; +import com.coderman.infosys.auth.domain.gataway.SystemModuleRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +/** +* @Description:控制层 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@RestController +public class SystemController { + + protected Logger logger = LoggerFactory.getLogger(SystemController.class); + + @Autowired + private SystemModuleQueryGataWay systemModuleQueryGataWay; + @Autowired + private SystemModuleRepository systemModuleRepository; + + + /** + * + * @Description 分页获取系统信息 + * @param systemVO + * @return ResultDataDto> + */ + @RequestMapping(value = "/system/pagelist") + public ResultDataDto> getPageList(@RequestParam(value = "systemVO", required = true) SystemVO systemVO){ + List systemBOList = systemModuleQueryGataWay.querySystemPage(null); + List systemVOList = SystemConverter.INSTANCE.bolist2voList(systemBOList); + + return null; + } + + /** + * + * @Description 搜索获取系统信息 + * @param search + * @return ResultDataDto> + */ + @RequestMapping(value = "/system/search") + public ResultDataDto> getSearchList(@RequestParam(value = "search", required = true) String search){ + List systemBOList = systemModuleQueryGataWay.queryByCondition(search); + List systemVOList = SystemConverter.INSTANCE.bolist2voList(systemBOList); + + return ResultDataDto.success(systemVOList); + } + + /** + * + * @Description 新建系统信息 + * @param systemVO + * @return ResultDataDto + */ + @RequestMapping(value = "/system/save") + public ResultDataDto saveSystem(@RequestBody CreateSystemRequestVO systemVO){ + SystemBO systemBO = SystemConverter.INSTANCE.vo2bo(systemVO); + List systemBOList = systemModuleQueryGataWay.getSystemByName(systemBO.getSystemName()); + Long longVar = systemModuleRepository.saveSystem(systemBO); + + return null; + } + + /** + * + * @Description 修改系统信息 + * @param systemVO + * @return ResultDataDto + */ + @RequestMapping(value = "/system/update") + public ResultDataDto updateSystem(@RequestBody UpdateSystemRequestVO systemVO){ + SystemBO systemBO = SystemConverter.INSTANCE.vo2bo(systemVO); + Integer intVar = systemModuleRepository.updateSystem(systemBO); + + return null; + } + + /** + * + * @Description 通过系统编号获取系统信息 + * @param systemCode + * @return ResultDataDto + */ + @RequestMapping(value = "/system/getbycode") + public ResultDataDto getByCode(@RequestParam(value = "systemCode", required = true) String systemCode){ + SystemBO systemBO = systemModuleQueryGataWay.queryBySystemCode(systemCode); + SystemVO systemVO = SystemConverter.INSTANCE.bo2VO(systemBO); + + return ResultDataDto.success(systemVO); + } +} diff --git a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/UserGroupController.java b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/UserGroupController.java new file mode 100644 index 0000000000000000000000000000000000000000..60770cc94f9720c7d509d6ebbdf739328e34cc41 --- /dev/null +++ b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/UserGroupController.java @@ -0,0 +1,36 @@ +package com.coderman.infosys.auth.adapter.controller; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.adapter.vo.UserGroupVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +/** +* @Description:控制层 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@RestController +public class UserGroupController { + + protected Logger logger = LoggerFactory.getLogger(UserGroupController.class); + + + + /** + * + * @Description 创建用户组 + * @param userGroupVO + * @return ResultDataDto + */ + @RequestMapping(value = "/usergroup/creategroup") + public ResultDataDto createUserGroup(@RequestBody UserGroupVO userGroupVO){ + + return null; + } +} diff --git a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/UserGroupQueryController.java b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/UserGroupQueryController.java new file mode 100644 index 0000000000000000000000000000000000000000..97611322a1436a2be6eca322dae703feacb3aa4e --- /dev/null +++ b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/UserGroupQueryController.java @@ -0,0 +1,36 @@ +package com.coderman.infosys.auth.adapter.controller; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.utils.response.PageVO; +import com.coderman.infosys.auth.adapter.vo.UserGroupVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +/** +* @Description:控制层 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@RestController +public class UserGroupQueryController { + + protected Logger logger = LoggerFactory.getLogger(UserGroupQueryController.class); + + + + /** + * + * @Description 分页获取用户组信息 + * @return ResultDataDto> + */ + @RequestMapping(value = "/usergroup/pagelist") + public ResultDataDto> getPageList(){ + + return null; + } +} diff --git a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/AuthorityVO.java b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/AuthorityVO.java new file mode 100644 index 0000000000000000000000000000000000000000..d264f4953118b05c1cbd5c8faeadf3ff7e01706b --- /dev/null +++ b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/AuthorityVO.java @@ -0,0 +1,37 @@ +package com.coderman.infosys.auth.adapter.vo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:权限类 + * @Author: + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class AuthorityVO { + + /** 主键ID **/ + private Long id; + /** 权限编码标示 **/ + private String authCode; + /** 权限类型 **/ + private Integer authorityType; + /** 关联角色 **/ + private String roleCode; + /** 关联角色组 **/ + private String roleGroupCode; + /** 权限状态 **/ + private Integer status; + /** 数据字段权限列表 **/ + /** private List dataAuthorityBOList **/; + /** 系统菜单权限列表 **/ + /** private List systemAuthorityBOList **/; + /** 行政权限列表 **/ + /** private List adminAuthorityBOList **/; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/CreateMenuRequestVO.java b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/CreateMenuRequestVO.java new file mode 100644 index 0000000000000000000000000000000000000000..9a5f5cdfc5dfde0efa8a02b64690e7dbf614b654 --- /dev/null +++ b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/CreateMenuRequestVO.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.adapter.vo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:按钮管理类 + * @Author: + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class CreateMenuRequestVO { + + /** 主键ID **/ + private Long id; + /** 按钮名称 **/ + private String menuName; + /** 按钮编码 **/ + private String menuCode; + /** 按钮链接 **/ + private String menuUrl; + /** 系统编码 **/ + private String systemCode; + /** 菜单编码 **/ + private String moduleCode; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/CreateModuleRequestVO.java b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/CreateModuleRequestVO.java new file mode 100644 index 0000000000000000000000000000000000000000..95ed54944637e9a56c5a29df4c646bd7a5bf5080 --- /dev/null +++ b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/CreateModuleRequestVO.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.adapter.vo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:菜单/模块管理类 + * @Author: + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class CreateModuleRequestVO { + + /** 主键ID **/ + private Long id; + /** 菜单名称 **/ + private String moduleName; + /** 菜单编码 **/ + private String moduleCode; + /** 菜单链接 **/ + private String moduleUrl; + /** 系统标示 **/ + private String systemCode; + /** 按钮列表 **/ + /** private List menuBOList **/; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/CreateRoleRequestVO.java b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/CreateRoleRequestVO.java new file mode 100644 index 0000000000000000000000000000000000000000..8d9433065445f6448e188c989cab3305a81bb5ec --- /dev/null +++ b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/CreateRoleRequestVO.java @@ -0,0 +1,29 @@ +package com.coderman.infosys.auth.adapter.vo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:角色类 + * @Author: + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class CreateRoleRequestVO { + + /** 主键ID **/ + private Long id; + /** 角色名称 **/ + private String roleName; + /** 角色编码 **/ + private String roleCode; + /** 角色状态 **/ + private Integer status; + /** 角色对应用户列表 **/ + /** private List userList **/; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/CreateSystemRequestVO.java b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/CreateSystemRequestVO.java new file mode 100644 index 0000000000000000000000000000000000000000..baef5b8a427ed43e386c9fe8f7341a2064374b63 --- /dev/null +++ b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/CreateSystemRequestVO.java @@ -0,0 +1,37 @@ +package com.coderman.infosys.auth.adapter.vo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:系统管理类 + * @Author: + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class CreateSystemRequestVO { + + /** 主键ID **/ + private Long id; + /** 系统名称 **/ + private String systemName; + /** 系统标示 **/ + private String systemCode; + /** 系统域名 **/ + private String systemUrl; + /** 系统图标 **/ + private String systemPicUrl; + /** 系统技术负责人 **/ + private Long tecAdminUserId; + /** 系统业务负责人 **/ + private Long busAdminUserId; + /** 系统当前所在部门 **/ + private Long departmentId; + /** 系统模块列表 **/ + /** private List moduleBOList **/; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/DataAuthorityResponseVO.java b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/DataAuthorityResponseVO.java new file mode 100644 index 0000000000000000000000000000000000000000..2d005c423fbfd043035f2effbfa3248845197056 --- /dev/null +++ b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/DataAuthorityResponseVO.java @@ -0,0 +1,25 @@ +package com.coderman.infosys.auth.adapter.vo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:数据字段权限类 + * @Author: + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class DataAuthorityResponseVO { + + /** 主键ID **/ + private Long id; + /** 权限编码标示 **/ + private String authCode; + /** 数据字段ID **/ + private Long dataColumnId; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/DataColumnResponseVO.java b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/DataColumnResponseVO.java new file mode 100644 index 0000000000000000000000000000000000000000..948feab9e7116e9003f70cdc2f96ed7ec3bc3885 --- /dev/null +++ b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/DataColumnResponseVO.java @@ -0,0 +1,35 @@ +package com.coderman.infosys.auth.adapter.vo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:数据字段实体类 + * @Author: + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class DataColumnResponseVO { + + /** 主键ID **/ + private Long id; + /** 主键ID **/ + private Long id; + /** 数据库业务系统名称 **/ + private String busDataBase; + /** 数据库表名称 **/ + private String tableName; + /** 数据库表描述 **/ + private String tableDesc; + /** 数据库字段名称 **/ + private String columnName; + /** 数据库字段描述 **/ + private String columnDesc; + /** 业务字段名称 **/ + private String fieldName; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/DataColumnVO.java b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/DataColumnVO.java new file mode 100644 index 0000000000000000000000000000000000000000..cbb92ce4edac2076104747b64eb82d714db0dbbe --- /dev/null +++ b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/DataColumnVO.java @@ -0,0 +1,35 @@ +package com.coderman.infosys.auth.adapter.vo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:数据字段实体类 + * @Author: + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class DataColumnVO { + + /** 主键ID **/ + private Long id; + /** 主键ID **/ + private Long id; + /** 数据库业务系统名称 **/ + private String busDataBase; + /** 数据库表名称 **/ + private String tableName; + /** 数据库表描述 **/ + private String tableDesc; + /** 数据库字段名称 **/ + private String columnName; + /** 数据库字段描述 **/ + private String columnDesc; + /** 业务字段名称 **/ + private String fieldName; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/MenuVO.java b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/MenuVO.java new file mode 100644 index 0000000000000000000000000000000000000000..b0817e06dfa0981709841a13c82dcf9a22d721f0 --- /dev/null +++ b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/MenuVO.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.adapter.vo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:按钮管理类 + * @Author: + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class MenuVO { + + /** 主键ID **/ + private Long id; + /** 按钮名称 **/ + private String menuName; + /** 按钮编码 **/ + private String menuCode; + /** 按钮链接 **/ + private String menuUrl; + /** 系统编码 **/ + private String systemCode; + /** 菜单编码 **/ + private String moduleCode; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/ModuleVO.java b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/ModuleVO.java new file mode 100644 index 0000000000000000000000000000000000000000..2a369d72f38f72ac901a8e41be4b610b852b630d --- /dev/null +++ b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/ModuleVO.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.adapter.vo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:菜单/模块管理类 + * @Author: + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class ModuleVO { + + /** 主键ID **/ + private Long id; + /** 菜单名称 **/ + private String moduleName; + /** 菜单编码 **/ + private String moduleCode; + /** 菜单链接 **/ + private String moduleUrl; + /** 系统标示 **/ + private String systemCode; + /** 按钮列表 **/ + /** private List menuBOList **/; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/RoleGroupVO.java b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/RoleGroupVO.java new file mode 100644 index 0000000000000000000000000000000000000000..67219793d4346fc321a38542bc0bd61c36b31594 --- /dev/null +++ b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/RoleGroupVO.java @@ -0,0 +1,29 @@ +package com.coderman.infosys.auth.adapter.vo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:角色组类 + * @Author: + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class RoleGroupVO { + + /** 主键ID **/ + private Long id; + /** 角色组名称 **/ + private String roleName; + /** 角色组编码 **/ + private String roleCode; + /** 角色状态 **/ + private Integer status; + /** 组内角色列表 **/ + /** private List roleList **/; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/RoleVO.java b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/RoleVO.java new file mode 100644 index 0000000000000000000000000000000000000000..87ee2c772b1505e6adb2c652d8570af509eb2f9e --- /dev/null +++ b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/RoleVO.java @@ -0,0 +1,29 @@ +package com.coderman.infosys.auth.adapter.vo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:角色类 + * @Author: + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class RoleVO { + + /** 主键ID **/ + private Long id; + /** 角色名称 **/ + private String roleName; + /** 角色编码 **/ + private String roleCode; + /** 角色状态 **/ + private Integer status; + /** 角色对应用户列表 **/ + /** private List userList **/; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/SystemAuthorityVO.java b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/SystemAuthorityVO.java new file mode 100644 index 0000000000000000000000000000000000000000..63b5cc75eee38e11408f62b60978542f4905342f --- /dev/null +++ b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/SystemAuthorityVO.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.adapter.vo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:系统菜单权限类 + * @Author: + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class SystemAuthorityVO { + + /** 主键ID **/ + private Long id; + /** 权限编码标示 **/ + private String authCode; + /** 业务数据系统标示 **/ + private String systemName; + /** 功能 **/ + private String funcName; + /** 菜单 **/ + private String categoryName; + /** 按钮 **/ + private String menuName; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/SystemVO.java b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/SystemVO.java new file mode 100644 index 0000000000000000000000000000000000000000..795dc5408f4ca87fd9470c729f20288e39fac71e --- /dev/null +++ b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/SystemVO.java @@ -0,0 +1,37 @@ +package com.coderman.infosys.auth.adapter.vo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:系统管理类 + * @Author: + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class SystemVO { + + /** 主键ID **/ + private Long id; + /** 系统名称 **/ + private String systemName; + /** 系统标示 **/ + private String systemCode; + /** 系统域名 **/ + private String systemUrl; + /** 系统图标 **/ + private String systemPicUrl; + /** 系统技术负责人 **/ + private Long tecAdminUserId; + /** 系统业务负责人 **/ + private Long busAdminUserId; + /** 系统当前所在部门 **/ + private Long departmentId; + /** 系统模块列表 **/ + /** private List moduleBOList **/; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/UpdateMenuRequestVO.java b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/UpdateMenuRequestVO.java new file mode 100644 index 0000000000000000000000000000000000000000..521a829a28b8e3612d4d06aeeeed0a2bebab73df --- /dev/null +++ b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/UpdateMenuRequestVO.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.adapter.vo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:按钮管理类 + * @Author: + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class UpdateMenuRequestVO { + + /** 主键ID **/ + private Long id; + /** 按钮名称 **/ + private String menuName; + /** 按钮编码 **/ + private String menuCode; + /** 按钮链接 **/ + private String menuUrl; + /** 系统编码 **/ + private String systemCode; + /** 菜单编码 **/ + private String moduleCode; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/UpdateModuleRequestVO.java b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/UpdateModuleRequestVO.java new file mode 100644 index 0000000000000000000000000000000000000000..20e5f656c038b0d44c12b3f614033a77fd20956a --- /dev/null +++ b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/UpdateModuleRequestVO.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.adapter.vo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:菜单/模块管理类 + * @Author: + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class UpdateModuleRequestVO { + + /** 主键ID **/ + private Long id; + /** 菜单名称 **/ + private String moduleName; + /** 菜单编码 **/ + private String moduleCode; + /** 菜单链接 **/ + private String moduleUrl; + /** 系统标示 **/ + private String systemCode; + /** 按钮列表 **/ + /** private List menuBOList **/; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/UpdateSystemRequestVO.java b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/UpdateSystemRequestVO.java new file mode 100644 index 0000000000000000000000000000000000000000..c0d0b697dbd53a28f44136ed7052af46cab2a91b --- /dev/null +++ b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/UpdateSystemRequestVO.java @@ -0,0 +1,37 @@ +package com.coderman.infosys.auth.adapter.vo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:系统管理类 + * @Author: + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class UpdateSystemRequestVO { + + /** 主键ID **/ + private Long id; + /** 系统名称 **/ + private String systemName; + /** 系统标示 **/ + private String systemCode; + /** 系统域名 **/ + private String systemUrl; + /** 系统图标 **/ + private String systemPicUrl; + /** 系统技术负责人 **/ + private Long tecAdminUserId; + /** 系统业务负责人 **/ + private Long busAdminUserId; + /** 系统当前所在部门 **/ + private Long departmentId; + /** 系统模块列表 **/ + /** private List moduleBOList **/; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/UserGroupVO.java b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/UserGroupVO.java new file mode 100644 index 0000000000000000000000000000000000000000..09d72c23679d484ba464edc509bd3fb7647abb75 --- /dev/null +++ b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/UserGroupVO.java @@ -0,0 +1,33 @@ +package com.coderman.infosys.auth.adapter.vo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:用户组类 + * @Author: + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class UserGroupVO { + + /** 主键ID **/ + private Long id; + /** 组名 **/ + private String groupName; + /** 组编码 **/ + private String groupCode; + /** 用户组状态 **/ + private Integer status; + /** 组内用户列表 **/ + /** private List userList **/; + /** 用户组对应的角色列表 **/ + /** private List roleList **/; + /** 用户组对应角色组列表 **/ + /** private List roleGroupList **/; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/controller/BaseController.java b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/controller/BaseController.java new file mode 100644 index 0000000000000000000000000000000000000000..fce563e46b00cfd383ce9070e16a3ba17efcf898 --- /dev/null +++ b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/controller/BaseController.java @@ -0,0 +1,45 @@ +package com.coderman.infosys.auth.controller; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** +* @Description:控制层基础父类 +* @Author:shenshuai +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +public class BaseController{ + + protected Logger logger = LoggerFactory.getLogger(this.getClass()); + + /** + * 从request中获取指定的字符串 + * @param parameterName + * @return + */ + protected String getParameterString(String parameterName) { + //return RequestUtil.getParameterString(parameterName); + return ""; + } + + /** + * 从request中获取指定的整型 + * @param parameterName + * @return + */ + protected Integer getParameterInteger(String parameterName) { + // return RequestUtil.getParameterInteger(parameterName); + return 0; + } + + /** + * 从request中获取指定的长整型 + * @param parameterName + * @return + */ + protected Long getParameterLong(String parameterName) { + //return RequestUtil.getParameterLong(parameterName); + return 0L; + } +} diff --git a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/model/convert/AuthorityConverter.java b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/model/convert/AuthorityConverter.java new file mode 100644 index 0000000000000000000000000000000000000000..ac5f28971ce87b848e6f0db0f25d22ae8ba6ff4d --- /dev/null +++ b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/model/convert/AuthorityConverter.java @@ -0,0 +1,46 @@ +package com.coderman.infosys.auth.model.convert; + +import java.util.List; +import com.coderman.infosys.auth.domain.bo.AuthorityBO; +import com.coderman.infosys.auth.adapter.vo.AuthorityVO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:AuthorityConvertervobo接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Mapper +public interface AuthorityConverter{ + AuthorityConverter INSTANCE = Mappers.getMapper(AuthorityConverter.class); + + /** + * + * @Description: + * @return List + */ + List volist2boList(List vOList); + /** + * + * @Description: + * @return AuthorityBO + */ + AuthorityBO vo2bo(AuthorityVO authorityVO); + /** + * + * @Description: + * @return List + */ + List BOs2VOs(List authorityBOList); + /** + * + * @Description: + * @return AuthorityVO + */ + AuthorityVO bo2VO(AuthorityBO authorityBO); +} \ No newline at end of file diff --git a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/model/convert/DataAuthorityConverter.java b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/model/convert/DataAuthorityConverter.java new file mode 100644 index 0000000000000000000000000000000000000000..c58b7e9b99e08e79b8d9861d7b69ed86cced8755 --- /dev/null +++ b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/model/convert/DataAuthorityConverter.java @@ -0,0 +1,29 @@ +package com.coderman.infosys.auth.model.convert; + +import java.util.List; +import com.coderman.infosys.auth.domain.bo.AuthorityBO; +import com.coderman.infosys.auth.domain.bo.DataAuthorityBO; +import com.coderman.infosys.auth.adapter.vo.DataAuthorityResponseVO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:DataAuthorityConvertervobo接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Mapper +public interface DataAuthorityConverter{ + DataAuthorityConverter INSTANCE = Mappers.getMapper(DataAuthorityConverter.class); + + /** + * + * @Description: + * @return List + */ + List BOs2VOs(List dataAuthorityBOList); +} \ No newline at end of file diff --git a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/model/convert/DataColumnConverter.java b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/model/convert/DataColumnConverter.java new file mode 100644 index 0000000000000000000000000000000000000000..90265b9ba2608a123d7cef1cf6c3f8d203d71ccb --- /dev/null +++ b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/model/convert/DataColumnConverter.java @@ -0,0 +1,53 @@ +package com.coderman.infosys.auth.model.convert; + +import com.coderman.infosys.auth.adapter.vo.DataColumnVO; +import java.util.List; +import com.coderman.infosys.auth.adapter.vo.DataColumnResponseVO; +import com.coderman.infosys.auth.domain.bo.DataColumnBO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:DataColumnConvertervobo接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Mapper +public interface DataColumnConverter{ + DataColumnConverter INSTANCE = Mappers.getMapper(DataColumnConverter.class); + + /** + * + * @Description: + * @return DataColumnVO + */ + DataColumnVO bo2VO(DataColumnBO dataColumnBO); + /** + * + * @Description: + * @return List + */ + List BOs2VOs(List dataColumnBOList); + /** + * + * @Description: + * @return DataColumnBO + */ + DataColumnBO vo2bo(DataColumnVO dataColumnVO); + /** + * + * @Description: + * @return List + */ + List volist2boList(List vOList); + /** + * + * @Description: + * @return List + */ + List boList2voList(List dataColumnBOList); +} \ No newline at end of file diff --git a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/model/convert/MenuConverter.java b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/model/convert/MenuConverter.java new file mode 100644 index 0000000000000000000000000000000000000000..a2ac07b41515e2096da2b5aabf5ddafdda818800 --- /dev/null +++ b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/model/convert/MenuConverter.java @@ -0,0 +1,72 @@ +package com.coderman.infosys.auth.model.convert; + +import com.coderman.infosys.auth.adapter.vo.MenuVO; +import com.coderman.infosys.auth.domain.bo.MenuBO; +import java.util.List; +import com.coderman.infosys.auth.adapter.vo.UpdateMenuRequestVO; +import com.coderman.infosys.auth.adapter.vo.CreateMenuRequestVO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:MenuConvertervobo接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Mapper +public interface MenuConverter{ + MenuConverter INSTANCE = Mappers.getMapper(MenuConverter.class); + + /** + * + * @Description: + * @return MenuBO + */ + MenuBO vo2bo(UpdateMenuRequestVO updateMenuRequestVO); + /** + * + * @Description: + * @return List + */ + List voList2BoList(List vOList); + /** + * + * @Description: + * @return List + */ + List VOs2BOs(List updateMenuRequestVOList); + /** + * + * @Description: + * @return MenuVO + */ + MenuVO bo2VO(MenuBO menuBO); + /** + * + * @Description: + * @return List + */ + List BOs2VOs(List menuBOList); + /** + * + * @Description: + * @return MenuBO + */ + MenuBO vo2bo(CreateMenuRequestVO createMenuRequestVO); + /** + * + * @Description: + * @return MenuBO + */ + MenuBO vo2bo(MenuVO menuVO); + /** + * + * @Description: + * @return List + */ + List voList2boList(List createMenuRequestVOList); +} \ No newline at end of file diff --git a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/model/convert/ModuleConverter.java b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/model/convert/ModuleConverter.java new file mode 100644 index 0000000000000000000000000000000000000000..b88f6f0d9d0d133033da7b4a014e0f8de8b19c17 --- /dev/null +++ b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/model/convert/ModuleConverter.java @@ -0,0 +1,72 @@ +package com.coderman.infosys.auth.model.convert; + +import java.util.List; +import com.coderman.infosys.auth.adapter.vo.CreateModuleRequestVO; +import com.coderman.infosys.auth.adapter.vo.ModuleVO; +import com.coderman.infosys.auth.domain.bo.ModuleBO; +import com.coderman.infosys.auth.adapter.vo.UpdateModuleRequestVO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:ModuleConvertervobo接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Mapper +public interface ModuleConverter{ + ModuleConverter INSTANCE = Mappers.getMapper(ModuleConverter.class); + + /** + * + * @Description: + * @return ModuleBO + */ + ModuleBO vo2bo(ModuleVO moduleVO); + /** + * + * @Description: + * @return ModuleVO + */ + ModuleVO bo2VO(ModuleBO moduleBO); + /** + * + * @Description: + * @return List + */ + List BOs2VOs(List moduleBOList); + /** + * + * @Description: + * @return ModuleBO + */ + ModuleBO vo2bo(UpdateModuleRequestVO updateModuleRequestVO); + /** + * + * @Description: + * @return ModuleBO + */ + ModuleBO vo2bo(CreateModuleRequestVO createModuleRequestVO); + /** + * + * @Description: + * @return List + */ + List volist2boList(List vOList); + /** + * + * @Description: + * @return List + */ + List volist2boList(List createModuleRequestVOList); + /** + * + * @Description: + * @return List + */ + List voList2boList(List updateModuleRequestVOList); +} \ No newline at end of file diff --git a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/model/convert/RoleConverter.java b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/model/convert/RoleConverter.java new file mode 100644 index 0000000000000000000000000000000000000000..d7349817efef2417558f6bf699a00daea042957e --- /dev/null +++ b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/model/convert/RoleConverter.java @@ -0,0 +1,59 @@ +package com.coderman.infosys.auth.model.convert; + +import java.util.List; +import com.coderman.infosys.auth.domain.bo.RoleBO; +import com.coderman.infosys.auth.adapter.vo.CreateRoleRequestVO; +import com.coderman.infosys.auth.adapter.vo.RoleVO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:RoleConvertervobo接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Mapper +public interface RoleConverter{ + RoleConverter INSTANCE = Mappers.getMapper(RoleConverter.class); + + /** + * + * @Description: + * @return RoleVO + */ + RoleVO bo2VO(RoleBO roleBO); + /** + * + * @Description: + * @return RoleBO + */ + RoleBO vo2bo(CreateRoleRequestVO createRoleRequestVO); + /** + * + * @Description: + * @return List + */ + List BOs2VOs(List roleBOList); + /** + * + * @Description: + * @return List + */ + List voList2BoList(List vOList); + /** + * + * @Description: + * @return RoleBO + */ + RoleBO vo2bo(RoleVO roleVO); + /** + * + * @Description: + * @return List + */ + List voList2BoList(List createRoleRequestVOList); +} \ No newline at end of file diff --git a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/model/convert/RoleGroupConverter.java b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/model/convert/RoleGroupConverter.java new file mode 100644 index 0000000000000000000000000000000000000000..9afabb297b62130d6beaa32eaf90eaf57d756659 --- /dev/null +++ b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/model/convert/RoleGroupConverter.java @@ -0,0 +1,46 @@ +package com.coderman.infosys.auth.model.convert; + +import com.coderman.infosys.auth.adapter.vo.RoleGroupVO; +import java.util.List; +import com.coderman.infosys.auth.domain.bo.RoleGroupBO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:RoleGroupConvertervobo接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Mapper +public interface RoleGroupConverter{ + RoleGroupConverter INSTANCE = Mappers.getMapper(RoleGroupConverter.class); + + /** + * + * @Description: + * @return RoleGroupBO + */ + RoleGroupBO vo2bo(RoleGroupVO roleGroupVO); + /** + * + * @Description: + * @return RoleGroupVO + */ + RoleGroupVO bo2VO(RoleGroupBO roleGroupBO); + /** + * + * @Description: + * @return List + */ + List VOs2BOs(List vOList); + /** + * + * @Description: + * @return List + */ + List BOs2VOs(List roleGroupBOList); +} \ No newline at end of file diff --git a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/model/convert/SystemAuthorityConverter.java b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/model/convert/SystemAuthorityConverter.java new file mode 100644 index 0000000000000000000000000000000000000000..54f6e1943cfba17f5da647d74f027f08f53dc8ee --- /dev/null +++ b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/model/convert/SystemAuthorityConverter.java @@ -0,0 +1,47 @@ +package com.coderman.infosys.auth.model.convert; + +import com.coderman.infosys.auth.domain.bo.SystemAuthorityBO; +import com.coderman.infosys.auth.domain.bo.AuthorityBO; +import java.util.List; +import com.coderman.infosys.auth.adapter.vo.SystemAuthorityVO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:SystemAuthorityConvertervobo接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Mapper +public interface SystemAuthorityConverter{ + SystemAuthorityConverter INSTANCE = Mappers.getMapper(SystemAuthorityConverter.class); + + /** + * + * @Description: + * @return SystemAuthorityBO + */ + SystemAuthorityBO vo2bo(SystemAuthorityVO systemAuthorityVO); + /** + * + * @Description: + * @return SystemAuthorityVO + */ + SystemAuthorityVO bo2VO(SystemAuthorityBO systemAuthorityBO); + /** + * + * @Description: + * @return List + */ + List BOs2VOs(List systemAuthorityBOList); + /** + * + * @Description: + * @return List + */ + List vos2bos(List vOList); +} \ No newline at end of file diff --git a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/model/convert/SystemConverter.java b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/model/convert/SystemConverter.java new file mode 100644 index 0000000000000000000000000000000000000000..9ceb4f8166784d22d3249fc21e8cf926de6c451d --- /dev/null +++ b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/model/convert/SystemConverter.java @@ -0,0 +1,72 @@ +package com.coderman.infosys.auth.model.convert; + +import java.util.List; +import com.coderman.infosys.auth.adapter.vo.CreateSystemRequestVO; +import com.coderman.infosys.auth.adapter.vo.SystemVO; +import com.coderman.infosys.auth.domain.bo.SystemBO; +import com.coderman.infosys.auth.adapter.vo.UpdateSystemRequestVO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:SystemConvertervobo接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Mapper +public interface SystemConverter{ + SystemConverter INSTANCE = Mappers.getMapper(SystemConverter.class); + + /** + * + * @Description: + * @return List + */ + List voList2BoList(List updateSystemRequestVOList); + /** + * + * @Description: + * @return SystemBO + */ + SystemBO vo2bo(CreateSystemRequestVO createSystemRequestVO); + /** + * + * @Description: + * @return SystemVO + */ + SystemVO bo2VO(SystemBO systemBO); + /** + * + * @Description: + * @return List + */ + List bolist2voList(List systemBOList); + /** + * + * @Description: + * @return List + */ + List voList2boList(List vOList); + /** + * + * @Description: + * @return List + */ + List volist2boList(List createSystemRequestVOList); + /** + * + * @Description: + * @return SystemBO + */ + SystemBO vo2bo(SystemVO systemVO); + /** + * + * @Description: + * @return SystemBO + */ + SystemBO vo2bo(UpdateSystemRequestVO updateSystemRequestVO); +} \ No newline at end of file diff --git a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/model/convert/UserGroupConverter.java b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/model/convert/UserGroupConverter.java new file mode 100644 index 0000000000000000000000000000000000000000..511cc13df9782af0585957aca737623d03c9ea89 --- /dev/null +++ b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/model/convert/UserGroupConverter.java @@ -0,0 +1,46 @@ +package com.coderman.infosys.auth.model.convert; + +import java.util.List; +import com.coderman.infosys.auth.domain.bo.UserGroupBO; +import com.coderman.infosys.auth.adapter.vo.UserGroupVO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:UserGroupConvertervobo接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Mapper +public interface UserGroupConverter{ + UserGroupConverter INSTANCE = Mappers.getMapper(UserGroupConverter.class); + + /** + * + * @Description: + * @return List + */ + List BOs2VOs(List userGroupBOList); + /** + * + * @Description: + * @return List + */ + List vos2bos(List vOList); + /** + * + * @Description: + * @return UserGroupVO + */ + UserGroupVO bo2VO(UserGroupBO userGroupBO); + /** + * + * @Description: + * @return UserGroupBO + */ + UserGroupBO vo2bo(UserGroupVO userGroupVO); +} \ No newline at end of file diff --git a/codemaker-cola/cola-app/pom.xml b/codemaker-cola/cola-app/pom.xml index 8e220c1a22d1d1623801507f36f9cd5ef8f7473b..a8a4f5ce963a88ff54175fa83639105819956684 100644 --- a/codemaker-cola/cola-app/pom.xml +++ b/codemaker-cola/cola-app/pom.xml @@ -52,7 +52,7 @@ com.coderman.utils coderman-utils - 1.0.2-SNAPSHOT + 1.0.4-SNAPSHOT @@ -125,6 +125,12 @@ + + com.codemaker.cola + cola-infrast + 1.0-SNAPSHOT + + diff --git a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/command/AbstractCmd.java b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/command/AbstractCmd.java new file mode 100644 index 0000000000000000000000000000000000000000..14836fbd470aeb39f3ca65dfb233f18974604387 --- /dev/null +++ b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/command/AbstractCmd.java @@ -0,0 +1,32 @@ +package com.coderman.infosys.auth.app.command; + +import java.util.Date; + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:抽象命令类类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class AbstractCmd { + + + /** 操作时 **/ + public Date operateTime; + + /** 操作人I **/ + public Long userId; + + /** 命令 **/ + public Class commandClass; + + /** 命令数 **/ + public String payLoad;; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/command/AddRoleAuthCmd.java b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/command/AddRoleAuthCmd.java new file mode 100644 index 0000000000000000000000000000000000000000..84b0a6fb25ac828690975fdbd5c4012aa9030400 --- /dev/null +++ b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/command/AddRoleAuthCmd.java @@ -0,0 +1,25 @@ +package com.coderman.infosys.auth.app.command; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:对角色权限类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class AddRoleAuthCmd extends AbstractCmd{ + + + /** 角色ID **/ + private Long roleId; + + /** 权限数据内容 **/ + private String json; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/command/AddUserAuthCmd.java b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/command/AddUserAuthCmd.java new file mode 100644 index 0000000000000000000000000000000000000000..2d4ea4ab737d8d4967a06ae25a2f10c16ea71ae1 --- /dev/null +++ b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/command/AddUserAuthCmd.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.app.command; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:增加用户权限类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class AddUserAuthCmd extends AbstractCmd{ + + + /** 用户ID **/ + private Long userId; + + /** 角色ID **/ + private Long roleId; + + /** 权限类型 **/ + private int authorityType; + + /** 权限数据内容 **/ + private String json; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/command/AddUserCmd.java b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/command/AddUserCmd.java new file mode 100644 index 0000000000000000000000000000000000000000..53a7a41655d0c0137d71dc1c96b3683ad06c572c --- /dev/null +++ b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/command/AddUserCmd.java @@ -0,0 +1,28 @@ +package com.coderman.infosys.auth.app.command; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:增加用户命令类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class AddUserCmd extends AbstractCmd{ + + + /** 用户名 **/ + private String userName; + + /** 用户ID **/ + private Long userId; + + /** 所属组织 **/ + private Long departmentId; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/command/AddUserGroupCmd.java b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/command/AddUserGroupCmd.java new file mode 100644 index 0000000000000000000000000000000000000000..e352a5142b2189af98cf907b68b8f177e0174a95 --- /dev/null +++ b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/command/AddUserGroupCmd.java @@ -0,0 +1,25 @@ +package com.coderman.infosys.auth.app.command; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:增加用户组命令类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class AddUserGroupCmd extends AbstractCmd{ + + + /** 组名 **/ + private String groupName; + + /** 用户ID **/ + private Long userId; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/command/UpdateRoleAuthCmd.java b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/command/UpdateRoleAuthCmd.java new file mode 100644 index 0000000000000000000000000000000000000000..dcc7a8e72c918382f780f40a84817ec20f8f040d --- /dev/null +++ b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/command/UpdateRoleAuthCmd.java @@ -0,0 +1,25 @@ +package com.coderman.infosys.auth.app.command; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:更新角色权限类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class UpdateRoleAuthCmd extends AbstractCmd{ + + + /** 角色ID **/ + private Long roleId; + + /** 权限数据内容 **/ + private String json; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/command/UpdateUserAuthCmd.java b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/command/UpdateUserAuthCmd.java new file mode 100644 index 0000000000000000000000000000000000000000..06e87885082e0c589d8ff66a50613ecad920e0e5 --- /dev/null +++ b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/command/UpdateUserAuthCmd.java @@ -0,0 +1,28 @@ +package com.coderman.infosys.auth.app.command; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:更新用户权限类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class UpdateUserAuthCmd extends AbstractCmd{ + + + /** 用户ID **/ + private Long userId; + + /** 角色ID **/ + private Long roleId; + + /** 权限数据内容 **/ + private String json; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/convert/AuthorityConvert.java b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/convert/AuthorityConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..d7237e03e5c118f821eeec34aa34e9ec347cf9d9 --- /dev/null +++ b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/convert/AuthorityConvert.java @@ -0,0 +1,60 @@ +package com.coderman.infosys.auth.app.convert; + +import com.coderman.infosys.auth.api.dto.UpdateAuthorityRequestDTO; +import com.coderman.infosys.auth.domain.bo.AuthorityBO; +import java.util.List; +import com.coderman.infosys.auth.api.dto.CreateAuthorityRequestDTO; +import com.coderman.infosys.auth.api.dto.AuthorityResponseDTO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:AuthorityConvert接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Mapper +public interface AuthorityConvert{ + AuthorityConvert INSTANCE = Mappers.getMapper(AuthorityConvert.class); + + /** + * + * @Description: + * @return AuthorityResponseDTO + */ + AuthorityResponseDTO bo2dto(AuthorityBO authorityBO); + /** + * + * @Description: + * @return List + */ + List authorityBOs2dtoList(List authorityBOList); + /** + * + * @Description: + * @return AuthorityBO + */ + AuthorityBO dto2bo(UpdateAuthorityRequestDTO updateAuthorityRequestDTO); + /** + * + * @Description: + * @return List + */ + List createAuthorityRequestDTOs2boList(List createAuthorityRequestDTOList); + /** + * + * @Description: + * @return AuthorityBO + */ + AuthorityBO dto2bo(CreateAuthorityRequestDTO createAuthorityRequestDTO); + /** + * + * @Description: + * @return List + */ + List updateAuthorityRequestDTOs2boList(List updateAuthorityRequestDTOList); +} \ No newline at end of file diff --git a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/convert/DataAuthorityConvert.java b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/convert/DataAuthorityConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..5ce0ccf0223db3b513a9a9941e9634bebdbf120a --- /dev/null +++ b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/convert/DataAuthorityConvert.java @@ -0,0 +1,61 @@ +package com.coderman.infosys.auth.app.convert; + +import java.util.List; +import com.coderman.infosys.auth.domain.bo.AuthorityBO; +import com.coderman.infosys.auth.api.dto.UpdateDataAuthorityRequestDTO; +import com.coderman.infosys.auth.api.dto.CreateDataAuthorityRequestDTO; +import com.coderman.infosys.auth.api.dto.DataAuthorityResponseDTO; +import com.coderman.infosys.auth.domain.bo.DataAuthorityBO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:DataAuthorityConvert接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Mapper +public interface DataAuthorityConvert{ + DataAuthorityConvert INSTANCE = Mappers.getMapper(DataAuthorityConvert.class); + + /** + * + * @Description: + * @return List + */ + List createDataAuthorityRequestDTOs2boList(List createDataAuthorityRequestDTOList); + /** + * + * @Description: + * @return List + */ + List updateDataAuthorityRequestDTOs2boList(List updateDataAuthorityRequestDTOList); + /** + * + * @Description: + * @return DataAuthorityBO + */ + DataAuthorityBO dto2bo(CreateDataAuthorityRequestDTO createDataAuthorityRequestDTO); + /** + * + * @Description: + * @return DataAuthorityBO + */ + DataAuthorityBO dto2bo(UpdateDataAuthorityRequestDTO updateDataAuthorityRequestDTO); + /** + * + * @Description: + * @return DataAuthorityResponseDTO + */ + DataAuthorityResponseDTO bo2dto(DataAuthorityBO dataAuthorityBO); + /** + * + * @Description: + * @return List + */ + List dataAuthorityBOs2dtoList(List dataAuthorityBOList); +} \ No newline at end of file diff --git a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/convert/MenuConvert.java b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/convert/MenuConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..7e424eb3e6cad8c7795bf566215a9892ce41e6d5 --- /dev/null +++ b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/convert/MenuConvert.java @@ -0,0 +1,60 @@ +package com.coderman.infosys.auth.app.convert; + +import com.coderman.infosys.auth.domain.bo.MenuBO; +import java.util.List; +import com.coderman.infosys.auth.api.dto.UpdateMenuRequestDTO; +import com.coderman.infosys.auth.api.dto.CreateMenuRequestDTO; +import com.coderman.infosys.auth.api.dto.MenuResponseDTO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:MenuConvert接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Mapper +public interface MenuConvert{ + MenuConvert INSTANCE = Mappers.getMapper(MenuConvert.class); + + /** + * + * @Description: + * @return MenuResponseDTO + */ + MenuResponseDTO bo2dto(MenuBO menuBO); + /** + * + * @Description: + * @return List + */ + List menuBOs2dtoList(List menuBOList); + /** + * + * @Description: + * @return MenuBO + */ + MenuBO dto2bo(UpdateMenuRequestDTO updateMenuRequestDTO); + /** + * + * @Description: + * @return List + */ + List updateMenuRequestDTOs2boList(List updateMenuRequestDTOList); + /** + * + * @Description: + * @return MenuBO + */ + MenuBO dto2bo(CreateMenuRequestDTO createMenuRequestDTO); + /** + * + * @Description: + * @return List + */ + List createMenuRequestDTOs2boList(List createMenuRequestDTOList); +} \ No newline at end of file diff --git a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/convert/ModuleConvert.java b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/convert/ModuleConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..3f1079c849d811a05c8572f32b9b2d3217b9d1c5 --- /dev/null +++ b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/convert/ModuleConvert.java @@ -0,0 +1,60 @@ +package com.coderman.infosys.auth.app.convert; + +import java.util.List; +import com.coderman.infosys.auth.api.dto.UpdateModuleRequestDTO; +import com.coderman.infosys.auth.api.dto.ModuleResponseDTO; +import com.coderman.infosys.auth.domain.bo.ModuleBO; +import com.coderman.infosys.auth.api.dto.CreateModuleRequestDTO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:ModuleConvert接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Mapper +public interface ModuleConvert{ + ModuleConvert INSTANCE = Mappers.getMapper(ModuleConvert.class); + + /** + * + * @Description: + * @return ModuleResponseDTO + */ + ModuleResponseDTO bo2dto(ModuleBO moduleBO); + /** + * + * @Description: + * @return List + */ + List moduleBOs2dtoList(List moduleBOList); + /** + * + * @Description: + * @return ModuleBO + */ + ModuleBO dto2bo(CreateModuleRequestDTO createModuleRequestDTO); + /** + * + * @Description: + * @return ModuleBO + */ + ModuleBO dto2bo(UpdateModuleRequestDTO updateModuleRequestDTO); + /** + * + * @Description: + * @return List + */ + List createModuleRequestDTOs2boList(List createModuleRequestDTOList); + /** + * + * @Description: + * @return List + */ + List updateModuleRequestDTOs2boList(List updateModuleRequestDTOList); +} \ No newline at end of file diff --git a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/convert/RoleConvert.java b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/convert/RoleConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..8c13e2490e8d64f89dfd9878fe4a47d61c96ae76 --- /dev/null +++ b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/convert/RoleConvert.java @@ -0,0 +1,60 @@ +package com.coderman.infosys.auth.app.convert; + +import java.util.List; +import com.coderman.infosys.auth.domain.bo.RoleBO; +import com.coderman.infosys.auth.api.dto.CreateRoleRequestDTO; +import com.coderman.infosys.auth.api.dto.RoleResponseDTO; +import com.coderman.infosys.auth.api.dto.UpdateRoleRequestDTO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:RoleConvert接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Mapper +public interface RoleConvert{ + RoleConvert INSTANCE = Mappers.getMapper(RoleConvert.class); + + /** + * + * @Description: + * @return List + */ + List createRoleRequestDTOs2boList(List createRoleRequestDTOList); + /** + * + * @Description: + * @return RoleBO + */ + RoleBO dto2bo(UpdateRoleRequestDTO updateRoleRequestDTO); + /** + * + * @Description: + * @return RoleResponseDTO + */ + RoleResponseDTO bo2dto(RoleBO roleBO); + /** + * + * @Description: + * @return List + */ + List roleBOs2dtoList(List roleBOList); + /** + * + * @Description: + * @return List + */ + List updateRoleRequestDTOs2boList(List updateRoleRequestDTOList); + /** + * + * @Description: + * @return RoleBO + */ + RoleBO dto2bo(CreateRoleRequestDTO createRoleRequestDTO); +} \ No newline at end of file diff --git a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/convert/RoleGroupConvert.java b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/convert/RoleGroupConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..62da28aa8c01b9c9283eb1b564bc9e3b693a0d23 --- /dev/null +++ b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/convert/RoleGroupConvert.java @@ -0,0 +1,47 @@ +package com.coderman.infosys.auth.app.convert; + +import com.coderman.infosys.auth.api.dto.UpdateRoleGroupRequestDTO; +import java.util.List; +import com.coderman.infosys.auth.api.dto.RoleGroupResponseDTO; +import com.coderman.infosys.auth.domain.bo.RoleGroupBO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:RoleGroupConvert接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Mapper +public interface RoleGroupConvert{ + RoleGroupConvert INSTANCE = Mappers.getMapper(RoleGroupConvert.class); + + /** + * + * @Description: + * @return RoleGroupBO + */ + RoleGroupBO dto2bo(UpdateRoleGroupRequestDTO updateRoleGroupRequestDTO); + /** + * + * @Description: + * @return RoleGroupResponseDTO + */ + RoleGroupResponseDTO bo2dto(RoleGroupBO roleGroupBO); + /** + * + * @Description: + * @return List + */ + List roleGroupBOs2dtoList(List roleGroupBOList); + /** + * + * @Description: + * @return List + */ + List updateRoleGroupRequestDTOs2boList(List updateRoleGroupRequestDTOList); +} \ No newline at end of file diff --git a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/convert/SystemAuthorityConvert.java b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/convert/SystemAuthorityConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..f5d0de3d849302341869c1ddde9e492e7f40fd6d --- /dev/null +++ b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/convert/SystemAuthorityConvert.java @@ -0,0 +1,61 @@ +package com.coderman.infosys.auth.app.convert; + +import com.coderman.infosys.auth.domain.bo.SystemAuthorityBO; +import com.coderman.infosys.auth.domain.bo.AuthorityBO; +import java.util.List; +import com.coderman.infosys.auth.api.dto.UpdateSystemAuthorityRequestDTO; +import com.coderman.infosys.auth.api.dto.SystemAuthorityResponseDTO; +import com.coderman.infosys.auth.api.dto.CreateSystemAuthorityRequestDTO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:SystemAuthorityConvert接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Mapper +public interface SystemAuthorityConvert{ + SystemAuthorityConvert INSTANCE = Mappers.getMapper(SystemAuthorityConvert.class); + + /** + * + * @Description: + * @return SystemAuthorityResponseDTO + */ + SystemAuthorityResponseDTO bo2dto(SystemAuthorityBO systemAuthorityBO); + /** + * + * @Description: + * @return SystemAuthorityBO + */ + SystemAuthorityBO dto2bo(CreateSystemAuthorityRequestDTO createSystemAuthorityRequestDTO); + /** + * + * @Description: + * @return List + */ + List createSystemAuthorityRequestDTOs2boList(List createSystemAuthorityRequestDTOList); + /** + * + * @Description: + * @return List + */ + List updateSystemAuthorityRequestDTOs2boList(List updateSystemAuthorityRequestDTOList); + /** + * + * @Description: + * @return SystemAuthorityBO + */ + SystemAuthorityBO dto2bo(UpdateSystemAuthorityRequestDTO updateSystemAuthorityRequestDTO); + /** + * + * @Description: + * @return List + */ + List systemAuthorityBOs2dtoList(List systemAuthorityBOList); +} \ No newline at end of file diff --git a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/convert/SystemConvert.java b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/convert/SystemConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..8b0bba66687c4378acdce28adb34ff8443cf437e --- /dev/null +++ b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/convert/SystemConvert.java @@ -0,0 +1,72 @@ +package com.coderman.infosys.auth.app.convert; + +import java.util.List; +import com.coderman.infosys.auth.api.dto.UpdateSystemRequestDTO; +import com.coderman.infosys.auth.domain.bo.SystemBO; +import com.coderman.infosys.auth.api.dto.CreateSystemRequestDTO; +import com.coderman.infosys.auth.api.dto.SystemDTO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:SystemConvert接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Mapper +public interface SystemConvert{ + SystemConvert INSTANCE = Mappers.getMapper(SystemConvert.class); + + /** + * + * @Description: + * @return List + */ + List systemDTOs2boList(List systemDTOList); + /** + * + * @Description: + * @return SystemBO + */ + SystemBO dto2bo(CreateSystemRequestDTO createSystemRequestDTO); + /** + * + * @Description: + * @return List + */ + List createSystemRequestDTOs2boList(List createSystemRequestDTOList); + /** + * + * @Description: + * @return SystemBO + */ + SystemBO dto2bo(UpdateSystemRequestDTO updateSystemRequestDTO); + /** + * + * @Description: + * @return SystemBO + */ + SystemBO dto2bo(SystemDTO systemDTO); + /** + * + * @Description: + * @return SystemDTO + */ + SystemDTO bo2dto(SystemBO systemBO); + /** + * + * @Description: + * @return List + */ + List systemBOs2dtoList(List systemBOList); + /** + * + * @Description: + * @return List + */ + List updateSystemRequestDTOs2boList(List updateSystemRequestDTOList); +} \ No newline at end of file diff --git a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/convert/UserGroupConvert.java b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/convert/UserGroupConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..fee876c8c4796a91ef059981cfa19d08d9b6cef2 --- /dev/null +++ b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/convert/UserGroupConvert.java @@ -0,0 +1,60 @@ +package com.coderman.infosys.auth.app.convert; + +import com.coderman.infosys.auth.api.dto.UserGroupResponseDTO; +import java.util.List; +import com.coderman.infosys.auth.api.dto.CreateUserGroupRequestDTO; +import com.coderman.infosys.auth.domain.bo.UserGroupBO; +import com.coderman.infosys.auth.api.dto.UpdateUserGroupRequestDTO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:UserGroupConvert接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Mapper +public interface UserGroupConvert{ + UserGroupConvert INSTANCE = Mappers.getMapper(UserGroupConvert.class); + + /** + * + * @Description: + * @return List + */ + List updateUserGroupRequestDTOs2boList(List updateUserGroupRequestDTOList); + /** + * + * @Description: + * @return UserGroupResponseDTO + */ + UserGroupResponseDTO bo2dto(UserGroupBO userGroupBO); + /** + * + * @Description: + * @return UserGroupBO + */ + UserGroupBO dto2bo(UpdateUserGroupRequestDTO updateUserGroupRequestDTO); + /** + * + * @Description: + * @return List + */ + List userGroupBOs2dtoList(List userGroupBOList); + /** + * + * @Description: + * @return UserGroupBO + */ + UserGroupBO dto2bo(CreateUserGroupRequestDTO createUserGroupRequestDTO); + /** + * + * @Description: + * @return List + */ + List createUserGroupRequestDTOs2boList(List createUserGroupRequestDTOList); +} \ No newline at end of file diff --git a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/exe/CmdExeService.java b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/exe/CmdExeService.java new file mode 100644 index 0000000000000000000000000000000000000000..aaa9afe08f09d441d66676ae3a762bf87d3d7039 --- /dev/null +++ b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/exe/CmdExeService.java @@ -0,0 +1,21 @@ +package com.coderman.infosys.auth.app.exe; + +import com.coderman.infosys.auth.app.command.AbstractCmd; + + +/** + * @Description:命令执行接口接口 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +public interface CmdExeService{ + + /** + * + * @Description 命令执行入口 + * @param abstractCmd + * @return String + */ + String exe(AbstractCmd abstractCmd); +} \ No newline at end of file diff --git a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/exe/RoleAuthCmdExe.java b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/exe/RoleAuthCmdExe.java new file mode 100644 index 0000000000000000000000000000000000000000..ca4c57483cdec16f6bf4dc6088bdd42e62d712df --- /dev/null +++ b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/exe/RoleAuthCmdExe.java @@ -0,0 +1,29 @@ +package com.coderman.infosys.auth.app.exe; + +import com.coderman.infosys.auth.app.command.AbstractCmd; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import com.coderman.infosys.auth.app.exe.RoleAuthCmdExe; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * @Description:角色权限cmd处理类接口实现类 + * @Author：shenshuai + * @CreateTime：2021-11-07 08:23:49 + * @version v1.0 + */ +@Service +public class RoleAuthCmdExe implements CmdExeService{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + @Override + public String exe(AbstractCmd abstractCmd){ + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/exe/UserAuthCmdExe.java b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/exe/UserAuthCmdExe.java new file mode 100644 index 0000000000000000000000000000000000000000..fc2482ac8a2644c826af22c5e8c78eae90be2b9f --- /dev/null +++ b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/exe/UserAuthCmdExe.java @@ -0,0 +1,29 @@ +package com.coderman.infosys.auth.app.exe; + +import com.coderman.infosys.auth.app.command.AbstractCmd; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import com.coderman.infosys.auth.app.exe.UserAuthCmdExe; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * @Description:用户权限cmd处理类接口实现类 + * @Author：shenshuai + * @CreateTime：2021-11-07 08:23:49 + * @version v1.0 + */ +@Service +public class UserAuthCmdExe implements CmdExeService{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + @Override + public String exe(AbstractCmd abstractCmd){ + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/exe/UserCmdExe.java b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/exe/UserCmdExe.java new file mode 100644 index 0000000000000000000000000000000000000000..d7db678df350413a91958b8c20b9b0962ab2289a --- /dev/null +++ b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/exe/UserCmdExe.java @@ -0,0 +1,29 @@ +package com.coderman.infosys.auth.app.exe; + +import com.coderman.infosys.auth.app.command.AbstractCmd; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import com.coderman.infosys.auth.app.exe.UserCmdExe; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * @Description:用户cmd处理类接口实现类 + * @Author：shenshuai + * @CreateTime：2021-11-07 08:23:49 + * @version v1.0 + */ +@Service +public class UserCmdExe implements CmdExeService{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + @Override + public String exe(AbstractCmd abstractCmd){ + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/exe/UserGroupCmdExe.java b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/exe/UserGroupCmdExe.java new file mode 100644 index 0000000000000000000000000000000000000000..4dd41c43809945767c2b2358a521a40154a9b045 --- /dev/null +++ b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/exe/UserGroupCmdExe.java @@ -0,0 +1,29 @@ +package com.coderman.infosys.auth.app.exe; + +import com.coderman.infosys.auth.app.command.AbstractCmd; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import com.coderman.infosys.auth.app.exe.UserGroupCmdExe; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * @Description:用户组cmd处理类接口实现类 + * @Author：shenshuai + * @CreateTime：2021-11-07 08:23:49 + * @version v1.0 + */ +@Service +public class UserGroupCmdExe implements CmdExeService{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + @Override + public String exe(AbstractCmd abstractCmd){ + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/facadeimpl/AuthorityFacadeImpl.java b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/facadeimpl/AuthorityFacadeImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..bfdb8a5a11a71cfbe42477c5147f047e66414123 --- /dev/null +++ b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/facadeimpl/AuthorityFacadeImpl.java @@ -0,0 +1,49 @@ +package com.coderman.infosys.auth.app.facadeimpl; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.apache.dubbo.config.annotation.Service; +import org.springframework.beans.factory.annotation.Autowired; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.api.dto.CreateAuthorityRequestDTO; +import com.coderman.infosys.auth.api.facade.AuthorityFacade; +import com.coderman.infosys.auth.api.dto.AuthorityResponseDTO; +/** + * @Description:接口实现类 + * @Author： + * @CreateTime：2021-11-07 08:23:49 + * @version v1.0 + */ +@Service +public class AuthorityFacadeImpl implements AuthorityFacade{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + + @Override + public ResultDataDto checkUserSystemAuth(Long userId,String systemCode){ + + return null; + } + + @Override + public ResultDataDto getUserSystemAuth(Long userId,String systemCode){ + + return null; + } + + @Override + public ResultDataDto getByCode(String authCode){ + + return null; + } + + @Override + public ResultDataDto saveAuthority(CreateAuthorityRequestDTO createAuthorityRequestDTO){ + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/facadeimpl/DataAuthorityFacadeImpl.java b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/facadeimpl/DataAuthorityFacadeImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..d48d1bb929777111363d8f3e28f518a927273b4a --- /dev/null +++ b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/facadeimpl/DataAuthorityFacadeImpl.java @@ -0,0 +1,39 @@ +package com.coderman.infosys.auth.app.facadeimpl; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.apache.dubbo.config.annotation.Service; +import org.springframework.beans.factory.annotation.Autowired; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.api.dto.CreateDataAuthorityRequestDTO; +import com.coderman.infosys.auth.api.facade.DataAuthorityFacade; +import com.coderman.infosys.auth.api.facade.AuthorityFacade; +import com.coderman.infosys.auth.api.dto.DataAuthorityResponseDTO; +import com.coderman.infosys.auth.api.dto.AuthorityResponseDTO; +/** + * @Description:接口实现类 + * @Author： + * @CreateTime：2021-11-07 08:23:49 + * @version v1.0 + */ +@Service +public class DataAuthorityFacadeImpl implements DataAuthorityFacade{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + + @Override + public ResultDataDto getByCode(String authCode){ + + return null; + } + + @Override + public ResultDataDto saveAuthority(CreateDataAuthorityRequestDTO createDataAuthorityRequestDTO){ + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/facadeimpl/MenuFacadeImpl.java b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/facadeimpl/MenuFacadeImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..f7758fb1e6bb6c4f09895a35311aadda6814622f --- /dev/null +++ b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/facadeimpl/MenuFacadeImpl.java @@ -0,0 +1,22 @@ +package com.coderman.infosys.auth.app.facadeimpl; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.apache.dubbo.config.annotation.Service; +import org.springframework.beans.factory.annotation.Autowired; + +import com.coderman.infosys.auth.api.facade.MenuFacade; +/** + * @Description:接口实现类 + * @Author： + * @CreateTime：2021-11-07 08:23:49 + * @version v1.0 + */ +@Service +public class MenuFacadeImpl implements MenuFacade{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/facadeimpl/ModuleFacadeImpl.java b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/facadeimpl/ModuleFacadeImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..4556217bd339f266cca8e674c696dc1aa439aa20 --- /dev/null +++ b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/facadeimpl/ModuleFacadeImpl.java @@ -0,0 +1,22 @@ +package com.coderman.infosys.auth.app.facadeimpl; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.apache.dubbo.config.annotation.Service; +import org.springframework.beans.factory.annotation.Autowired; + +import com.coderman.infosys.auth.api.facade.ModuleFacade; +/** + * @Description:接口实现类 + * @Author： + * @CreateTime：2021-11-07 08:23:49 + * @version v1.0 + */ +@Service +public class ModuleFacadeImpl implements ModuleFacade{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/facadeimpl/RoleFacadeImpl.java b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/facadeimpl/RoleFacadeImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..426159a5e1f736928a6da00e24cb67cc98e0ff4f --- /dev/null +++ b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/facadeimpl/RoleFacadeImpl.java @@ -0,0 +1,30 @@ +package com.coderman.infosys.auth.app.facadeimpl; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.apache.dubbo.config.annotation.Service; +import org.springframework.beans.factory.annotation.Autowired; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.api.dto.RoleResponseDTO; +import com.coderman.infosys.auth.api.facade.RoleFacade; +/** + * @Description:接口实现类 + * @Author： + * @CreateTime：2021-11-07 08:23:49 + * @version v1.0 + */ +@Service +public class RoleFacadeImpl implements RoleFacade{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + + @Override + public ResultDataDto getByRoleCode(String roleCode){ + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/facadeimpl/RoleGroupFacadeImpl.java b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/facadeimpl/RoleGroupFacadeImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..ac56a2f77443608591478e70911e275634a5cdf2 --- /dev/null +++ b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/facadeimpl/RoleGroupFacadeImpl.java @@ -0,0 +1,30 @@ +package com.coderman.infosys.auth.app.facadeimpl; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.apache.dubbo.config.annotation.Service; +import org.springframework.beans.factory.annotation.Autowired; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.api.dto.RoleGroupResponseDTO; +import com.coderman.infosys.auth.api.facade.RoleGroupFacade; +/** + * @Description:接口实现类 + * @Author： + * @CreateTime：2021-11-07 08:23:49 + * @version v1.0 + */ +@Service +public class RoleGroupFacadeImpl implements RoleGroupFacade{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + + @Override + public ResultDataDto getByNumber(String number){ + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/facadeimpl/SystemAuthorityFacadeImpl.java b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/facadeimpl/SystemAuthorityFacadeImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..73d448afdb9e574b479332b629b624f653585a0d --- /dev/null +++ b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/facadeimpl/SystemAuthorityFacadeImpl.java @@ -0,0 +1,32 @@ +package com.coderman.infosys.auth.app.facadeimpl; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.apache.dubbo.config.annotation.Service; +import org.springframework.beans.factory.annotation.Autowired; + +import com.coderman.infosys.auth.api.facade.SystemAuthorityFacade; +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.api.facade.AuthorityFacade; +import com.coderman.infosys.auth.api.dto.SystemAuthorityResponseDTO; +import com.coderman.infosys.auth.api.dto.AuthorityResponseDTO; +/** + * @Description:接口实现类 + * @Author： + * @CreateTime：2021-11-07 08:23:49 + * @version v1.0 + */ +@Service +public class SystemAuthorityFacadeImpl implements SystemAuthorityFacade{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + + @Override + public ResultDataDto getByCode(String authCode){ + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/facadeimpl/SystemFacadeImpl.java b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/facadeimpl/SystemFacadeImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..cca07bdfaaa4643d10706f118fa0fe59260d44bc --- /dev/null +++ b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/facadeimpl/SystemFacadeImpl.java @@ -0,0 +1,77 @@ +package com.coderman.infosys.auth.app.facadeimpl; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.apache.dubbo.config.annotation.Service; +import org.springframework.beans.factory.annotation.Autowired; + +import com.coderman.utils.response.PageDTO; +import java.util.List; +import com.coderman.infosys.auth.api.facade.SystemFacade; +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.api.dto.UpdateSystemRequestDTO; +import com.coderman.infosys.auth.api.dto.SystemDTO; +import com.coderman.infosys.auth.domain.gataway.SystemModuleRepository; +import com.coderman.infosys.auth.domain.bo.SystemBO; +import com.coderman.infosys.auth.domain.gataway.SystemModuleQueryGataWay; +import com.coderman.infosys.auth.app.convert.SystemConvert; +/** + * @Description:接口实现类 + * @Author： + * @CreateTime：2021-11-07 08:23:49 + * @version v1.0 + */ +@Service +public class SystemFacadeImpl implements SystemFacade{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + private SystemModuleQueryGataWay systemModuleQueryGataWay; + + @Autowired + private SystemModuleRepository systemModuleRepository; + + + + @Override + public ResultDataDto registSystem(SystemDTO systemDTO){ + SystemBO systemBO = SystemConvert.INSTANCE.dto2bo(systemDTO); + List systemBOList = systemModuleQueryGataWay.getSystemByName(systemBO.getSystemName()); + + return null; + } + + @Override + public ResultDataDto> getPageList(PageDTO pageDto){ + List systemBOList = systemModuleQueryGataWay.querySystemPage(null); + List systemDTOList = SystemConvert.INSTANCE.systemBOs2dtoList(systemBOList); + + return null; + } + + @Override + public ResultDataDto getBySystemCode(String systemCode){ + SystemBO systemBO = systemModuleQueryGataWay.queryBySystemCode(systemCode); + SystemDTO systemDTO = SystemConvert.INSTANCE.bo2dto(systemBO); + + return ResultDataDto.success(systemDTO); + } + + @Override + public ResultDataDto updateSystem(UpdateSystemRequestDTO dto){ + SystemBO systemBO = SystemConvert.INSTANCE.dto2bo(dto); + Integer intVar = systemModuleRepository.updateSystem(systemBO); + + return null; + } + + @Override + public ResultDataDto> getSearchList(String search){ + List systemBOList = systemModuleQueryGataWay.queryByCondition(search); + List systemDTOList = SystemConvert.INSTANCE.systemBOs2dtoList(systemBOList); + + return ResultDataDto.success(systemDTOList); + } + +} \ No newline at end of file diff --git a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/facadeimpl/UserGroupFacadeImpl.java b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/facadeimpl/UserGroupFacadeImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..676e3c67a607f17f0a910cdb040bbf6034341297 --- /dev/null +++ b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/facadeimpl/UserGroupFacadeImpl.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.app.facadeimpl; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.apache.dubbo.config.annotation.Service; +import org.springframework.beans.factory.annotation.Autowired; + +import com.coderman.infosys.auth.api.dto.UserGroupResponseDTO; +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.api.dto.CreateUserGroupRequestDTO; +import com.coderman.infosys.auth.api.facade.UserGroupFacade; +/** + * @Description:接口实现类 + * @Author： + * @CreateTime：2021-11-07 08:23:49 + * @version v1.0 + */ +@Service +public class UserGroupFacadeImpl implements UserGroupFacade{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + + @Override + public ResultDataDto createUserGroup(CreateUserGroupRequestDTO createUserGroupRequestDTO){ + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/facadeimpl/UserGroupQueryFacadeImpl.java b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/facadeimpl/UserGroupQueryFacadeImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..1047a0e2b77e56aa152708256a3b7b1da6a7fd48 --- /dev/null +++ b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/facadeimpl/UserGroupQueryFacadeImpl.java @@ -0,0 +1,30 @@ +package com.coderman.infosys.auth.app.facadeimpl; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.apache.dubbo.config.annotation.Service; +import org.springframework.beans.factory.annotation.Autowired; + +import com.coderman.infosys.auth.api.dto.UserGroupResponseDTO; +import com.coderman.infosys.auth.api.facade.UserGroupQueryFacade; +import com.coderman.utils.response.ResultDataDto; +/** + * @Description:接口实现类 + * @Author： + * @CreateTime：2021-11-07 08:23:49 + * @version v1.0 + */ +@Service +public class UserGroupQueryFacadeImpl implements UserGroupQueryFacade{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + + @Override + public ResultDataDto getByGroupCode(String groupCode){ + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/utils/SpringApplicationContext.java b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/utils/SpringApplicationContext.java similarity index 54% rename from codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/utils/SpringApplicationContext.java rename to codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/utils/SpringApplicationContext.java index 185335fd584e8f5f70c6b9a4d3c971fc8d60816e..5ccb6b278c9ebd98d94bb08b762fbfd3d7fb6424 100644 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/utils/SpringApplicationContext.java +++ b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/utils/SpringApplicationContext.java @@ -1,4 +1,19 @@ -package com.lightsnail.schoolmanager.core.utils; +/* + * Copyright 2014 Jeanfrancois Arcand + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package com.coderman.infosys.auth.utils; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; diff --git a/codemaker-cola/cola-client/pom.xml b/codemaker-cola/cola-client/pom.xml index ce11b003d7b38f2b7a8c3919dcffdda93bc4d181..7627bfb42373862f03091f282b66d172652aa0e3 100644 --- a/codemaker-cola/cola-client/pom.xml +++ b/codemaker-cola/cola-client/pom.xml @@ -41,7 +41,7 @@ com.coderman.utils coderman-utils - 1.0.2-SNAPSHOT + 1.0.4-SNAPSHOT diff --git a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/AuthorityResponseDTO.java b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/AuthorityResponseDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..86e05b26fa533647b33fd5282c2453263d089f0e --- /dev/null +++ b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/AuthorityResponseDTO.java @@ -0,0 +1,37 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:权限类 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Data +@ToString +public class AuthorityResponseDTO { + + /** 主键ID **/ + private Long id; + /** 权限编码标示 **/ + private String authCode; + /** 权限类型 **/ + private Integer authorityType; + /** 关联角色 **/ + private String roleCode; + /** 关联角色组 **/ + private String roleGroupCode; + /** 权限状态 **/ + private Integer status; + /** 数据字段权限列表 **/ + /** private List dataAuthorityBOList **/; + /** 系统菜单权限列表 **/ + /** private List systemAuthorityBOList **/; + /** 行政权限列表 **/ + /** private List adminAuthorityBOList **/; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/CreateAuthorityRequestDTO.java b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/CreateAuthorityRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..d905993de87b6e2059b08ef4af094a238a60e490 --- /dev/null +++ b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/CreateAuthorityRequestDTO.java @@ -0,0 +1,37 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:权限类 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Data +@ToString +public class CreateAuthorityRequestDTO { + + /** 主键ID **/ + private Long id; + /** 权限编码标示 **/ + private String authCode; + /** 权限类型 **/ + private Integer authorityType; + /** 关联角色 **/ + private String roleCode; + /** 关联角色组 **/ + private String roleGroupCode; + /** 权限状态 **/ + private Integer status; + /** 数据字段权限列表 **/ + /** private List dataAuthorityBOList **/; + /** 系统菜单权限列表 **/ + /** private List systemAuthorityBOList **/; + /** 行政权限列表 **/ + /** private List adminAuthorityBOList **/; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/CreateDataAuthorityRequestDTO.java b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/CreateDataAuthorityRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..5927a94211cc77eeb4a34b1e1f818431d9cbc8e7 --- /dev/null +++ b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/CreateDataAuthorityRequestDTO.java @@ -0,0 +1,25 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:数据字段权限类 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Data +@ToString +public class CreateDataAuthorityRequestDTO { + + /** 主键ID **/ + private Long id; + /** 权限编码标示 **/ + private String authCode; + /** 数据字段ID **/ + private Long dataColumnId; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/CreateMenuRequestDTO.java b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/CreateMenuRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..5b33b44bdbffdf6a7a80581651c1281ff965606d --- /dev/null +++ b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/CreateMenuRequestDTO.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:按钮管理类 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Data +@ToString +public class CreateMenuRequestDTO { + + /** 主键ID **/ + private Long id; + /** 按钮名称 **/ + private String menuName; + /** 按钮编码 **/ + private String menuCode; + /** 按钮链接 **/ + private String menuUrl; + /** 系统编码 **/ + private String systemCode; + /** 菜单编码 **/ + private String moduleCode; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/CreateModuleRequestDTO.java b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/CreateModuleRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..cea22a40a405bf6b7c649280b53f64e60c50d726 --- /dev/null +++ b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/CreateModuleRequestDTO.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:菜单/模块管理类 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Data +@ToString +public class CreateModuleRequestDTO { + + /** 主键ID **/ + private Long id; + /** 菜单名称 **/ + private String moduleName; + /** 菜单编码 **/ + private String moduleCode; + /** 菜单链接 **/ + private String moduleUrl; + /** 系统标示 **/ + private String systemCode; + /** 按钮列表 **/ + /** private List menuBOList **/; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/CreateRoleRequestDTO.java b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/CreateRoleRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..4c3459765094bb4515fd3b0b15ba3114bcb004f2 --- /dev/null +++ b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/CreateRoleRequestDTO.java @@ -0,0 +1,29 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:角色类 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Data +@ToString +public class CreateRoleRequestDTO { + + /** 主键ID **/ + private Long id; + /** 角色名称 **/ + private String roleName; + /** 角色编码 **/ + private String roleCode; + /** 角色状态 **/ + private Integer status; + /** 角色对应用户列表 **/ + /** private List userList **/; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/CreateSystemAuthorityRequestDTO.java b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/CreateSystemAuthorityRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..35764118d44837bfcd1217053db9b2c7ddcf508d --- /dev/null +++ b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/CreateSystemAuthorityRequestDTO.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:系统菜单权限类 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Data +@ToString +public class CreateSystemAuthorityRequestDTO { + + /** 主键ID **/ + private Long id; + /** 权限编码标示 **/ + private String authCode; + /** 业务数据系统标示 **/ + private String systemName; + /** 功能 **/ + private String funcName; + /** 菜单 **/ + private String categoryName; + /** 按钮 **/ + private String menuName; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/CreateSystemRequestDTO.java b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/CreateSystemRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..2cc99069a2d008a6a445bb25d78e4676e06a522e --- /dev/null +++ b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/CreateSystemRequestDTO.java @@ -0,0 +1,37 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:系统管理类 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Data +@ToString +public class CreateSystemRequestDTO { + + /** 主键ID **/ + private Long id; + /** 系统名称 **/ + private String systemName; + /** 系统标示 **/ + private String systemCode; + /** 系统域名 **/ + private String systemUrl; + /** 系统图标 **/ + private String systemPicUrl; + /** 系统技术负责人 **/ + private Long tecAdminUserId; + /** 系统业务负责人 **/ + private Long busAdminUserId; + /** 系统当前所在部门 **/ + private Long departmentId; + /** 系统模块列表 **/ + /** private List moduleBOList **/; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/CreateUserGroupRequestDTO.java b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/CreateUserGroupRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..c9c24235961b9e2c003b42dd5f4d4e0cf84bc68a --- /dev/null +++ b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/CreateUserGroupRequestDTO.java @@ -0,0 +1,33 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:用户组类 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Data +@ToString +public class CreateUserGroupRequestDTO { + + /** 主键ID **/ + private Long id; + /** 组名 **/ + private String groupName; + /** 组编码 **/ + private String groupCode; + /** 用户组状态 **/ + private Integer status; + /** 组内用户列表 **/ + /** private List userList **/; + /** 用户组对应的角色列表 **/ + /** private List roleList **/; + /** 用户组对应角色组列表 **/ + /** private List roleGroupList **/; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/DataAuthorityResponseDTO.java b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/DataAuthorityResponseDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..478ba0ee1cbc68ef71cadb12e7be9d05a085f5e5 --- /dev/null +++ b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/DataAuthorityResponseDTO.java @@ -0,0 +1,25 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:数据字段权限类 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Data +@ToString +public class DataAuthorityResponseDTO { + + /** 主键ID **/ + private Long id; + /** 权限编码标示 **/ + private String authCode; + /** 数据字段ID **/ + private Long dataColumnId; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/MenuResponseDTO.java b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/MenuResponseDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..0092f0ba7483d6b5be67a9bf6c00c63e17a09344 --- /dev/null +++ b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/MenuResponseDTO.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:按钮管理类 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Data +@ToString +public class MenuResponseDTO { + + /** 主键ID **/ + private Long id; + /** 按钮名称 **/ + private String menuName; + /** 按钮编码 **/ + private String menuCode; + /** 按钮链接 **/ + private String menuUrl; + /** 系统编码 **/ + private String systemCode; + /** 菜单编码 **/ + private String moduleCode; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/ModuleResponseDTO.java b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/ModuleResponseDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..9122319f201622c24bc3d0b55631ead779be91a9 --- /dev/null +++ b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/ModuleResponseDTO.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:菜单/模块管理类 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Data +@ToString +public class ModuleResponseDTO { + + /** 主键ID **/ + private Long id; + /** 菜单名称 **/ + private String moduleName; + /** 菜单编码 **/ + private String moduleCode; + /** 菜单链接 **/ + private String moduleUrl; + /** 系统标示 **/ + private String systemCode; + /** 按钮列表 **/ + /** private List menuBOList **/; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/RoleGroupResponseDTO.java b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/RoleGroupResponseDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..092801d8024c124dcfaf200ad5f519c526dd1531 --- /dev/null +++ b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/RoleGroupResponseDTO.java @@ -0,0 +1,29 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:角色组类 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Data +@ToString +public class RoleGroupResponseDTO { + + /** 主键ID **/ + private Long id; + /** 角色组名称 **/ + private String roleName; + /** 角色组编码 **/ + private String roleCode; + /** 角色状态 **/ + private Integer status; + /** 组内角色列表 **/ + /** private List roleList **/; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/RoleResponseDTO.java b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/RoleResponseDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..21193c2f7c4b65cdbcaa3ba101ae2a9883a80d00 --- /dev/null +++ b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/RoleResponseDTO.java @@ -0,0 +1,29 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:角色类 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Data +@ToString +public class RoleResponseDTO { + + /** 主键ID **/ + private Long id; + /** 角色名称 **/ + private String roleName; + /** 角色编码 **/ + private String roleCode; + /** 角色状态 **/ + private Integer status; + /** 角色对应用户列表 **/ + /** private List userList **/; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/SystemAuthorityResponseDTO.java b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/SystemAuthorityResponseDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..6d4a9609280191a98f8a5979f35eebc7e9acb692 --- /dev/null +++ b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/SystemAuthorityResponseDTO.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:系统菜单权限类 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Data +@ToString +public class SystemAuthorityResponseDTO { + + /** 主键ID **/ + private Long id; + /** 权限编码标示 **/ + private String authCode; + /** 业务数据系统标示 **/ + private String systemName; + /** 功能 **/ + private String funcName; + /** 菜单 **/ + private String categoryName; + /** 按钮 **/ + private String menuName; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/SystemDTO.java b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/SystemDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..9aeafc1be10cb43a1fcf4eacdee3488fc76bf667 --- /dev/null +++ b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/SystemDTO.java @@ -0,0 +1,37 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:系统管理类 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Data +@ToString +public class SystemDTO { + + /** 主键ID **/ + private Long id; + /** 系统名称 **/ + private String systemName; + /** 系统标示 **/ + private String systemCode; + /** 系统域名 **/ + private String systemUrl; + /** 系统图标 **/ + private String systemPicUrl; + /** 系统技术负责人 **/ + private Long tecAdminUserId; + /** 系统业务负责人 **/ + private Long busAdminUserId; + /** 系统当前所在部门 **/ + private Long departmentId; + /** 系统模块列表 **/ + /** private List moduleBOList **/; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/UpdateAuthorityRequestDTO.java b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/UpdateAuthorityRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..b282c51dfe3644023be43002938361a145a60777 --- /dev/null +++ b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/UpdateAuthorityRequestDTO.java @@ -0,0 +1,37 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:权限类 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Data +@ToString +public class UpdateAuthorityRequestDTO { + + /** 主键ID **/ + private Long id; + /** 权限编码标示 **/ + private String authCode; + /** 权限类型 **/ + private Integer authorityType; + /** 关联角色 **/ + private String roleCode; + /** 关联角色组 **/ + private String roleGroupCode; + /** 权限状态 **/ + private Integer status; + /** 数据字段权限列表 **/ + /** private List dataAuthorityBOList **/; + /** 系统菜单权限列表 **/ + /** private List systemAuthorityBOList **/; + /** 行政权限列表 **/ + /** private List adminAuthorityBOList **/; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/UpdateDataAuthorityRequestDTO.java b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/UpdateDataAuthorityRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..54be1bd5ae1f574a81256f856f3779a1fb8df619 --- /dev/null +++ b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/UpdateDataAuthorityRequestDTO.java @@ -0,0 +1,25 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:数据字段权限类 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Data +@ToString +public class UpdateDataAuthorityRequestDTO { + + /** 主键ID **/ + private Long id; + /** 权限编码标示 **/ + private String authCode; + /** 数据字段ID **/ + private Long dataColumnId; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/UpdateMenuRequestDTO.java b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/UpdateMenuRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..c109a7a7f13a56def5dbc019b39cf5b6150fa2ea --- /dev/null +++ b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/UpdateMenuRequestDTO.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:按钮管理类 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Data +@ToString +public class UpdateMenuRequestDTO { + + /** 主键ID **/ + private Long id; + /** 按钮名称 **/ + private String menuName; + /** 按钮编码 **/ + private String menuCode; + /** 按钮链接 **/ + private String menuUrl; + /** 系统编码 **/ + private String systemCode; + /** 菜单编码 **/ + private String moduleCode; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/UpdateModuleRequestDTO.java b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/UpdateModuleRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..c35359bf116f00e73ce842b7d2214323d59b4499 --- /dev/null +++ b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/UpdateModuleRequestDTO.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:菜单/模块管理类 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Data +@ToString +public class UpdateModuleRequestDTO { + + /** 主键ID **/ + private Long id; + /** 菜单名称 **/ + private String moduleName; + /** 菜单编码 **/ + private String moduleCode; + /** 菜单链接 **/ + private String moduleUrl; + /** 系统标示 **/ + private String systemCode; + /** 按钮列表 **/ + /** private List menuBOList **/; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/UpdateRoleGroupRequestDTO.java b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/UpdateRoleGroupRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..ee7e11e57f0aefc7c36f2c57f2e9771cfd4165b6 --- /dev/null +++ b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/UpdateRoleGroupRequestDTO.java @@ -0,0 +1,29 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:角色组类 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Data +@ToString +public class UpdateRoleGroupRequestDTO { + + /** 主键ID **/ + private Long id; + /** 角色组名称 **/ + private String roleName; + /** 角色组编码 **/ + private String roleCode; + /** 角色状态 **/ + private Integer status; + /** 组内角色列表 **/ + /** private List roleList **/; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/UpdateRoleRequestDTO.java b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/UpdateRoleRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..684fadb92e33e0494140c133f8b035e74ad4ac95 --- /dev/null +++ b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/UpdateRoleRequestDTO.java @@ -0,0 +1,29 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:角色类 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Data +@ToString +public class UpdateRoleRequestDTO { + + /** 主键ID **/ + private Long id; + /** 角色名称 **/ + private String roleName; + /** 角色编码 **/ + private String roleCode; + /** 角色状态 **/ + private Integer status; + /** 角色对应用户列表 **/ + /** private List userList **/; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/UpdateSystemAuthorityRequestDTO.java b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/UpdateSystemAuthorityRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..5645f66c7911586a8e02f098434e20431a5aae02 --- /dev/null +++ b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/UpdateSystemAuthorityRequestDTO.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:系统菜单权限类 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Data +@ToString +public class UpdateSystemAuthorityRequestDTO { + + /** 主键ID **/ + private Long id; + /** 权限编码标示 **/ + private String authCode; + /** 业务数据系统标示 **/ + private String systemName; + /** 功能 **/ + private String funcName; + /** 菜单 **/ + private String categoryName; + /** 按钮 **/ + private String menuName; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/UpdateSystemRequestDTO.java b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/UpdateSystemRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..0e4d829540396f26e31128e62fcd66b2519b6251 --- /dev/null +++ b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/UpdateSystemRequestDTO.java @@ -0,0 +1,37 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:系统管理类 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Data +@ToString +public class UpdateSystemRequestDTO { + + /** 主键ID **/ + private Long id; + /** 系统名称 **/ + private String systemName; + /** 系统标示 **/ + private String systemCode; + /** 系统域名 **/ + private String systemUrl; + /** 系统图标 **/ + private String systemPicUrl; + /** 系统技术负责人 **/ + private Long tecAdminUserId; + /** 系统业务负责人 **/ + private Long busAdminUserId; + /** 系统当前所在部门 **/ + private Long departmentId; + /** 系统模块列表 **/ + /** private List moduleBOList **/; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/UpdateUserGroupRequestDTO.java b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/UpdateUserGroupRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..59e01cf369df25decdcf4986168cc3dc360e1ca7 --- /dev/null +++ b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/UpdateUserGroupRequestDTO.java @@ -0,0 +1,33 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:用户组类 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Data +@ToString +public class UpdateUserGroupRequestDTO { + + /** 主键ID **/ + private Long id; + /** 组名 **/ + private String groupName; + /** 组编码 **/ + private String groupCode; + /** 用户组状态 **/ + private Integer status; + /** 组内用户列表 **/ + /** private List userList **/; + /** 用户组对应的角色列表 **/ + /** private List roleList **/; + /** 用户组对应角色组列表 **/ + /** private List roleGroupList **/; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/UserGroupResponseDTO.java b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/UserGroupResponseDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..d4b7a88323057f8fe229409be9a4cba74b7da881 --- /dev/null +++ b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/UserGroupResponseDTO.java @@ -0,0 +1,33 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:用户组类 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Data +@ToString +public class UserGroupResponseDTO { + + /** 主键ID **/ + private Long id; + /** 组名 **/ + private String groupName; + /** 组编码 **/ + private String groupCode; + /** 用户组状态 **/ + private Integer status; + /** 组内用户列表 **/ + /** private List userList **/; + /** 用户组对应的角色列表 **/ + /** private List roleList **/; + /** 用户组对应角色组列表 **/ + /** private List roleGroupList **/; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/enums/AuthorityTypeEnum.java b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/enums/AuthorityTypeEnum.java new file mode 100644 index 0000000000000000000000000000000000000000..b21b7cfae3977cd8490b0146c07295766b0ac850 --- /dev/null +++ b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/enums/AuthorityTypeEnum.java @@ -0,0 +1,45 @@ +package com.coderman.infosys.auth.api.enums; + +import lombok.Getter; + + /** + * @Description:权限类型类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Getter +public enum AuthorityTypeEnum{ + + /** + * + */ + DATA(1,"数据字段权限"), + FUNCATION(2,"菜单功能权限"), + ADMINISTRATION(3,"行政权限"), + CUSTOMIZE(4,"自定义权限"), + ; + + /** 权限类型code **/ + private Integer code; + /** 权限类型描述 **/ + private String desc; + + + AuthorityTypeEnum(Integer code,String desc){ + this.code = code; + this.desc = desc; + } + + + + /** + * + * @Description:static + * @return AuthorityTypeEnum + */ + public static AuthorityTypeEnum getByCode(Integer code){ + return null; + } + +} \ No newline at end of file diff --git a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/facade/AuthorityFacade.java b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/facade/AuthorityFacade.java new file mode 100644 index 0000000000000000000000000000000000000000..cb52c66b943952fb97b46669f272f19bc9dba682 --- /dev/null +++ b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/facade/AuthorityFacade.java @@ -0,0 +1,49 @@ +package com.coderman.infosys.auth.api.facade; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.api.dto.CreateAuthorityRequestDTO; +import com.coderman.infosys.auth.api.dto.AuthorityResponseDTO; + + +/** +* @Description:接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +public interface AuthorityFacade{ + + /** + * + * @Description 判断用户有没有访问某系统的权限 + * @param userId + * @param systemCode + * @return ResultDataDto + */ + ResultDataDto checkUserSystemAuth(Long userId,String systemCode); + + /** + * + * @Description 根据用户和系统获取系统权限信息 + * @param userId + * @param systemCode + * @return ResultDataDto + */ + ResultDataDto getUserSystemAuth(Long userId,String systemCode); + + /** + * + * @Description 根据权限code获取权限信息 + * @param authCode + * @return ResultDataDto + */ + ResultDataDto getByCode(String authCode); + + /** + * + * @Description 保存权限信息 + * @param createAuthorityRequestDTO + * @return ResultDataDto + */ + ResultDataDto saveAuthority(CreateAuthorityRequestDTO createAuthorityRequestDTO); +} \ No newline at end of file diff --git a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/facade/DataAuthorityFacade.java b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/facade/DataAuthorityFacade.java new file mode 100644 index 0000000000000000000000000000000000000000..8db672415336d9c2c1b78bd239223c700cb8e1d0 --- /dev/null +++ b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/facade/DataAuthorityFacade.java @@ -0,0 +1,32 @@ +package com.coderman.infosys.auth.api.facade; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.api.dto.CreateDataAuthorityRequestDTO; +import com.coderman.infosys.auth.api.dto.DataAuthorityResponseDTO; +import com.coderman.infosys.auth.api.dto.AuthorityResponseDTO; + + +/** +* @Description:接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +public interface DataAuthorityFacade{ + + /** + * + * @Description 获取权限信息 + * @param authCode + * @return ResultDataDto + */ + ResultDataDto getByCode(String authCode); + + /** + * + * @Description 保存权限信息 + * @param createDataAuthorityRequestDTO + * @return ResultDataDto + */ + ResultDataDto saveAuthority(CreateDataAuthorityRequestDTO createDataAuthorityRequestDTO); +} \ No newline at end of file diff --git a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/facade/MenuFacade.java b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/facade/MenuFacade.java new file mode 100644 index 0000000000000000000000000000000000000000..f21544b708d4965d2de4216f13d12b98113e0c65 --- /dev/null +++ b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/facade/MenuFacade.java @@ -0,0 +1,12 @@ +package com.coderman.infosys.auth.api.facade; + + + +/** +* @Description:接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +public interface MenuFacade{ +} \ No newline at end of file diff --git a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/facade/ModuleFacade.java b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/facade/ModuleFacade.java new file mode 100644 index 0000000000000000000000000000000000000000..1d6351851675d1794c6fe6cd973cfda9d5bcdf83 --- /dev/null +++ b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/facade/ModuleFacade.java @@ -0,0 +1,12 @@ +package com.coderman.infosys.auth.api.facade; + + + +/** +* @Description:接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +public interface ModuleFacade{ +} \ No newline at end of file diff --git a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/facade/RoleFacade.java b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/facade/RoleFacade.java new file mode 100644 index 0000000000000000000000000000000000000000..20d83d613b05ce953d1e8952bc92713758d64e93 --- /dev/null +++ b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/facade/RoleFacade.java @@ -0,0 +1,22 @@ +package com.coderman.infosys.auth.api.facade; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.api.dto.RoleResponseDTO; + + +/** +* @Description:接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +public interface RoleFacade{ + + /** + * + * @Description 获取角色详情 + * @param roleCode + * @return ResultDataDto + */ + ResultDataDto getByRoleCode(String roleCode); +} \ No newline at end of file diff --git a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/facade/RoleGroupFacade.java b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/facade/RoleGroupFacade.java new file mode 100644 index 0000000000000000000000000000000000000000..2243716d418244215c667065019c321b31f76019 --- /dev/null +++ b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/facade/RoleGroupFacade.java @@ -0,0 +1,22 @@ +package com.coderman.infosys.auth.api.facade; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.api.dto.RoleGroupResponseDTO; + + +/** +* @Description:接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +public interface RoleGroupFacade{ + + /** + * + * @Description 获取学生信息 + * @param number + * @return ResultDataDto + */ + ResultDataDto getByNumber(String number); +} \ No newline at end of file diff --git a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/facade/SystemAuthorityFacade.java b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/facade/SystemAuthorityFacade.java new file mode 100644 index 0000000000000000000000000000000000000000..18cc389785453cea4ddb45fe13ee8d8136ccf69a --- /dev/null +++ b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/facade/SystemAuthorityFacade.java @@ -0,0 +1,23 @@ +package com.coderman.infosys.auth.api.facade; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.api.dto.SystemAuthorityResponseDTO; +import com.coderman.infosys.auth.api.dto.AuthorityResponseDTO; + + +/** +* @Description:接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +public interface SystemAuthorityFacade{ + + /** + * + * @Description 获取权限信息 + * @param authCode + * @return ResultDataDto + */ + ResultDataDto getByCode(String authCode); +} \ No newline at end of file diff --git a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/facade/SystemFacade.java b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/facade/SystemFacade.java new file mode 100644 index 0000000000000000000000000000000000000000..730d93e51e30561dabc892f2725c2e967861a89d --- /dev/null +++ b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/facade/SystemFacade.java @@ -0,0 +1,57 @@ +package com.coderman.infosys.auth.api.facade; + +import com.coderman.utils.response.PageDTO; +import java.util.List; +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.api.dto.UpdateSystemRequestDTO; +import com.coderman.infosys.auth.api.dto.SystemDTO; + + +/** +* @Description:接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +public interface SystemFacade{ + + /** + * + * @Description 注册系统 + * @param systemDTO + * @return ResultDataDto + */ + ResultDataDto registSystem(SystemDTO systemDTO); + + /** + * + * @Description 分页获取系统信息 + * @param pageDto + * @return ResultDataDto> + */ + ResultDataDto> getPageList(PageDTO pageDto); + + /** + * + * @Description 获取单条系统信息 + * @param systemCode + * @return ResultDataDto + */ + ResultDataDto getBySystemCode(String systemCode); + + /** + * + * @Description 修改系统信息 + * @param dto + * @return ResultDataDto + */ + ResultDataDto updateSystem(UpdateSystemRequestDTO dto); + + /** + * + * @Description 搜索获取系统信息 + * @param search + * @return ResultDataDto> + */ + ResultDataDto> getSearchList(String search); +} \ No newline at end of file diff --git a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/facade/UserGroupFacade.java b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/facade/UserGroupFacade.java new file mode 100644 index 0000000000000000000000000000000000000000..ac208de6bea1691a51717b54fd443578dd6c28cc --- /dev/null +++ b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/facade/UserGroupFacade.java @@ -0,0 +1,23 @@ +package com.coderman.infosys.auth.api.facade; + +import com.coderman.infosys.auth.api.dto.UserGroupResponseDTO; +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.api.dto.CreateUserGroupRequestDTO; + + +/** +* @Description:接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +public interface UserGroupFacade{ + + /** + * + * @Description 创建用户组 + * @param createUserGroupRequestDTO + * @return ResultDataDto + */ + ResultDataDto createUserGroup(CreateUserGroupRequestDTO createUserGroupRequestDTO); +} \ No newline at end of file diff --git a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/facade/UserGroupQueryFacade.java b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/facade/UserGroupQueryFacade.java new file mode 100644 index 0000000000000000000000000000000000000000..30b92f5578aebeaa7807b581afc0838ee39ef729 --- /dev/null +++ b/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/facade/UserGroupQueryFacade.java @@ -0,0 +1,22 @@ +package com.coderman.infosys.auth.api.facade; + +import com.coderman.infosys.auth.api.dto.UserGroupResponseDTO; +import com.coderman.utils.response.ResultDataDto; + + +/** +* @Description:接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +public interface UserGroupQueryFacade{ + + /** + * + * @Description 获取用户组信息 + * @param groupCode + * @return ResultDataDto + */ + ResultDataDto getByGroupCode(String groupCode); +} \ No newline at end of file diff --git a/codemaker-cola/cola-domain/pom.xml b/codemaker-cola/cola-domain/pom.xml index 26d5b69f3e956ef8275446eebc38c42dfe1027a9..3e2db3053ed576f5cd1981b8c420ad239d7df514 100644 --- a/codemaker-cola/cola-domain/pom.xml +++ b/codemaker-cola/cola-domain/pom.xml @@ -42,6 +42,12 @@ org.springframework spring-context + + + com.coderman.utils + coderman-utils + 1.0.4-SNAPSHOT + diff --git a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/AdminAuthorityBO.java b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/AdminAuthorityBO.java new file mode 100644 index 0000000000000000000000000000000000000000..57d612d51ca1a04c3b23870072ff75c3a508004f --- /dev/null +++ b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/AdminAuthorityBO.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.domain.bo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:行政权限类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class AdminAuthorityBO extends AuthorityBO{ + + + /** 权限编码标示 **/ + private String authCode; + + /** 组织部门 **/ + private Long departmentId; + + /** 城市 **/ + private Long cityId; + + /** 职位 **/ + private Long jobId; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/AuthAggregateBO.java b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/AuthAggregateBO.java new file mode 100644 index 0000000000000000000000000000000000000000..e5220043ebeabe0b91c2553d569ee27b8faf112d --- /dev/null +++ b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/AuthAggregateBO.java @@ -0,0 +1,38 @@ +package com.coderman.infosys.auth.domain.bo; + +import java.util.List; + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:权限聚合根类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class AuthAggregateBO { + + + /** 系统权 **/ + public List systemBOList; + + /** 菜单权 **/ + public List moduleBOList; + + /** 按钮权 **/ + public List menuBOList; + + /** 城市权 **/ + public List cityIdList; + + /** 部门权 **/ + public List departmentIdList; + + /** 数据字段权 **/ + public List dataColumnBOList; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/AuthorityBO.java b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/AuthorityBO.java new file mode 100644 index 0000000000000000000000000000000000000000..e5d7fa0d1b296d8a32d31bb5ae8de85658fed49b --- /dev/null +++ b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/AuthorityBO.java @@ -0,0 +1,47 @@ +package com.coderman.infosys.auth.domain.bo; + +import java.util.List; + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:权限类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class AuthorityBO { + + + /** 主键ID **/ + private Long id; + + /** 权限编码标示 **/ + private String authCode; + + /** 权限类型 **/ + private Integer authorityType; + + /** 关联角色 **/ + private String roleCode; + + /** 关联角色组 **/ + private String roleGroupCode; + + /** 数据字段权限列表 **/ + private List dataAuthorityBOList; + + /** 系统菜单权限列表 **/ + private List systemAuthorityBOList; + + /** 行政权限列表 **/ + private List adminAuthorityBOList; + + /** 权限状态 **/ + private Integer status; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/AuthorityUpdateRequestBO.java b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/AuthorityUpdateRequestBO.java new file mode 100644 index 0000000000000000000000000000000000000000..0859a0cfd2a5a04adc5b8fea2c76682463fcf3b9 --- /dev/null +++ b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/AuthorityUpdateRequestBO.java @@ -0,0 +1,22 @@ +package com.coderman.infosys.auth.domain.bo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:权限更新请求实体类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class AuthorityUpdateRequestBO { + + + /** 权限编码标示 **/ + private String authCode; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/BasicOperateBO.java b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/BasicOperateBO.java new file mode 100644 index 0000000000000000000000000000000000000000..487b0213fc4a6198c8491ed81c678a54e8173fc8 --- /dev/null +++ b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/BasicOperateBO.java @@ -0,0 +1,32 @@ +package com.coderman.infosys.auth.domain.bo; + +import java.util.Date; + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:数据操作信息类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class BasicOperateBO { + + + /** 修改时 **/ + public Date dateUpdate; + + /** 创建时 **/ + public Date dateCreate; + + /** 修改 **/ + public Long updateUserId; + + /** 创建 **/ + public Long createUserId; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/DataAuthorityBO.java b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/DataAuthorityBO.java new file mode 100644 index 0000000000000000000000000000000000000000..169596f8e70cdb2be10f9fd3ac0bf4ccd05d42d3 --- /dev/null +++ b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/DataAuthorityBO.java @@ -0,0 +1,28 @@ +package com.coderman.infosys.auth.domain.bo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:数据字段权限类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class DataAuthorityBO extends AuthorityBO { + + + /** 主键ID **/ + private Long id; + + /** 权限编码标示 **/ + private String authCode; + + /** 数据字段ID **/ + private Long dataColumnId; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/DataColumnBO.java b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/DataColumnBO.java new file mode 100644 index 0000000000000000000000000000000000000000..290748d163911176fd3935b6e16ce3499b43cdd7 --- /dev/null +++ b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/DataColumnBO.java @@ -0,0 +1,43 @@ +package com.coderman.infosys.auth.domain.bo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:数据字段实体类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class DataColumnBO { + + + /** 主键ID **/ + private Long id; + + /** 主键ID **/ + private Long id; + + /** 数据库业务系统名称 **/ + private String busDataBase; + + /** 数据库表名称 **/ + private String tableName; + + /** 数据库表描述 **/ + private String tableDesc; + + /** 数据库字段名称 **/ + private String columnName; + + /** 数据库字段描述 **/ + private String columnDesc; + + /** 业务字段名称 **/ + private String fieldName; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/MenuBO.java b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/MenuBO.java new file mode 100644 index 0000000000000000000000000000000000000000..65b21fe4f50bda275673c277ac1da685309a1c30 --- /dev/null +++ b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/MenuBO.java @@ -0,0 +1,37 @@ +package com.coderman.infosys.auth.domain.bo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:按钮管理类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class MenuBO { + + + /** 主键ID **/ + private Long id; + + /** 按钮名称 **/ + private String menuName; + + /** 按钮编码 **/ + private String menuCode; + + /** 按钮链接 **/ + private String menuUrl; + + /** 系统编码 **/ + private String systemCode; + + /** 菜单编码 **/ + private String moduleCode; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/ModuleBO.java b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/ModuleBO.java new file mode 100644 index 0000000000000000000000000000000000000000..98cc7bfc6127383953f17981207bd9848c8573e6 --- /dev/null +++ b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/ModuleBO.java @@ -0,0 +1,38 @@ +package com.coderman.infosys.auth.domain.bo; + +import java.util.List; + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:菜单/模块管理类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class ModuleBO { + + + /** 主键ID **/ + private Long id; + + /** 菜单名称 **/ + private String moduleName; + + /** 菜单编码 **/ + private String moduleCode; + + /** 菜单链接 **/ + private String moduleUrl; + + /** 系统标示 **/ + private String systemCode; + + /** 按钮列表 **/ + private List menuBOList; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/OperateDateBO.java b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/OperateDateBO.java new file mode 100644 index 0000000000000000000000000000000000000000..6a14a8b70d486357a27abe0d7c54a7efc9c91a08 --- /dev/null +++ b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/OperateDateBO.java @@ -0,0 +1,26 @@ +package com.coderman.infosys.auth.domain.bo; + +import java.util.Date; + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:操作时间信息类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class OperateDateBO { + + + /** 修改时 **/ + public Date dateUpdate; + + /** 修改 **/ + public Long updateUserId; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/OperatorBO.java b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/OperatorBO.java new file mode 100644 index 0000000000000000000000000000000000000000..e9e4b8b135531f6cc14cb8563268e2506f1085af --- /dev/null +++ b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/OperatorBO.java @@ -0,0 +1,26 @@ +package com.coderman.infosys.auth.domain.bo; + +import java.util.Date; + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:操作人信息类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class OperatorBO { + + + /** 创建时 **/ + public Date dateCreate; + + /** 创建 **/ + public Long createUserId; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/RoleAuthAggregateBO.java b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/RoleAuthAggregateBO.java new file mode 100644 index 0000000000000000000000000000000000000000..5bd72cb35df55d258bf367fc3fa81cf20e631880 --- /dev/null +++ b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/RoleAuthAggregateBO.java @@ -0,0 +1,22 @@ +package com.coderman.infosys.auth.domain.bo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:角色权限聚合根类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class RoleAuthAggregateBO extends AuthAggregateBO{ + + + /** 角色ID **/ + private Long roleId; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/RoleBO.java b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/RoleBO.java new file mode 100644 index 0000000000000000000000000000000000000000..ede8da806f9cacfd222d648dd728a514eb7f6c3f --- /dev/null +++ b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/RoleBO.java @@ -0,0 +1,35 @@ +package com.coderman.infosys.auth.domain.bo; + +import java.util.List; + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:角色类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class RoleBO { + + + /** 主键ID **/ + private Long id; + + /** 角色名称 **/ + private String roleName; + + /** 角色编码 **/ + private String roleCode; + + /** 角色对应用户列表 **/ + private List userList; + + /** 角色状态 **/ + private Integer status; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/RoleGroupBO.java b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/RoleGroupBO.java new file mode 100644 index 0000000000000000000000000000000000000000..d548ba238471ecf2d229589b2e1b52c81f59ab40 --- /dev/null +++ b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/RoleGroupBO.java @@ -0,0 +1,35 @@ +package com.coderman.infosys.auth.domain.bo; + +import java.util.List; + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:角色组类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class RoleGroupBO { + + + /** 主键ID **/ + private Long id; + + /** 角色组名称 **/ + private String roleName; + + /** 角色组编码 **/ + private String roleCode; + + /** 组内角色列表 **/ + private List roleList; + + /** 角色状态 **/ + private Integer status; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/SystemAuthorityBO.java b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/SystemAuthorityBO.java new file mode 100644 index 0000000000000000000000000000000000000000..0ec94ba835d8649538a4e9d9b0da8d46617171c4 --- /dev/null +++ b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/SystemAuthorityBO.java @@ -0,0 +1,37 @@ +package com.coderman.infosys.auth.domain.bo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:系统菜单权限类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class SystemAuthorityBO extends AuthorityBO{ + + + /** 主键ID **/ + private Long id; + + /** 权限编码标示 **/ + private String authCode; + + /** 业务数据系统标示 **/ + private String systemName; + + /** 功能 **/ + private String funcName; + + /** 菜单 **/ + private String categoryName; + + /** 按钮 **/ + private String menuName; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/SystemBO.java b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/SystemBO.java new file mode 100644 index 0000000000000000000000000000000000000000..2c23b112a2f165c1a52d9fd0a97316204b83cd91 --- /dev/null +++ b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/SystemBO.java @@ -0,0 +1,47 @@ +package com.coderman.infosys.auth.domain.bo; + +import java.util.List; + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:系统管理类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class SystemBO { + + + /** 主键ID **/ + private Long id; + + /** 系统名称 **/ + private String systemName; + + /** 系统标示 **/ + private String systemCode; + + /** 系统域名 **/ + private String systemUrl; + + /** 系统图标 **/ + private String systemPicUrl; + + /** 系统技术负责人 **/ + private Long tecAdminUserId; + + /** 系统业务负责人 **/ + private Long busAdminUserId; + + /** 系统当前所在部门 **/ + private Long departmentId; + + /** 系统模块列表 **/ + private List moduleBOList; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/SystemConfig.java b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/SystemConfig.java new file mode 100644 index 0000000000000000000000000000000000000000..99d7b76be699cbc56a4121061790afd8ad519b85 --- /dev/null +++ b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/SystemConfig.java @@ -0,0 +1,25 @@ +package com.coderman.infosys.auth.domain.bo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:系统设置类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class SystemConfig { + + /** 变量名 **/ + private String varName; + /** 变量描述 **/ + private String varDesc; + /** 变量值 **/ + private String value; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/UserAuthAggregateBO.java b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/UserAuthAggregateBO.java new file mode 100644 index 0000000000000000000000000000000000000000..b1a1c09b176f8331101f9a393bbd84409303febf --- /dev/null +++ b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/UserAuthAggregateBO.java @@ -0,0 +1,22 @@ +package com.coderman.infosys.auth.domain.bo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:用户权限聚合根类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class UserAuthAggregateBO extends AuthAggregateBO{ + + + /** 用户ID **/ + private Long userId; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/UserBO.java b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/UserBO.java new file mode 100644 index 0000000000000000000000000000000000000000..07976631d111aa9062549e2cdf31cb81bac37431 --- /dev/null +++ b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/UserBO.java @@ -0,0 +1,32 @@ +package com.coderman.infosys.auth.domain.bo; + +import java.util.List; + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:用户信息类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class UserBO { + + + /** 用户名 **/ + private String userName; + + /** 用户ID **/ + private Long userId; + + /** 用户对应角色列表 **/ + private List userList; + + /** 用户对应角色组列表 **/ + private List userList; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/UserGroupBO.java b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/UserGroupBO.java new file mode 100644 index 0000000000000000000000000000000000000000..79b45d14227e3cf181dff84f02338f07b88f2c41 --- /dev/null +++ b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/UserGroupBO.java @@ -0,0 +1,41 @@ +package com.coderman.infosys.auth.domain.bo; + +import java.util.List; + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:用户组类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class UserGroupBO { + + + /** 主键ID **/ + private Long id; + + /** 组名 **/ + private String groupName; + + /** 组编码 **/ + private String groupCode; + + /** 组内用户列表 **/ + private List userList; + + /** 用户组状态 **/ + private Integer status; + + /** 用户组对应的角色列表 **/ + private List roleList; + + /** 用户组对应角色组列表 **/ + private List roleGroupList; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/enums/AuthorityTypeEnum.java b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/enums/AuthorityTypeEnum.java new file mode 100644 index 0000000000000000000000000000000000000000..5f43baedf12df71867867581802092cec63d8a42 --- /dev/null +++ b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/enums/AuthorityTypeEnum.java @@ -0,0 +1,45 @@ +package com.coderman.infosys.auth.domain.enums; + +import lombok.Getter; + + /** + * @Description:权限类型类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Getter +public enum AuthorityTypeEnum{ + + /** + * + */ + DATA(1,"数据字段权限"), + FUNCATION(2,"菜单功能权限"), + ADMINISTRATION(3,"行政权限"), + CUSTOMIZE(4,"自定义权限"), + ; + + /** 权限类型code **/ + private Integer code; + /** 权限类型描述 **/ + private String desc; + + + AuthorityTypeEnum(Integer code,String desc){ + this.code = code; + this.desc = desc; + } + + + + /** + * + * @Description:static + * @return AuthorityTypeEnum + */ + public static AuthorityTypeEnum getByCode(Integer code){ + return null; + } + +} \ No newline at end of file diff --git a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/event/BaseEvent.java b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/event/BaseEvent.java new file mode 100644 index 0000000000000000000000000000000000000000..ccfc635c4f347200e73a5427bd2d99e201937b91 --- /dev/null +++ b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/event/BaseEvent.java @@ -0,0 +1,18 @@ +package com.coderman.infosys.auth.domain.event; + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:事件基类类 + * @Author: + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class BaseEvent{ + + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/event/MenuChangeEvent.java b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/event/MenuChangeEvent.java new file mode 100644 index 0000000000000000000000000000000000000000..b6cb5ca7511c6681e76caba5b14b92b019270fce --- /dev/null +++ b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/event/MenuChangeEvent.java @@ -0,0 +1,25 @@ +package com.coderman.infosys.auth.domain.event; + +import com.coderman.infosys.auth.domain.bo.MenuBO; +import lombok.Data; +import lombok.ToString; + + /** + * @Description:按钮信息变更事件类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class MenuChangeEvent{ + + /** 按钮code **/ + private String menuCode; + /** 变更事件类型 **/ + private Integer changeEventType; + /** 按钮内容 **/ + private MenuBO menuBO; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/event/RoleAuthChangeEvent.java b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/event/RoleAuthChangeEvent.java new file mode 100644 index 0000000000000000000000000000000000000000..066c3c2ff0c4e6be85cd64ba5106bbad2fe5837f --- /dev/null +++ b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/event/RoleAuthChangeEvent.java @@ -0,0 +1,27 @@ +package com.coderman.infosys.auth.domain.event; + +import com.coderman.infosys.auth.domain.bo.RoleBO; +import lombok.Data; +import lombok.ToString; + + /** + * @Description:角色授权变更事件类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class RoleAuthChangeEvent{ + + /** 角色code **/ + private String roleCode; + /** 权限code **/ + private String authCode; + /** 变更事件类型 **/ + private Integer changeEventType; + /** 角色内容 **/ + private RoleBO roleBO; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/event/RoleChangeEvent.java b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/event/RoleChangeEvent.java new file mode 100644 index 0000000000000000000000000000000000000000..7a7e95dd9bd7cc609e309224d149a950a0101d62 --- /dev/null +++ b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/event/RoleChangeEvent.java @@ -0,0 +1,25 @@ +package com.coderman.infosys.auth.domain.event; + +import com.coderman.infosys.auth.domain.bo.RoleBO; +import lombok.Data; +import lombok.ToString; + + /** + * @Description:角色变更事件类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class RoleChangeEvent{ + + /** 角色code **/ + private String roleCode; + /** 变更事件类型 **/ + private Integer changeEventType; + /** 角色内容 **/ + private RoleBO roleBO; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/factory/AuthorityFactory.java b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/factory/AuthorityFactory.java new file mode 100644 index 0000000000000000000000000000000000000000..0116b276dc57477695c83dffd4f71d16c8695a07 --- /dev/null +++ b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/factory/AuthorityFactory.java @@ -0,0 +1,43 @@ +package com.coderman.infosys.auth.domain.factory; + +import com.coderman.infosys.auth.domain.bo.AuthorityBO; +import com.coderman.infosys.auth.domain.bo.UserAuthAggregateBO; +import com.coderman.infosys.auth.domain.bo.AuthAggregateBO; + +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; + + /** + * @Description:AuthorityFactory类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Service +public class AuthorityFactory{ + + + + /** + * + * @Description 基于权限本身的维度-权限编码构建权限模 + * @param authorityCode + * @return AuthorityBO + */ + public AuthorityBO buildAuthorityByCode(String authorityCode){ + + return null; + } + + /** + * + * @Description 基于用户的维度构建权限模 + * @param roleCode + * @return UserAuthAggregateBO + */ + public UserAuthAggregateBO buildAuthorityWithRoleCode(String roleCode){ + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/gataway/AuthorityRepository.java b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/gataway/AuthorityRepository.java new file mode 100644 index 0000000000000000000000000000000000000000..d794044a705b6d30ea7ff1d8a20e162d3499bfc9 --- /dev/null +++ b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/gataway/AuthorityRepository.java @@ -0,0 +1,54 @@ +package com.coderman.infosys.auth.domain.gataway; + +import com.coderman.infosys.auth.domain.bo.AuthorityBO; +import com.coderman.infosys.auth.domain.bo.AuthorityUpdateRequestBO; + + +/** + * @Description:权限管理仓库接口 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +public interface AuthorityRepository{ + + /** + * + * @Description 给角色构建权限 + * @param authorityBO + * @return Boolean + */ + Boolean buildAuthority(AuthorityBO authorityBO); + + /** + * + * @Description 给角色更新权限 + * @param authorityUpdateRequestBO + * @return Boolean + */ + Boolean updateAuthority(AuthorityUpdateRequestBO authorityUpdateRequestBO); + + /** + * + * @Description 根据权限code禁用权限资源 + * @param authorityCode + * @return Boolean + */ + Boolean disableAuthority(String authorityCode); + + /** + * + * @Description 根据权限code查询权限资源 + * @param authorityCode + * @return AuthorityBO + */ + AuthorityBO getByCode(String authorityCode); + + /** + * + * @Description 根据角色code查询权限资源 + * @param roleCode + * @return AuthorityBO + */ + AuthorityBO getByRoleCode(String roleCode); +} \ No newline at end of file diff --git a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/gataway/DataColumnGataWay.java b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/gataway/DataColumnGataWay.java new file mode 100644 index 0000000000000000000000000000000000000000..494f58c27d29a8f85ae2a18b3faf3c4261788913 --- /dev/null +++ b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/gataway/DataColumnGataWay.java @@ -0,0 +1,63 @@ +package com.coderman.infosys.auth.domain.gataway; + +import java.util.List; +import com.coderman.utils.commonbo.PageBO; +import com.coderman.infosys.auth.domain.bo.DataColumnBO; + + +/** + * @Description:数据字段管理网关接口 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +public interface DataColumnGataWay{ + + /** + * + * @Description 保存数据字段 + * @param dataColumnBO + * @return Long + */ + Long saveDataColumn(DataColumnBO dataColumnBO); + + /** + * + * @Description 批量保存保存数据字段 + * @param list + * @return Boolean + */ + Boolean saveBatchDataColumn(List list); + + /** + * + * @Description 更新数据字段 + * @param dataColumnBO + * @return Long + */ + Long updateDataColumn(DataColumnBO dataColumnBO); + + /** + * + * @Description 根据ID查询数据字段详情 + * @param id + * @return DataColumnBO + */ + DataColumnBO getById(Long id); + + /** + * + * @Description 根据数据库名称获取字段元数据内容 + * @param busDataBase + * @return List + */ + List getByDBCode(String busDataBase); + + /** + * + * @Description 分页查询数据字段内容 + * @param pageBO + * @return List + */ + List getPageList(PageBO pageBO); +} \ No newline at end of file diff --git a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/gataway/SystemModuleQueryGataWay.java b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/gataway/SystemModuleQueryGataWay.java new file mode 100644 index 0000000000000000000000000000000000000000..527489412ba693d15eaa73942f5e2aa6085740f5 --- /dev/null +++ b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/gataway/SystemModuleQueryGataWay.java @@ -0,0 +1,88 @@ +package com.coderman.infosys.auth.domain.gataway; + +import java.util.List; +import com.coderman.infosys.auth.domain.bo.MenuBO; +import com.coderman.utils.commonbo.PageBO; +import com.coderman.infosys.auth.domain.bo.SystemBO; +import com.coderman.infosys.auth.domain.bo.ModuleBO; + + +/** + * @Description:系统菜单按钮查询服务接口 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +public interface SystemModuleQueryGataWay{ + + /** + * + * @Description 分页查询系统列表 + * @param pageBO + * @return List + */ + List querySystemPage(PageBO pageBO); + + /** + * + * @Description 分页查询菜单列表 + * @return List + */ + List queryModulePage(); + + /** + * + * @Description 基于系统code查询菜单和按钮 + * @param systemCode + * @return SystemBO + */ + SystemBO queryBySystemCode(String systemCode); + + /** + * + * @Description 根据条件查询系统 + * @param search + * @return List + */ + List queryByCondition(String search); + + /** + * + * @Description 查询所有系统菜单和按钮 + * @param search + * @return List + */ + List queryWithAll(String search); + + /** + * + * @Description 根据code查询系统详情 + * @param systemCode + * @return SystemBO + */ + SystemBO getSystemByCode(String systemCode); + + /** + * + * @Description 根据code查询菜单详情 + * @param moduleCode + * @return ModuleBO + */ + ModuleBO getModuleByCode(String moduleCode); + + /** + * + * @Description 根据code查询按钮详情 + * @param menuCode + * @return MenuBO + */ + MenuBO getMenu(String menuCode); + + /** + * + * @Description 根据系统名称查询 + * @param systemName + * @return List + */ + List getSystemByName(String systemName); +} \ No newline at end of file diff --git a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/gataway/SystemModuleRepository.java b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/gataway/SystemModuleRepository.java new file mode 100644 index 0000000000000000000000000000000000000000..679943004929e7a2881aaaddd2e55489376aab96 --- /dev/null +++ b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/gataway/SystemModuleRepository.java @@ -0,0 +1,63 @@ +package com.coderman.infosys.auth.domain.gataway; + +import com.coderman.infosys.auth.domain.bo.MenuBO; +import com.coderman.infosys.auth.domain.bo.SystemBO; +import com.coderman.infosys.auth.domain.bo.ModuleBO; + + +/** + * @Description:系统菜单按钮仓库服务接口 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +public interface SystemModuleRepository{ + + /** + * + * @Description 创建系统信息 + * @param systemBO + * @return Long + */ + Long saveSystem(SystemBO systemBO); + + /** + * + * @Description 更新系统信息 + * @param systemBO + * @return Integer + */ + Integer updateSystem(SystemBO systemBO); + + /** + * + * @Description 创建菜单信息 + * @param moduleBO + * @return Long + */ + Long saveModule(ModuleBO moduleBO); + + /** + * + * @Description 更新菜单信息 + * @param moduleBO + * @return Integer + */ + Integer updateModule(ModuleBO moduleBO); + + /** + * + * @Description 创建按钮信息 + * @param moduleBO + * @return Long + */ + Long saveMenu(MenuBO moduleBO); + + /** + * + * @Description 更新按钮信息 + * @param moduleBO + * @return Integer + */ + Integer updateMenu(MenuBO moduleBO); +} \ No newline at end of file diff --git a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/gataway/UserRoleRepository.java b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/gataway/UserRoleRepository.java new file mode 100644 index 0000000000000000000000000000000000000000..d8a0dda346506591904830c00b19e17e167582f9 --- /dev/null +++ b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/gataway/UserRoleRepository.java @@ -0,0 +1,97 @@ +package com.coderman.infosys.auth.domain.gataway; + +import java.util.List; +import com.coderman.infosys.auth.domain.bo.UserGroupBO; +import com.coderman.utils.commonbo.PageBO; +import com.coderman.infosys.auth.domain.bo.RoleBO; +import com.coderman.infosys.auth.domain.bo.RoleGroupBO; + + +/** + * @Description:用户和角色管理仓库接口 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +public interface UserRoleRepository{ + + /** + * + * @Description 保存用户组并尝试关联用户 + * @param userGroupBO + * @return Long + */ + Long saveUserGroup(UserGroupBO userGroupBO); + + /** + * + * @Description 更新用户组 + * @param userGroupBO + * @return Integer + */ + Integer updateUserGroup(UserGroupBO userGroupBO); + + /** + * + * @Description 保存角色组并尝试关联角色 + * @param roleGroupBO + * @return Long + */ + Long saveRoleGroup(RoleGroupBO roleGroupBO); + + /** + * + * @Description 更新角色组 + * @param roleGroupBO + * @return Integer + */ + Integer updateRoleGroup(RoleGroupBO roleGroupBO); + + /** + * + * @Description 保存角色 + * @param roleBO + * @return Long + */ + Long saveRole(RoleBO roleBO); + + /** + * + * @Description 更新角色 + * @param roleBO + * @return Integer + */ + Integer updateRole(RoleBO roleBO); + + /** + * + * @Description 分页获取角色 + * @param pageBO + * @return List + */ + List getPageList(PageBO pageBO); + + /** + * + * @Description 根据code查询用户组详情 + * @param userGroupCode + * @return UserGroupBO + */ + UserGroupBO getByUserGroupCode(String userGroupCode); + + /** + * + * @Description 根据code查询角色详情 + * @param roleCode + * @return RoleBO + */ + RoleBO getByRoleCode(String roleCode); + + /** + * + * @Description 根据code查询角色组详情 + * @param roleGroupCode + * @return RoleGroupBO + */ + RoleGroupBO getByRoleGroupCode(String roleGroupCode); +} \ No newline at end of file diff --git a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/msgbody/UserStatusChangeMsgBody.java b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/msgbody/UserStatusChangeMsgBody.java new file mode 100644 index 0000000000000000000000000000000000000000..559bec5a9889284fc574f196b09213166c98b497 --- /dev/null +++ b/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/msgbody/UserStatusChangeMsgBody.java @@ -0,0 +1,22 @@ +package com.coderman.infosys.auth.domain.msgbody; + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:接收用户状态变更消息类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class UserStatusChangeMsgBody{ + + /** 用户ID **/ + private Long userId; + /** 状态类型 **/ + private Integer statusType; + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/pom.xml b/codemaker-cola/cola-infrast/pom.xml index 5d141910db19e9b0b0298da9c720e4a5d9c52eb6..3cb9bf1de3b33fe847c92048809c73fb53139069 100644 --- a/codemaker-cola/cola-infrast/pom.xml +++ b/codemaker-cola/cola-infrast/pom.xml @@ -72,6 +72,12 @@ org.mapstruct mapstruct + + org.mybatis + mybatis + 3.4.6 + compile + diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/acl/AreaServiceAdapter.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/acl/AreaServiceAdapter.java new file mode 100644 index 0000000000000000000000000000000000000000..13b9975f6c44a28235cce88d55fde4adbe7f50e2 --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/acl/AreaServiceAdapter.java @@ -0,0 +1,27 @@ +package com.coderman.infosys.auth.infrast.acl; + +import java.util.List; +import com.coderman.infosys.auth.infrast.acl.res.dto.CityResponseDTO; +import com.coderman.infosys.auth.infrast.acl.res.dto.ProvinceResponseDTO; + + +/** + * @Description:省份城市查询服务适配器接口 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +public interface AreaServiceAdapter{ + /** + * + * @Description:查询所有的省份 + * @return List + */ + List queryAllProvince(); + /** + * + * @Description:查询省份下所有城市 + * @return List + */ + List queryCityByProvinceid(Long provinceId); +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/acl/DepartmentServiceAdapter.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/acl/DepartmentServiceAdapter.java new file mode 100644 index 0000000000000000000000000000000000000000..53c84b09656abcdb9735caa02135399d8171af93 --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/acl/DepartmentServiceAdapter.java @@ -0,0 +1,27 @@ +package com.coderman.infosys.auth.infrast.acl; + +import java.util.List; +import com.coderman.infosys.auth.infrast.acl.req.dto.DepartmentQueryDTO; +import com.coderman.infosys.auth.infrast.acl.res.dto.DepartmentResponseDTO; + + +/** + * @Description:部门查询服务适配器接口 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +public interface DepartmentServiceAdapter{ + /** + * + * @Description:查询所有有效的部门 + * @return List + */ + List queryAllDepartment(DepartmentQueryDTO queryDto); + /** + * + * @Description:查询子部门 + * @return List + */ + List queryDepartmentsList(Long pId); +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/acl/impl/AreaServiceAdapterImpl.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/acl/impl/AreaServiceAdapterImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..95bf81e5e6c60ef78d72fcebfc4ebd082f001b04 --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/acl/impl/AreaServiceAdapterImpl.java @@ -0,0 +1,39 @@ +package com.coderman.infosys.auth.infrast.acl.impl; + +import java.util.List; +import com.coderman.infosys.auth.infrast.acl.res.dto.CityResponseDTO; +import com.coderman.infosys.auth.infrast.acl.AreaServiceAdapter; +import com.coderman.infosys.auth.infrast.acl.res.dto.ProvinceResponseDTO; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; + + +/** + * @Description:接口实现类 + * @Author： + * @CreateTime：2021-11-07 08:23:49 + * @version v1.0 + */ +@Service +public class AreaServiceAdapterImpl implements AreaServiceAdapter{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + + @Override + public List queryAllProvince(){ + + return null; + } + + @Override + public List queryCityByProvinceid(Long provinceId){ + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/acl/impl/DepartmentServiceAdapterImpl.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/acl/impl/DepartmentServiceAdapterImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..db128b1a76f671682da73eb1477e404b281adeca --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/acl/impl/DepartmentServiceAdapterImpl.java @@ -0,0 +1,39 @@ +package com.coderman.infosys.auth.infrast.acl.impl; + +import java.util.List; +import com.coderman.infosys.auth.infrast.acl.req.dto.DepartmentQueryDTO; +import com.coderman.infosys.auth.infrast.acl.DepartmentServiceAdapter; +import com.coderman.infosys.auth.infrast.acl.res.dto.DepartmentResponseDTO; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; + + +/** + * @Description:接口实现类 + * @Author： + * @CreateTime：2021-11-07 08:23:49 + * @version v1.0 + */ +@Service +public class DepartmentServiceAdapterImpl implements DepartmentServiceAdapter{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + + @Override + public List queryAllDepartment(DepartmentQueryDTO queryDto){ + + return null; + } + + @Override + public List queryDepartmentsList(Long pId){ + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/acl/req/dto/DepartmentQueryDTO.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/acl/req/dto/DepartmentQueryDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..807e5ae815562a35871cc811b38357e3ef18279f --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/acl/req/dto/DepartmentQueryDTO.java @@ -0,0 +1,19 @@ +package com.coderman.infosys.auth.infrast.acl.req.dto; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class DepartmentQueryDTO { + + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/acl/res/dto/CityResponseDTO.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/acl/res/dto/CityResponseDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..24157b4415f085015c2f8fae4a3f8d55bf24f210 --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/acl/res/dto/CityResponseDTO.java @@ -0,0 +1,19 @@ +package com.coderman.infosys.auth.infrast.acl.res.dto; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class CityResponseDTO { + + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/acl/res/dto/DepartmentResponseDTO.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/acl/res/dto/DepartmentResponseDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..3a4634d62ca9eddf1b0f1ade89704173e2446b39 --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/acl/res/dto/DepartmentResponseDTO.java @@ -0,0 +1,19 @@ +package com.coderman.infosys.auth.infrast.acl.res.dto; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class DepartmentResponseDTO { + + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/acl/res/dto/ProvinceResponseDTO.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/acl/res/dto/ProvinceResponseDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..67032b5ff50083d4b250313e415a5a2e2086fee7 --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/acl/res/dto/ProvinceResponseDTO.java @@ -0,0 +1,19 @@ +package com.coderman.infosys.auth.infrast.acl.res.dto; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class ProvinceResponseDTO { + + + +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/AdminAuthorityDO.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/AdminAuthorityDO.java new file mode 100644 index 0000000000000000000000000000000000000000..0af0395e68b05a7b6e61547d13478df0909b6302 --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/AdminAuthorityDO.java @@ -0,0 +1,43 @@ +package com.coderman.infosys.auth.infrast.dao.dataobject; + +import java.util.Date; +import java.math.BigDecimal; +import lombok.Data; +import lombok.ToString; + + /** + * @Description:行政数据权限DO类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class AdminAuthorityDO{ + + + /** 主键 **/ + private Long id; + + /** 权限标示 **/ + private String authCode; + + /** 组织部门ID **/ + private Long departmentId; + + /** 城市权限 **/ + private Long cityId; + + /** 创建时间 **/ + private Date dateCreate; + + /** 修改时间 **/ + private Date dateUpdate; + + /** 修改人 **/ + private Long updateUserId; + + /** 创建人 **/ + private Long createUserId; + +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/AuthorityDO.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/AuthorityDO.java new file mode 100644 index 0000000000000000000000000000000000000000..880662e6488aee7abd0f325ac9ec9cc4563336d4 --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/AuthorityDO.java @@ -0,0 +1,49 @@ +package com.coderman.infosys.auth.infrast.dao.dataobject; + +import java.util.Date; +import java.math.BigDecimal; +import lombok.Data; +import lombok.ToString; + + /** + * @Description:抽象权限表DO类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class AuthorityDO{ + + + /** 主键 **/ + private Long id; + + /** 权限编码 **/ + private String authCode; + + /** 权限类型 **/ + private Integer authorityType; + + /** 关联角色编码 **/ + private String roleCode; + + /** 关联角色组 **/ + private String roleGroupCode; + + /** 权限状态 **/ + private Integer status; + + /** 创建时间 **/ + private Date dateCreate; + + /** 修改时间 **/ + private Date dateUpdate; + + /** 修改人 **/ + private Long updateUserId; + + /** 创建人 **/ + private Long createUserId; + +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/DataAuthorityDO.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/DataAuthorityDO.java new file mode 100644 index 0000000000000000000000000000000000000000..c965b8ff1318deadaa841b904558484ac11139d5 --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/DataAuthorityDO.java @@ -0,0 +1,40 @@ +package com.coderman.infosys.auth.infrast.dao.dataobject; + +import java.util.Date; +import java.math.BigDecimal; +import lombok.Data; +import lombok.ToString; + + /** + * @Description:数据字段权限DO类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class DataAuthorityDO{ + + + /** 主键 **/ + private Long id; + + /** 权限标示 **/ + private String authCode; + + /** 业务数据库标示 **/ + private String dataColumnId; + + /** 创建时间 **/ + private Date dateCreate; + + /** 修改时间 **/ + private Date dateUpdate; + + /** 修改人 **/ + private Long updateUserId; + + /** 创建人 **/ + private Long createUserId; + +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/DataColumnConfigDO.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/DataColumnConfigDO.java new file mode 100644 index 0000000000000000000000000000000000000000..0365d14d3f7099957db9ce8aa4a0235d05dc9a50 --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/DataColumnConfigDO.java @@ -0,0 +1,55 @@ +package com.coderman.infosys.auth.infrast.dao.dataobject; + +import java.util.Date; +import java.math.BigDecimal; +import lombok.Data; +import lombok.ToString; + + /** + * @Description:数据字段管理表DO类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class DataColumnConfigDO{ + + + /** 主键 **/ + private Long id; + + /** 数据库业务系统名称 **/ + private String busDatabase; + + /** 表名称 **/ + private String tableName; + + /** 表描述 **/ + private String tableDesc; + + /** 字段名称 **/ + private String columnName; + + /** 字段描述 **/ + private String columnDesc; + + /** 业务模块 **/ + private String busModel; + + /** 业务属性名称 **/ + private String fieldName; + + /** 创建时间 **/ + private Date dateCreate; + + /** 修改时间 **/ + private Date dateUpdate; + + /** 修改人 **/ + private Long updateUserId; + + /** 创建人 **/ + private Long createUserId; + +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/MenuDO.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/MenuDO.java new file mode 100644 index 0000000000000000000000000000000000000000..7bbb0dd9ea6f999299196e0b647337973f882c1b --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/MenuDO.java @@ -0,0 +1,49 @@ +package com.coderman.infosys.auth.infrast.dao.dataobject; + +import java.util.Date; +import java.math.BigDecimal; +import lombok.Data; +import lombok.ToString; + + /** + * @Description:按钮表DO类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class MenuDO{ + + + /** 主键 **/ + private Long id; + + /** 按钮名称 **/ + private String menuName; + + /** 按钮编码 **/ + private String menuCode; + + /** 所属菜单编码 **/ + private String moduleCode; + + /** 所属系统编码 **/ + private String systemCode; + + /** 菜单链接 **/ + private String moduleUrl; + + /** 创建时间 **/ + private Date dateCreate; + + /** 修改时间 **/ + private Date dateUpdate; + + /** 修改人 **/ + private Long updateUserId; + + /** 创建人 **/ + private Long createUserId; + +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/ModuleDO.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/ModuleDO.java new file mode 100644 index 0000000000000000000000000000000000000000..00c82024a8666669f090455e69b80eabec6a8ed1 --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/ModuleDO.java @@ -0,0 +1,46 @@ +package com.coderman.infosys.auth.infrast.dao.dataobject; + +import java.util.Date; +import java.math.BigDecimal; +import lombok.Data; +import lombok.ToString; + + /** + * @Description:菜单模块表DO类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class ModuleDO{ + + + /** 主键 **/ + private Long id; + + /** 菜单名称 **/ + private String moduleName; + + /** 菜单编码 **/ + private String moduleCode; + + /** 系统编码 **/ + private String systemCode; + + /** 菜单链接 **/ + private String moduleUrl; + + /** 创建时间 **/ + private Date dateCreate; + + /** 修改时间 **/ + private Date dateUpdate; + + /** 修改人 **/ + private Long updateUserId; + + /** 创建人 **/ + private Long createUserId; + +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/RoleDO.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/RoleDO.java new file mode 100644 index 0000000000000000000000000000000000000000..3683e8e201a2b74cb93d3c88c7851a8bbc7e582c --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/RoleDO.java @@ -0,0 +1,43 @@ +package com.coderman.infosys.auth.infrast.dao.dataobject; + +import java.util.Date; +import java.math.BigDecimal; +import lombok.Data; +import lombok.ToString; + + /** + * @Description:角色表DO类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class RoleDO{ + + + /** 主键 **/ + private Long id; + + /** 角色名称 **/ + private String roleName; + + /** 角色编码 **/ + private String roleCode; + + /** 角色组状态 **/ + private Long status; + + /** 创建时间 **/ + private Date dateCreate; + + /** 修改时间 **/ + private Date dateUpdate; + + /** 修改人 **/ + private Long updateUserId; + + /** 创建人 **/ + private Long createUserId; + +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/RoleGroupDO.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/RoleGroupDO.java new file mode 100644 index 0000000000000000000000000000000000000000..c3f80a67a09018d71ab487792d8544c29256e46c --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/RoleGroupDO.java @@ -0,0 +1,43 @@ +package com.coderman.infosys.auth.infrast.dao.dataobject; + +import java.util.Date; +import java.math.BigDecimal; +import lombok.Data; +import lombok.ToString; + + /** + * @Description:角色组DO类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class RoleGroupDO{ + + + /** 主键 **/ + private Long id; + + /** 角色组名 **/ + private String groupName; + + /** 角色组编码 **/ + private String groupCode; + + /** 角色列表 **/ + private String roleCodeList; + + /** 创建时间 **/ + private Date dateCreate; + + /** 修改时间 **/ + private Date dateUpdate; + + /** 修改人 **/ + private Long updateUserId; + + /** 创建人 **/ + private Long createUserId; + +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/SystemAuthorityDO.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/SystemAuthorityDO.java new file mode 100644 index 0000000000000000000000000000000000000000..17287c1d66d33956da84e2388dd9875db340ef9b --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/SystemAuthorityDO.java @@ -0,0 +1,40 @@ +package com.coderman.infosys.auth.infrast.dao.dataobject; + +import java.util.Date; +import java.math.BigDecimal; +import lombok.Data; +import lombok.ToString; + + /** + * @Description:系统菜单权限表DO类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class SystemAuthorityDO{ + + + /** 主键 **/ + private Long id; + + /** 权限标示 **/ + private String authCode; + + /** 系统编码 **/ + private String systemCode; + + /** 菜单编码 **/ + private String moduleCode; + + /** 按钮编码 **/ + private String menuCode; + + /** 创建时间 **/ + private Date dateCreate; + + /** 创建人 **/ + private Long createUserId; + +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/SystemDO.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/SystemDO.java new file mode 100644 index 0000000000000000000000000000000000000000..b5e0ac79d5a482badb1e29faee53a5d586a77ac3 --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/SystemDO.java @@ -0,0 +1,49 @@ +package com.coderman.infosys.auth.infrast.dao.dataobject; + +import java.util.Date; +import java.math.BigDecimal; +import lombok.Data; +import lombok.ToString; + + /** + * @Description:系统表DO类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class SystemDO{ + + + /** 主键 **/ + private Long id; + + /** 系统名称 **/ + private String systemName; + + /** 系统编码 **/ + private String systemCode; + + /** 系统域名 **/ + private String systemUrl; + + /** 系统图标 **/ + private String systemPicurl; + + /** 系统技术负责人 **/ + private Long tecAdminUserId; + + /** 系统业务负责人 **/ + private Long busAdminUserId; + + /** 系统所属部门 **/ + private Long departmentId; + + /** 创建时间 **/ + private Date dateCreate; + + /** 创建人 **/ + private Long createUserId; + +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/UserGroupDO.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/UserGroupDO.java new file mode 100644 index 0000000000000000000000000000000000000000..e26cae43d41525a4991dcd1457b10bc2aca1fd94 --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/UserGroupDO.java @@ -0,0 +1,46 @@ +package com.coderman.infosys.auth.infrast.dao.dataobject; + +import java.util.Date; +import java.math.BigDecimal; +import lombok.Data; +import lombok.ToString; + + /** + * @Description:用户组DO类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Data +@ToString +public class UserGroupDO{ + + + /** 主键 **/ + private Long id; + + /** 用户组名 **/ + private String groupName; + + /** 用户组编码 **/ + private String groupCode; + + /** 用户组状态 **/ + private Long status; + + /** 用户组内用户列表 **/ + private String userList; + + /** 创建时间 **/ + private Date dateCreate; + + /** 修改时间 **/ + private Date dateUpdate; + + /** 修改人 **/ + private Long updateUserId; + + /** 创建人 **/ + private Long createUserId; + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/model.bo/ClassTeacherBO.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/UserRoleMappingDO.java similarity index 35% rename from codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/model.bo/ClassTeacherBO.java rename to codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/UserRoleMappingDO.java index 9758df4ab81428ea31de92f143831f00b8e91caa..276dcade21ed05621a98ffc017083503c7ad1a6e 100644 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/model.bo/ClassTeacherBO.java +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/UserRoleMappingDO.java @@ -1,4 +1,4 @@ -package com.lightsnail.schoolmanager.core.model.bo; +package com.coderman.infosys.auth.infrast.dao.dataobject; import java.util.Date; import java.math.BigDecimal; @@ -6,23 +6,23 @@ import lombok.Data; import lombok.ToString; /** - * @Description:BO类 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 16:19:51 + * @Description:用户角色关联表DO类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 * @version v1.0 */ @Data @ToString -public class ClassTeacherBO{ +public class UserRoleMappingDO{ - /** **/ + /** 主键 **/ private Long id; - /** **/ - private Long classId; + /** 用户ID **/ + private Long userId; - /** **/ - private Long teacherId; + /** 角色code **/ + private String roleCode; } \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/AdminAuthorityMapper.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/AdminAuthorityMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..4477af52d50eeff2fe71d2bf3e222b00b7d1ddf7 --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/AdminAuthorityMapper.java @@ -0,0 +1,59 @@ +package com.coderman.infosys.auth.infrast.dao.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import com.coderman.infosys.auth.infrast.dao.dataobject.AdminAuthorityDO; +import com.coderman.infosys.auth.infrast.dao.dataobject.AuthorityDO; + + +/** +* @Description:行政数据权限接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Mapper +public interface AdminAuthorityMapper{ + + /** + * + * @Description 保存数据记录 + * @param adminAuthorityDO + * @return long + */ + long insert(@Param(value = "adminAuthorityDO") AdminAuthorityDO adminAuthorityDO); + + /** + * + * @Description 更新数据记录 + * @param adminAuthorityDO + * @return int + */ + int update(@Param(value = "adminAuthorityDO") AdminAuthorityDO adminAuthorityDO); + + /** + * + * @Description 获取所有数据记录 + * @return List + */ + List getAll(); + + /** + * + * @Description 根据ID获取单条记录 + * @param id + * @return AdminAuthorityDO + */ + AdminAuthorityDO getById(@Param(value = "id") Long id); + + /** + * + * @Description 根据ID删除单条记录 + * @param id + * @return int + */ + int deleteById(@Param(value = "id") Long id); + +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/AuthorityMapper.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/AuthorityMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..5f20e84940be3d58d95d1086ffecc7a0b7c4000a --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/AuthorityMapper.java @@ -0,0 +1,58 @@ +package com.coderman.infosys.auth.infrast.dao.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import com.coderman.infosys.auth.infrast.dao.dataobject.AuthorityDO; + + +/** +* @Description:抽象权限表接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Mapper +public interface AuthorityMapper{ + + /** + * + * @Description 保存数据记录 + * @param authorityDO + * @return long + */ + long insert(@Param(value = "authorityDO") AuthorityDO authorityDO); + + /** + * + * @Description 更新数据记录 + * @param authorityDO + * @return int + */ + int update(@Param(value = "authorityDO") AuthorityDO authorityDO); + + /** + * + * @Description 获取所有数据记录 + * @return List + */ + List getAll(); + + /** + * + * @Description 根据ID获取单条记录 + * @param id + * @return AuthorityDO + */ + AuthorityDO getById(@Param(value = "id") Long id); + + /** + * + * @Description 根据ID删除单条记录 + * @param id + * @return int + */ + int deleteById(@Param(value = "id") Long id); + +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/DataAuthorityMapper.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/DataAuthorityMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..a0845747e392d2389d50d8f75739c1caa811decd --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/DataAuthorityMapper.java @@ -0,0 +1,59 @@ +package com.coderman.infosys.auth.infrast.dao.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import com.coderman.infosys.auth.infrast.dao.dataobject.DataAuthorityDO; +import com.coderman.infosys.auth.infrast.dao.dataobject.AuthorityDO; + + +/** +* @Description:数据字段权限接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Mapper +public interface DataAuthorityMapper{ + + /** + * + * @Description 保存数据记录 + * @param dataAuthorityDO + * @return long + */ + long insert(@Param(value = "dataAuthorityDO") DataAuthorityDO dataAuthorityDO); + + /** + * + * @Description 更新数据记录 + * @param dataAuthorityDO + * @return int + */ + int update(@Param(value = "dataAuthorityDO") DataAuthorityDO dataAuthorityDO); + + /** + * + * @Description 获取所有数据记录 + * @return List + */ + List getAll(); + + /** + * + * @Description 根据ID获取单条记录 + * @param id + * @return DataAuthorityDO + */ + DataAuthorityDO getById(@Param(value = "id") Long id); + + /** + * + * @Description 根据ID删除单条记录 + * @param id + * @return int + */ + int deleteById(@Param(value = "id") Long id); + +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/DataColumnConfigMapper.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/DataColumnConfigMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..927f1775e2aea58b67d0b317f27d64924e1df0db --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/DataColumnConfigMapper.java @@ -0,0 +1,58 @@ +package com.coderman.infosys.auth.infrast.dao.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import com.coderman.infosys.auth.infrast.dao.dataobject.DataColumnConfigDO; +import java.util.List; + + +/** +* @Description:数据字段管理表接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Mapper +public interface DataColumnConfigMapper{ + + /** + * + * @Description 保存数据记录 + * @param dataColumnConfigDO + * @return long + */ + long insert(@Param(value = "dataColumnConfigDO") DataColumnConfigDO dataColumnConfigDO); + + /** + * + * @Description 更新数据记录 + * @param dataColumnConfigDO + * @return int + */ + int update(@Param(value = "dataColumnConfigDO") DataColumnConfigDO dataColumnConfigDO); + + /** + * + * @Description 获取所有数据记录 + * @return List + */ + List getAll(); + + /** + * + * @Description 根据ID获取单条记录 + * @param id + * @return DataColumnConfigDO + */ + DataColumnConfigDO getById(@Param(value = "id") Long id); + + /** + * + * @Description 根据ID删除单条记录 + * @param id + * @return int + */ + int deleteById(@Param(value = "id") Long id); + +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/MenuMapper.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/MenuMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..e092c49436c604b79ffd1db4c130d3a4b15eaee3 --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/MenuMapper.java @@ -0,0 +1,66 @@ +package com.coderman.infosys.auth.infrast.dao.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import com.coderman.infosys.auth.infrast.dao.dataobject.MenuDO; + + +/** +* @Description:按钮表接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Mapper +public interface MenuMapper{ + + /** + * + * @Description 保存数据记录 + * @param menuDO + * @return long + */ + long insert(@Param(value = "menuDO") MenuDO menuDO); + + /** + * + * @Description 更新数据记录 + * @param menuDO + * @return int + */ + int update(@Param(value = "menuDO") MenuDO menuDO); + + /** + * + * @Description 获取所有数据记录 + * @return List + */ + List getAll(); + + /** + * + * @Description 根据ID获取单条记录 + * @param id + * @return MenuDO + */ + MenuDO getById(@Param(value = "id") Long id); + + /** + * + * @Description 根据ID删除单条记录 + * @param id + * @return int + */ + int deleteById(@Param(value = "id") Long id); + + /** + * + * @Description 查询 + * @param moduleCode + * @return List + */ + List getListByModuleCode(@Param(value = "moduleCode") String moduleCode); + +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/ModuleMapper.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/ModuleMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..bb2ea4fa70469e1cb0dfcdd65fd2bf23ed4f9e6c --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/ModuleMapper.java @@ -0,0 +1,66 @@ +package com.coderman.infosys.auth.infrast.dao.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import com.coderman.infosys.auth.infrast.dao.dataobject.ModuleDO; +import java.util.List; + + +/** +* @Description:菜单模块表接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Mapper +public interface ModuleMapper{ + + /** + * + * @Description 保存数据记录 + * @param moduleDO + * @return long + */ + long insert(@Param(value = "moduleDO") ModuleDO moduleDO); + + /** + * + * @Description 更新数据记录 + * @param moduleDO + * @return int + */ + int update(@Param(value = "moduleDO") ModuleDO moduleDO); + + /** + * + * @Description 获取所有数据记录 + * @return List + */ + List getAll(); + + /** + * + * @Description 根据ID获取单条记录 + * @param id + * @return ModuleDO + */ + ModuleDO getById(@Param(value = "id") Long id); + + /** + * + * @Description 根据ID删除单条记录 + * @param id + * @return int + */ + int deleteById(@Param(value = "id") Long id); + + /** + * + * @Description 查询 + * @param moduleName + * @return List + */ + List getByName(@Param(value = "moduleName") String moduleName); + +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/RoleGroupMapper.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/RoleGroupMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..c18818335d3d688650ca6be079f79a822c7a1deb --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/RoleGroupMapper.java @@ -0,0 +1,58 @@ +package com.coderman.infosys.auth.infrast.dao.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import com.coderman.infosys.auth.infrast.dao.dataobject.RoleGroupDO; + + +/** +* @Description:角色组接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Mapper +public interface RoleGroupMapper{ + + /** + * + * @Description 保存数据记录 + * @param roleGroupDO + * @return long + */ + long insert(@Param(value = "roleGroupDO") RoleGroupDO roleGroupDO); + + /** + * + * @Description 更新数据记录 + * @param roleGroupDO + * @return int + */ + int update(@Param(value = "roleGroupDO") RoleGroupDO roleGroupDO); + + /** + * + * @Description 获取所有数据记录 + * @return List + */ + List getAll(); + + /** + * + * @Description 根据ID获取单条记录 + * @param id + * @return RoleGroupDO + */ + RoleGroupDO getById(@Param(value = "id") Long id); + + /** + * + * @Description 根据ID删除单条记录 + * @param id + * @return int + */ + int deleteById(@Param(value = "id") Long id); + +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/RoleMapper.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/RoleMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..e5c82e717023014b5c7fb06e2be86f6d59d239ec --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/RoleMapper.java @@ -0,0 +1,58 @@ +package com.coderman.infosys.auth.infrast.dao.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import com.coderman.infosys.auth.infrast.dao.dataobject.RoleDO; + + +/** +* @Description:角色表接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Mapper +public interface RoleMapper{ + + /** + * + * @Description 保存数据记录 + * @param roleDO + * @return long + */ + long insert(@Param(value = "roleDO") RoleDO roleDO); + + /** + * + * @Description 更新数据记录 + * @param roleDO + * @return int + */ + int update(@Param(value = "roleDO") RoleDO roleDO); + + /** + * + * @Description 获取所有数据记录 + * @return List + */ + List getAll(); + + /** + * + * @Description 根据ID获取单条记录 + * @param id + * @return RoleDO + */ + RoleDO getById(@Param(value = "id") Long id); + + /** + * + * @Description 根据ID删除单条记录 + * @param id + * @return int + */ + int deleteById(@Param(value = "id") Long id); + +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/SystemAuthorityMapper.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/SystemAuthorityMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..1411e7d070dcb718c28d43b84b095c16c42f38d5 --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/SystemAuthorityMapper.java @@ -0,0 +1,59 @@ +package com.coderman.infosys.auth.infrast.dao.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import com.coderman.infosys.auth.infrast.dao.dataobject.SystemAuthorityDO; +import com.coderman.infosys.auth.infrast.dao.dataobject.AuthorityDO; + + +/** +* @Description:系统菜单权限表接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Mapper +public interface SystemAuthorityMapper{ + + /** + * + * @Description 保存数据记录 + * @param systemAuthorityDO + * @return long + */ + long insert(@Param(value = "systemAuthorityDO") SystemAuthorityDO systemAuthorityDO); + + /** + * + * @Description 更新数据记录 + * @param systemAuthorityDO + * @return int + */ + int update(@Param(value = "systemAuthorityDO") SystemAuthorityDO systemAuthorityDO); + + /** + * + * @Description 获取所有数据记录 + * @return List + */ + List getAll(); + + /** + * + * @Description 根据ID获取单条记录 + * @param id + * @return SystemAuthorityDO + */ + SystemAuthorityDO getById(@Param(value = "id") Long id); + + /** + * + * @Description 根据ID删除单条记录 + * @param id + * @return int + */ + int deleteById(@Param(value = "id") Long id); + +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/SystemMapper.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/SystemMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..5a733530216e5f13260d63875d82490eb3b19f38 --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/SystemMapper.java @@ -0,0 +1,97 @@ +package com.coderman.infosys.auth.infrast.dao.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import com.coderman.utils.commonbo.PageBO; +import com.coderman.infosys.auth.infrast.dao.dataobject.SystemDO; + + +/** +* @Description:系统表接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Mapper +public interface SystemMapper{ + + /** + * + * @Description 保存数据记录 + * @param systemDO + * @return long + */ + long insert(@Param(value = "systemDO") SystemDO systemDO); + + /** + * + * @Description 更新数据记录 + * @param systemDO + * @return int + */ + int update(@Param(value = "systemDO") SystemDO systemDO); + + /** + * + * @Description 获取所有数据记录 + * @return List + */ + List getAll(); + + /** + * + * @Description 根据ID获取单条记录 + * @param id + * @return SystemDO + */ + SystemDO getById(@Param(value = "id") Long id); + + /** + * + * @Description 根据ID删除单条记录 + * @param id + * @return int + */ + int deleteById(@Param(value = "id") Long id); + + /** + * + * @Description 查询 + * @param systemName + * @return List + */ + List getByName(@Param(value = "systemName") String systemName); + + /** + * + * @Description 查询 + * @param pageBO + * @return List + */ + List getPageList(@Param(value = "pageBO") PageBO pageBO); + + /** + * + * @Description 查询 + * @return List + */ + List queryByCondition(); + + /** + * + * @Description 查询 + * @param systemCode + * @return List + */ + List queryBySystemCode(@Param(value = "systemCode") String systemCode); + + /** + * + * @Description 查询 + * @return int + */ + int updateSystem(); + +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/UserGroupMapper.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/UserGroupMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..0b154097d8ee77653acf5a4bb0bbc1a945231e0c --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/UserGroupMapper.java @@ -0,0 +1,58 @@ +package com.coderman.infosys.auth.infrast.dao.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import com.coderman.infosys.auth.infrast.dao.dataobject.UserGroupDO; + + +/** +* @Description:用户组接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Mapper +public interface UserGroupMapper{ + + /** + * + * @Description 保存数据记录 + * @param userGroupDO + * @return long + */ + long insert(@Param(value = "userGroupDO") UserGroupDO userGroupDO); + + /** + * + * @Description 更新数据记录 + * @param userGroupDO + * @return int + */ + int update(@Param(value = "userGroupDO") UserGroupDO userGroupDO); + + /** + * + * @Description 获取所有数据记录 + * @return List + */ + List getAll(); + + /** + * + * @Description 根据ID获取单条记录 + * @param id + * @return UserGroupDO + */ + UserGroupDO getById(@Param(value = "id") Long id); + + /** + * + * @Description 根据ID删除单条记录 + * @param id + * @return int + */ + int deleteById(@Param(value = "id") Long id); + +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/UserRoleMappingMapper.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/UserRoleMappingMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..b30a73a8a58d0f143d0784ebe40d5d5d46bc6a9f --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/UserRoleMappingMapper.java @@ -0,0 +1,58 @@ +package com.coderman.infosys.auth.infrast.dao.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import com.coderman.infosys.auth.infrast.dao.dataobject.UserRoleMappingDO; + + +/** +* @Description:用户角色关联表接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Mapper +public interface UserRoleMappingMapper{ + + /** + * + * @Description 保存数据记录 + * @param userRoleMappingDO + * @return long + */ + long insert(@Param(value = "userRoleMappingDO") UserRoleMappingDO userRoleMappingDO); + + /** + * + * @Description 更新数据记录 + * @param userRoleMappingDO + * @return int + */ + int update(@Param(value = "userRoleMappingDO") UserRoleMappingDO userRoleMappingDO); + + /** + * + * @Description 获取所有数据记录 + * @return List + */ + List getAll(); + + /** + * + * @Description 根据ID获取单条记录 + * @param id + * @return UserRoleMappingDO + */ + UserRoleMappingDO getById(@Param(value = "id") Long id); + + /** + * + * @Description 根据ID删除单条记录 + * @param id + * @return int + */ + int deleteById(@Param(value = "id") Long id); + +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/AuthorityConvert.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/AuthorityConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..c00c9ae23f06a6012d27874f5fa5e4980926b4b7 --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/AuthorityConvert.java @@ -0,0 +1,46 @@ +package com.coderman.infosys.auth.infrast.dataconvert; + +import com.coderman.infosys.auth.domain.bo.AuthorityBO; +import java.util.List; +import com.coderman.infosys.auth.infrast.dao.dataobject.AuthorityDO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:权限接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Mapper +public interface AuthorityConvert{ + AuthorityConvert INSTANCE = Mappers.getMapper(AuthorityConvert.class); + + /** + * + * @Description: + * @return AuthorityBO + */ + AuthorityBO do2bo(AuthorityDO authorityDO); + /** + * + * @Description: + * @return List + */ + List doList2boList(List authorityDOList); + /** + * + * @Description: + * @return AuthorityDO + */ + AuthorityDO bo2do(AuthorityBO authorityBO); + /** + * + * @Description: + * @return List + */ + List boList2doList(List authorityBOList); +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/DataAuthorityConvert.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/DataAuthorityConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..717b12916db01b8f5aa6bbf11e4f0dad984a5333 --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/DataAuthorityConvert.java @@ -0,0 +1,48 @@ +package com.coderman.infosys.auth.infrast.dataconvert; + +import com.coderman.infosys.auth.domain.bo.AuthorityBO; +import java.util.List; +import com.coderman.infosys.auth.infrast.dao.dataobject.DataAuthorityDO; +import com.coderman.infosys.auth.infrast.dao.dataobject.AuthorityDO; +import com.coderman.infosys.auth.domain.bo.DataAuthorityBO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:数据字段权限接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Mapper +public interface DataAuthorityConvert{ + DataAuthorityConvert INSTANCE = Mappers.getMapper(DataAuthorityConvert.class); + + /** + * + * @Description: + * @return DataAuthorityBO + */ + DataAuthorityBO do2bo(DataAuthorityDO dataAuthorityDO); + /** + * + * @Description: + * @return List + */ + List doList2boList(List dataAuthorityDOList); + /** + * + * @Description: + * @return DataAuthorityDO + */ + DataAuthorityDO bo2do(DataAuthorityBO dataAuthorityBO); + /** + * + * @Description: + * @return List + */ + List boList2doList(List dataAuthorityBOList); +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/DataColumnConvert.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/DataColumnConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..e72b0aec189e6c80c96ef73c1ba35ee3a23fe90c --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/DataColumnConvert.java @@ -0,0 +1,46 @@ +package com.coderman.infosys.auth.infrast.dataconvert; + +import com.coderman.infosys.auth.infrast.dao.dataobject.DataColumnConfigDO; +import java.util.List; +import com.coderman.infosys.auth.domain.bo.DataColumnBO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:数据字段实体接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Mapper +public interface DataColumnConvert{ + DataColumnConvert INSTANCE = Mappers.getMapper(DataColumnConvert.class); + + /** + * + * @Description: + * @return DataColumnBO + */ + DataColumnBO do2bo(DataColumnConfigDO dataColumnConfigDO); + /** + * + * @Description: + * @return List + */ + List doList2boList(List dataColumnConfigDOList); + /** + * + * @Description: + * @return DataColumnConfigDO + */ + DataColumnConfigDO bo2do(DataColumnBO dataColumnBO); + /** + * + * @Description: + * @return List + */ + List boList2doList(List dataColumnBOList); +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/MenuConvert.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/MenuConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..7ad1836355c0c080274558c0c932b5834bdfceaf --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/MenuConvert.java @@ -0,0 +1,46 @@ +package com.coderman.infosys.auth.infrast.dataconvert; + +import com.coderman.infosys.auth.domain.bo.MenuBO; +import java.util.List; +import com.coderman.infosys.auth.infrast.dao.dataobject.MenuDO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:按钮管理接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Mapper +public interface MenuConvert{ + MenuConvert INSTANCE = Mappers.getMapper(MenuConvert.class); + + /** + * + * @Description: + * @return MenuBO + */ + MenuBO do2bo(MenuDO menuDO); + /** + * + * @Description: + * @return List + */ + List doList2boList(List menuDOList); + /** + * + * @Description: + * @return MenuDO + */ + MenuDO bo2do(MenuBO menuBO); + /** + * + * @Description: + * @return List + */ + List boList2doList(List menuBOList); +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/ModuleConvert.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/ModuleConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..c85f99100fb347bc7d4058c1f3b538c8301e46e7 --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/ModuleConvert.java @@ -0,0 +1,46 @@ +package com.coderman.infosys.auth.infrast.dataconvert; + +import com.coderman.infosys.auth.infrast.dao.dataobject.ModuleDO; +import java.util.List; +import com.coderman.infosys.auth.domain.bo.ModuleBO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:菜单/模块管理接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Mapper +public interface ModuleConvert{ + ModuleConvert INSTANCE = Mappers.getMapper(ModuleConvert.class); + + /** + * + * @Description: + * @return ModuleBO + */ + ModuleBO do2bo(ModuleDO moduleDO); + /** + * + * @Description: + * @return List + */ + List doList2boList(List moduleDOList); + /** + * + * @Description: + * @return ModuleDO + */ + ModuleDO bo2do(ModuleBO moduleBO); + /** + * + * @Description: + * @return List + */ + List boList2doList(List moduleBOList); +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/RoleConvert.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/RoleConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..0a2b40143d6f9b09e189ed93be18b28fc653d3ee --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/RoleConvert.java @@ -0,0 +1,46 @@ +package com.coderman.infosys.auth.infrast.dataconvert; + +import java.util.List; +import com.coderman.infosys.auth.domain.bo.RoleBO; +import com.coderman.infosys.auth.infrast.dao.dataobject.RoleDO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:角色接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Mapper +public interface RoleConvert{ + RoleConvert INSTANCE = Mappers.getMapper(RoleConvert.class); + + /** + * + * @Description: + * @return RoleBO + */ + RoleBO do2bo(RoleDO roleDO); + /** + * + * @Description: + * @return List + */ + List doList2boList(List roleDOList); + /** + * + * @Description: + * @return RoleDO + */ + RoleDO bo2do(RoleBO roleBO); + /** + * + * @Description: + * @return List + */ + List boList2doList(List roleBOList); +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/RoleGroupConvert.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/RoleGroupConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..d48207a77b60fd7da40fd1eded0250540b4a24c2 --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/RoleGroupConvert.java @@ -0,0 +1,46 @@ +package com.coderman.infosys.auth.infrast.dataconvert; + +import java.util.List; +import com.coderman.infosys.auth.domain.bo.RoleGroupBO; +import com.coderman.infosys.auth.infrast.dao.dataobject.RoleGroupDO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:角色组接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Mapper +public interface RoleGroupConvert{ + RoleGroupConvert INSTANCE = Mappers.getMapper(RoleGroupConvert.class); + + /** + * + * @Description: + * @return RoleGroupBO + */ + RoleGroupBO do2bo(RoleGroupDO roleGroupDO); + /** + * + * @Description: + * @return List + */ + List doList2boList(List roleGroupDOList); + /** + * + * @Description: + * @return RoleGroupDO + */ + RoleGroupDO bo2do(RoleGroupBO roleGroupBO); + /** + * + * @Description: + * @return List + */ + List boList2doList(List roleGroupBOList); +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/SystemAuthorityConvert.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/SystemAuthorityConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..49d6ca41dff55c3ea300a2f4c2498c37afb7aa51 --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/SystemAuthorityConvert.java @@ -0,0 +1,48 @@ +package com.coderman.infosys.auth.infrast.dataconvert; + +import com.coderman.infosys.auth.domain.bo.SystemAuthorityBO; +import com.coderman.infosys.auth.domain.bo.AuthorityBO; +import java.util.List; +import com.coderman.infosys.auth.infrast.dao.dataobject.AuthorityDO; +import com.coderman.infosys.auth.infrast.dao.dataobject.SystemAuthorityDO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:系统菜单权限接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Mapper +public interface SystemAuthorityConvert{ + SystemAuthorityConvert INSTANCE = Mappers.getMapper(SystemAuthorityConvert.class); + + /** + * + * @Description: + * @return SystemAuthorityBO + */ + SystemAuthorityBO do2bo(SystemAuthorityDO systemAuthorityDO); + /** + * + * @Description: + * @return List + */ + List doList2boList(List systemAuthorityDOList); + /** + * + * @Description: + * @return SystemAuthorityDO + */ + SystemAuthorityDO bo2do(SystemAuthorityBO systemAuthorityBO); + /** + * + * @Description: + * @return List + */ + List boList2doList(List systemAuthorityBOList); +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/SystemConvert.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/SystemConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..21d37a07d8b59d2c7dcec947e5d9aa481282cc63 --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/SystemConvert.java @@ -0,0 +1,46 @@ +package com.coderman.infosys.auth.infrast.dataconvert; + +import java.util.List; +import com.coderman.infosys.auth.domain.bo.SystemBO; +import com.coderman.infosys.auth.infrast.dao.dataobject.SystemDO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:系统管理接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Mapper +public interface SystemConvert{ + SystemConvert INSTANCE = Mappers.getMapper(SystemConvert.class); + + /** + * + * @Description: + * @return SystemBO + */ + SystemBO do2bo(SystemDO systemDO); + /** + * + * @Description: + * @return List + */ + List doList2boList(List systemDOList); + /** + * + * @Description: + * @return SystemDO + */ + SystemDO bo2do(SystemBO systemBO); + /** + * + * @Description: + * @return List + */ + List boList2doList(List systemBOList); +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/UserGroupConvert.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/UserGroupConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..2b89857214b695bea9036a70f7d3506600d0f198 --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/UserGroupConvert.java @@ -0,0 +1,46 @@ +package com.coderman.infosys.auth.infrast.dataconvert; + +import java.util.List; +import com.coderman.infosys.auth.domain.bo.UserGroupBO; +import com.coderman.infosys.auth.infrast.dao.dataobject.UserGroupDO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:用户组接口 +* @Author: +* @CreateTime:2021-11-07 08:23:49 +* @version v1.0 +*/ +@Mapper +public interface UserGroupConvert{ + UserGroupConvert INSTANCE = Mappers.getMapper(UserGroupConvert.class); + + /** + * + * @Description: + * @return UserGroupBO + */ + UserGroupBO do2bo(UserGroupDO userGroupDO); + /** + * + * @Description: + * @return List + */ + List doList2boList(List userGroupDOList); + /** + * + * @Description: + * @return UserGroupDO + */ + UserGroupDO bo2do(UserGroupBO userGroupBO); + /** + * + * @Description: + * @return List + */ + List boList2doList(List userGroupBOList); +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/gatawayimpl/DataColumnGataWayImpl.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/gatawayimpl/DataColumnGataWayImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..b4ad1b6ab480ab785ff3db1f931832b826082d69 --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/gatawayimpl/DataColumnGataWayImpl.java @@ -0,0 +1,63 @@ +package com.coderman.infosys.auth.infrast.gatawayimpl; + +import java.util.List; +import com.coderman.utils.commonbo.PageBO; +import com.coderman.infosys.auth.domain.gataway.DataColumnGataWay; +import com.coderman.infosys.auth.domain.bo.DataColumnBO; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; + + +/** + * @Description:接口实现类 + * @Author： + * @CreateTime：2021-11-07 08:23:49 + * @version v1.0 + */ +@Service +public class DataColumnGataWayImpl implements DataColumnGataWay{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + + @Override + public Long saveDataColumn(DataColumnBO dataColumnBO){ + + return null; + } + + @Override + public Boolean saveBatchDataColumn(List list){ + + return null; + } + + @Override + public Long updateDataColumn(DataColumnBO dataColumnBO){ + + return null; + } + + @Override + public DataColumnBO getById(Long id){ + + return null; + } + + @Override + public List getByDBCode(String busDataBase){ + + return null; + } + + @Override + public List getPageList(PageBO pageBO){ + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/gatawayimpl/SystemModuleQueryGataWayImpl.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/gatawayimpl/SystemModuleQueryGataWayImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..f74d5fdc4c4a79bdedfbee53523770c8b84aa3da --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/gatawayimpl/SystemModuleQueryGataWayImpl.java @@ -0,0 +1,113 @@ +package com.coderman.infosys.auth.infrast.gatawayimpl; + +import java.util.List; +import com.coderman.infosys.auth.domain.bo.MenuBO; +import com.coderman.utils.commonbo.PageBO; +import com.coderman.infosys.auth.domain.bo.SystemBO; +import com.coderman.infosys.auth.domain.bo.ModuleBO; +import com.coderman.infosys.auth.domain.gataway.SystemModuleQueryGataWay; +import com.coderman.infosys.auth.infrast.dao.dataobject.ModuleDO; +import com.coderman.infosys.auth.infrast.dao.mapper.ModuleMapper; +import com.coderman.infosys.auth.infrast.dao.dataobject.MenuDO; +import com.coderman.infosys.auth.infrast.dataconvert.ModuleConvert; +import com.coderman.infosys.auth.infrast.dataconvert.MenuConvert; +import com.coderman.infosys.auth.infrast.dataconvert.SystemConvert; +import com.coderman.infosys.auth.infrast.dao.mapper.SystemMapper; +import com.coderman.infosys.auth.infrast.dao.dataobject.SystemDO; +import com.coderman.infosys.auth.infrast.dao.mapper.MenuMapper; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; + + +/** + * @Description:接口实现类 + * @Author： + * @CreateTime：2021-11-07 08:23:49 + * @version v1.0 + */ +@Service +public class SystemModuleQueryGataWayImpl implements SystemModuleQueryGataWay{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + @Autowired + private SystemMapper systemMapper; + + @Autowired + private ModuleMapper moduleMapper; + + @Autowired + private MenuMapper menuMapper; + + + @Override + public List querySystemPage(PageBO pageBO){ + List systemDOList = systemMapper.getPageList(pageBO); + List systemBOList = SystemConvert.INSTANCE.doList2boList(systemDOList); + + return systemBOList; + } + + @Override + public List queryModulePage(){ + + return null; + } + + @Override + public SystemBO queryBySystemCode(String systemCode){ + List systemDOList = systemMapper.queryBySystemCode(systemCode); + SystemBO systemBO = SystemConvert.INSTANCE.do2bo(null); + + return systemBO; + } + + @Override + public List queryByCondition(String search){ + List systemDOList = systemMapper.queryByCondition(); + List systemBOList = SystemConvert.INSTANCE.doList2boList(systemDOList); + + return systemBOList; + } + + @Override + public List queryWithAll(String search){ + + return null; + } + + @Override + public SystemBO getSystemByCode(String systemCode){ + + return null; + } + + @Override + public ModuleBO getModuleByCode(String moduleCode){ + List moduleDOList = moduleMapper.getByName(null); + ModuleBO moduleBO = ModuleConvert.INSTANCE.do2bo(null); + List menuDOList = menuMapper.getListByModuleCode(null); + List menuBOList = MenuConvert.INSTANCE.doList2boList(menuDOList); + + return moduleBO; + } + + @Override + public MenuBO getMenu(String menuCode){ + + return null; + } + + @Override + public List getSystemByName(String systemName){ + List systemDOList = systemMapper.getByName(systemName); + List systemBOList = SystemConvert.INSTANCE.doList2boList(systemDOList); + + return systemBOList; + } + +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/mq/consumer/DepartmentMqConsumer.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/mq/consumer/DepartmentMqConsumer.java new file mode 100644 index 0000000000000000000000000000000000000000..d80d2c563c18af6da80fbbfca4f6c7eba0095bb1 --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/mq/consumer/DepartmentMqConsumer.java @@ -0,0 +1,25 @@ +package com.coderman.infosys.auth.infrast.mq.consumer; + + +import org.springframework.stereotype.Service; + + /** + * @Description:DepartmentMqConsumer类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Service +public class DepartmentMqConsumer{ + + + /** + * + * @Description:监听组织状态变 + * @return void + */ + public void consumeDepartmentStatusChange(String mqBody){ + + } + +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/mq/consumer/UserMqConsumer.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/mq/consumer/UserMqConsumer.java new file mode 100644 index 0000000000000000000000000000000000000000..7a966a4754d0f3614891d857be8061b07dae2509 --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/mq/consumer/UserMqConsumer.java @@ -0,0 +1,25 @@ +package com.coderman.infosys.auth.infrast.mq.consumer; + + +import org.springframework.stereotype.Service; + + /** + * @Description:UserMqConsumer类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Service +public class UserMqConsumer{ + + + /** + * + * @Description:监听用户状态变 + * @return void + */ + public void consumeUserStatusChange(String mqBody){ + + } + +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/mq/handler/UserMqHandler.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/mq/handler/UserMqHandler.java new file mode 100644 index 0000000000000000000000000000000000000000..8cf09eff947336c276497830f6a9af92533f81ff --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/mq/handler/UserMqHandler.java @@ -0,0 +1,25 @@ +package com.coderman.infosys.auth.infrast.mq.handler; + + +import org.springframework.stereotype.Service; + + /** + * @Description:UserMqHandler类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Service +public class UserMqHandler{ + + + /** + * + * @Description:处理用户状态变更的权限信 + * @return void + */ + public void handleUserStatusChange(String mqBody){ + + } + +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/mq/producer/AuthorityMqProducer.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/mq/producer/AuthorityMqProducer.java new file mode 100644 index 0000000000000000000000000000000000000000..787ca3504fc98825104a3e769f539fc13c107775 --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/mq/producer/AuthorityMqProducer.java @@ -0,0 +1,33 @@ +package com.coderman.infosys.auth.infrast.mq.producer; + + +import org.springframework.stereotype.Service; + + /** + * @Description:AuthorityMqProducer类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Service +public class AuthorityMqProducer{ + + + /** + * + * @Description:权限创 + * @return void + */ + public void authorityCreate(String authCode){ + + } + /** + * + * @Description:权限更 + * @return void + */ + public void authorityUpdate(String authCode){ + + } + +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/mq/producer/SystemMqProducer.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/mq/producer/SystemMqProducer.java new file mode 100644 index 0000000000000000000000000000000000000000..b8a1ac7d79e2a49ff842d41233651a1d48a915cc --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/mq/producer/SystemMqProducer.java @@ -0,0 +1,26 @@ +package com.coderman.infosys.auth.infrast.mq.producer; + +import com.coderman.infosys.auth.domain.event.MenuChangeEvent; + +import org.springframework.stereotype.Service; + + /** + * @Description:SystemMqProducer类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:23:49 + * @version v1.0 + */ +@Service +public class SystemMqProducer{ + + + /** + * + * @Description:事务提交后权限变更监 + * @return void + */ + public void systemChange(MenuChangeEvent event){ + + } + +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/repositoryimpl/AuthorityRepositoryImpl.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/repositoryimpl/AuthorityRepositoryImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..ffafff993434688170504caa9bb04c1c5e16a870 --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/repositoryimpl/AuthorityRepositoryImpl.java @@ -0,0 +1,56 @@ +package com.coderman.infosys.auth.infrast.repositoryimpl; + +import com.coderman.infosys.auth.domain.bo.AuthorityBO; +import com.coderman.infosys.auth.domain.bo.AuthorityUpdateRequestBO; +import com.coderman.infosys.auth.domain.gataway.AuthorityRepository; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; + + +/** + * @Description:接口实现类 + * @Author： + * @CreateTime：2021-11-07 08:23:49 + * @version v1.0 + */ +@Service +public class AuthorityRepositoryImpl implements AuthorityRepository{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + + @Override + public Boolean buildAuthority(AuthorityBO authorityBO){ + + return null; + } + + @Override + public Boolean updateAuthority(AuthorityUpdateRequestBO authorityUpdateRequestBO){ + + return null; + } + + @Override + public Boolean disableAuthority(String authorityCode){ + + return null; + } + + @Override + public AuthorityBO getByCode(String authorityCode){ + + return null; + } + + @Override + public AuthorityBO getByRoleCode(String roleCode){ + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/repositoryimpl/SystemModuleRepositoryImpl.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/repositoryimpl/SystemModuleRepositoryImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..ec12cf10a9485668817b4ae62cbe92e51d1944a1 --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/repositoryimpl/SystemModuleRepositoryImpl.java @@ -0,0 +1,98 @@ +package com.coderman.infosys.auth.infrast.repositoryimpl; + +import com.coderman.infosys.auth.domain.bo.MenuBO; +import com.coderman.infosys.auth.domain.gataway.SystemModuleRepository; +import com.coderman.infosys.auth.domain.bo.SystemBO; +import com.coderman.infosys.auth.domain.bo.ModuleBO; +import com.coderman.infosys.auth.infrast.dao.dataobject.ModuleDO; +import com.coderman.infosys.auth.infrast.dao.mapper.ModuleMapper; +import com.coderman.infosys.auth.infrast.dao.dataobject.MenuDO; +import com.coderman.infosys.auth.infrast.dataconvert.ModuleConvert; +import com.coderman.infosys.auth.infrast.dataconvert.MenuConvert; +import com.coderman.infosys.auth.infrast.mq.producer.SystemMqProducer; +import com.coderman.infosys.auth.infrast.dataconvert.SystemConvert; +import com.coderman.infosys.auth.infrast.dao.mapper.SystemMapper; +import com.coderman.infosys.auth.infrast.dao.dataobject.SystemDO; +import com.coderman.infosys.auth.infrast.dao.mapper.MenuMapper; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; + + +/** + * @Description:接口实现类 + * @Author： + * @CreateTime：2021-11-07 08:23:49 + * @version v1.0 + */ +@Service +public class SystemModuleRepositoryImpl implements SystemModuleRepository{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + @Autowired + private SystemMapper systemMapper; + + @Autowired + private SystemMqProducer systemMqProducer; + + @Autowired + private ModuleMapper moduleMapper; + + @Autowired + private MenuMapper menuMapper; + + + @Override + public Long saveSystem(SystemBO systemBO){ + SystemDO systemDO = SystemConvert.INSTANCE.bo2do(systemBO); + long longVar = systemMapper.insert(systemDO); + systemMqProducer.systemChange(null); + + return null; + } + + @Override + public Integer updateSystem(SystemBO systemBO){ + SystemDO systemDO = SystemConvert.INSTANCE.bo2do(systemBO); + int intVar = systemMapper.updateSystem(); + + return null; + } + + @Override + public Long saveModule(ModuleBO moduleBO){ + ModuleDO moduleDO = ModuleConvert.INSTANCE.bo2do(moduleBO); + long longVar = moduleMapper.insert(moduleDO); + + return null; + } + + @Override + public Integer updateModule(ModuleBO moduleBO){ + ModuleDO moduleDO = ModuleConvert.INSTANCE.bo2do(moduleBO); + int intVar = moduleMapper.update(moduleDO); + + return null; + } + + @Override + public Long saveMenu(MenuBO moduleBO){ + MenuDO menuDO = MenuConvert.INSTANCE.bo2do(moduleBO); + long longVar = menuMapper.insert(menuDO); + + return null; + } + + @Override + public Integer updateMenu(MenuBO moduleBO){ + MenuDO menuDO = MenuConvert.INSTANCE.bo2do(moduleBO); + int intVar = menuMapper.update(menuDO); + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/repositoryimpl/UserRoleRepositoryImpl.java b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/repositoryimpl/UserRoleRepositoryImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..efabf99b30ee3ef71d9014a98b0065be3413030b --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/repositoryimpl/UserRoleRepositoryImpl.java @@ -0,0 +1,89 @@ +package com.coderman.infosys.auth.infrast.repositoryimpl; + +import java.util.List; +import com.coderman.infosys.auth.domain.bo.UserGroupBO; +import com.coderman.utils.commonbo.PageBO; +import com.coderman.infosys.auth.domain.gataway.UserRoleRepository; +import com.coderman.infosys.auth.domain.bo.RoleBO; +import com.coderman.infosys.auth.domain.bo.RoleGroupBO; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; + + +/** + * @Description:接口实现类 + * @Author： + * @CreateTime：2021-11-07 08:23:49 + * @version v1.0 + */ +@Service +public class UserRoleRepositoryImpl implements UserRoleRepository{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + + @Override + public Long saveUserGroup(UserGroupBO userGroupBO){ + + return null; + } + + @Override + public Integer updateUserGroup(UserGroupBO userGroupBO){ + + return null; + } + + @Override + public Long saveRoleGroup(RoleGroupBO roleGroupBO){ + + return null; + } + + @Override + public Integer updateRoleGroup(RoleGroupBO roleGroupBO){ + + return null; + } + + @Override + public Long saveRole(RoleBO roleBO){ + + return null; + } + + @Override + public Integer updateRole(RoleBO roleBO){ + + return null; + } + + @Override + public List getPageList(PageBO pageBO){ + + return null; + } + + @Override + public UserGroupBO getByUserGroupCode(String userGroupCode){ + + return null; + } + + @Override + public RoleBO getByRoleCode(String roleCode){ + + return null; + } + + @Override + public RoleGroupBO getByRoleGroupCode(String roleGroupCode){ + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/resources/erpicture/infosys_auth.puml b/codemaker-cola/cola-infrast/src/main/resources/erpicture/infosys_auth.puml new file mode 100644 index 0000000000000000000000000000000000000000..ec48036076ccd696194b744870f16fccce5cfa99 --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/resources/erpicture/infosys_auth.puml @@ -0,0 +1,149 @@ +@startuml +' hide the spot +hide circle + +' avoid problems with angled crows feet +skinparam linetype ortho + +entity " user_role_mapping 用户角色关联表" as user_role_mapping { + id: 主键/bigint(20) unsigned + user_id: 用户ID/bigint(20) + role_code: 角色code/varchar(50) +} + +entity " user_group 用户组" as user_group { + id: 主键/bigint(20) unsigned + group_name: 用户组名/varchar(50) + group_code: 用户组编码/varchar(50) + status: 用户组状态/bigint(20) + user_list: 用户组内用户列表/varchar(2000) + date_create: 创建时间/timestamp + date_update: 修改时间/timestamp + update_user_id: 修改人/bigint(20) + create_user_id: 创建人/bigint(20) +} + +entity " data_column_config 数据字段管理表" as data_column_config { + id: 主键/bigint(20) unsigned + bus_database: 数据库业务系统名称/varchar(60) + table_name: 表名称/varchar(60) + table_desc: 表描述/varchar(60) + column_name: 字段名称/varchar(60) + column_desc: 字段描述/varchar(60) + bus_model: 业务模块/varchar(60) + field_name: 业务属性名称/varchar(60) + date_create: 创建时间/timestamp + date_update: 修改时间/timestamp + update_user_id: 修改人/bigint(20) + create_user_id: 创建人/bigint(20) +} + +entity " role 角色表" as role { + id: 主键/bigint(20) unsigned + role_name: 角色名称/varchar(50) + role_code: 角色编码/varchar(50) + status: 角色组状态/bigint(20) + date_create: 创建时间/timestamp + date_update: 修改时间/timestamp + update_user_id: 修改人/bigint(20) + create_user_id: 创建人/bigint(20) +} + +entity " system 系统表" as system { + id: 主键/bigint(20) unsigned + system_name: 系统名称/varchar(50) + system_code: 系统编码/varchar(50) + system_url: 系统域名/varchar(50) + system_picurl: 系统图标/varchar(50) + tec_admin_user_id: 系统技术负责人/bigint(20) + bus_admin_user_id: 系统业务负责人/bigint(20) + department_id: 系统所属部门/bigint(20) + date_create: 创建时间/timestamp + create_user_id: 创建人/bigint(20) +} + +entity " role_group 角色组" as role_group { + id: 主键/bigint(20) unsigned + group_name: 角色组名/varchar(50) + group_code: 角色组编码/varchar(50) + role_code_list: 角色列表/varchar(2000) + date_create: 创建时间/timestamp + date_update: 修改时间/timestamp + update_user_id: 修改人/bigint(20) + create_user_id: 创建人/bigint(20) +} + +entity " system_authority 系统菜单权限表" as system_authority { + id: 主键/bigint(20) unsigned + auth_code: 权限标示/varchar(50) + system_code: 系统编码/varchar(50) + module_code: 菜单编码/varchar(50) + menu_code: 按钮编码/varchar(50) + date_create: 创建时间/timestamp + create_user_id: 创建人/bigint(20) +} + +entity " admin_authority 行政数据权限" as admin_authority { + id: 主键/bigint(20) unsigned + auth_code: 权限标示/varchar(50) + department_id: 组织部门ID/bigint(20) + city_id: 城市权限/bigint(20) + date_create: 创建时间/timestamp + date_update: 修改时间/timestamp + update_user_id: 修改人/bigint(20) + create_user_id: 创建人/bigint(20) +} + +entity " authority 抽象权限表" as authority { + id: 主键/bigint(20) unsigned + auth_code: 权限编码/varchar(50) + authority_type: 权限类型/tinyint(4) + role_code: 关联角色编码/varchar(50) + role_group_code: 关联角色组/varchar(50) + status: 权限状态/tinyint(4) + date_create: 创建时间/timestamp + date_update: 修改时间/timestamp + update_user_id: 修改人/bigint(20) + create_user_id: 创建人/bigint(20) +} + +entity " module 菜单模块表" as module { + id: 主键/bigint(20) unsigned + module_name: 菜单名称/varchar(50) + module_code: 菜单编码/varchar(50) + system_code: 系统编码/varchar(50) + module_url: 菜单链接/varchar(50) + date_create: 创建时间/timestamp + date_update: 修改时间/timestamp + update_user_id: 修改人/bigint(20) + create_user_id: 创建人/bigint(20) +} + +entity " menu 按钮表" as menu { + id: 主键/bigint(20) unsigned + menu_name: 按钮名称/varchar(50) + menu_code: 按钮编码/varchar(50) + module_code: 所属菜单编码/varchar(50) + system_code: 所属系统编码/varchar(50) + module_url: 菜单链接/varchar(50) + date_create: 创建时间/timestamp + date_update: 修改时间/timestamp + update_user_id: 修改人/bigint(20) + create_user_id: 创建人/bigint(20) +} + +entity " data_authority 数据字段权限" as data_authority { + id: 主键/bigint(20) unsigned + auth_code: 权限标示/varchar(50) + data_column_id: 业务数据库标示/varchar(50) + date_create: 创建时间/timestamp + date_update: 修改时间/timestamp + update_user_id: 修改人/bigint(20) + create_user_id: 创建人/bigint(20) +} + + + + + +@enduml \ No newline at end of file diff --git a/codemaker-cola/cola-infrast/src/main/resources/mapper/AdminAuthorityMapper.xml b/codemaker-cola/cola-infrast/src/main/resources/mapper/AdminAuthorityMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..6e4db1175478719b9fd8a33b6c0241ce4136de94 --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/resources/mapper/AdminAuthorityMapper.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id,auth_code,department_id,city_id,date_create,date_update,update_user_id,create_user_id + + + + insert into admin_authority( + auth_code,department_id,city_id,date_create,date_update,update_user_id,create_user_id + ) + values( + #{auth_code},#{department_id},#{city_id},#{date_create},#{date_update},#{update_user_id},#{create_user_id} + ) + + + + update admin_authority + set + auth_code=#{auth_code},department_id=#{department_id},city_id=#{city_id},date_create=#{date_create},date_update=#{date_update},update_user_id=#{update_user_id},create_user_id=#{create_user_id} + where id = #{id} + + + + + + + + delete from admin_authority where id = #{id} + + + + + diff --git a/codemaker-cola/cola-infrast/src/main/resources/mapper/AuthorityMapper.xml b/codemaker-cola/cola-infrast/src/main/resources/mapper/AuthorityMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..f32b6491b68e53c30ac01a22c1ef7e46f9d02b81 --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/resources/mapper/AuthorityMapper.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id,auth_code,authority_type,role_code,role_group_code,status,date_create,date_update,update_user_id,create_user_id + + + + insert into authority( + auth_code,authority_type,role_code,role_group_code,status,date_create,date_update,update_user_id,create_user_id + ) + values( + #{auth_code},#{authority_type},#{role_code},#{role_group_code},#{status},#{date_create},#{date_update},#{update_user_id},#{create_user_id} + ) + + + + update authority + set + auth_code=#{auth_code},authority_type=#{authority_type},role_code=#{role_code},role_group_code=#{role_group_code},status=#{status},date_create=#{date_create},date_update=#{date_update},update_user_id=#{update_user_id},create_user_id=#{create_user_id} + where id = #{id} + + + + + + + + delete from authority where id = #{id} + + + + + diff --git a/codemaker-cola/cola-infrast/src/main/resources/mapper/DataAuthorityMapper.xml b/codemaker-cola/cola-infrast/src/main/resources/mapper/DataAuthorityMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..a481e4be480afc1b966fda8ff863f8e26889af19 --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/resources/mapper/DataAuthorityMapper.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id,auth_code,data_column_id,date_create,date_update,update_user_id,create_user_id + + + + insert into data_authority( + auth_code,data_column_id,date_create,date_update,update_user_id,create_user_id + ) + values( + #{auth_code},#{data_column_id},#{date_create},#{date_update},#{update_user_id},#{create_user_id} + ) + + + + update data_authority + set + auth_code=#{auth_code},data_column_id=#{data_column_id},date_create=#{date_create},date_update=#{date_update},update_user_id=#{update_user_id},create_user_id=#{create_user_id} + where id = #{id} + + + + + + + + delete from data_authority where id = #{id} + + + + + diff --git a/codemaker-cola/cola-infrast/src/main/resources/mapper/DataColumnConfigMapper.xml b/codemaker-cola/cola-infrast/src/main/resources/mapper/DataColumnConfigMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..5ed27997c145797e5d77d16d805b5b6dd48838bc --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/resources/mapper/DataColumnConfigMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id,bus_database,table_name,table_desc,column_name,column_desc,bus_model,field_name,date_create,date_update,update_user_id,create_user_id + + + + insert into data_column_config( + bus_database,table_name,table_desc,column_name,column_desc,bus_model,field_name,date_create,date_update,update_user_id,create_user_id + ) + values( + #{bus_database},#{table_name},#{table_desc},#{column_name},#{column_desc},#{bus_model},#{field_name},#{date_create},#{date_update},#{update_user_id},#{create_user_id} + ) + + + + update data_column_config + set + bus_database=#{bus_database},table_name=#{table_name},table_desc=#{table_desc},column_name=#{column_name},column_desc=#{column_desc},bus_model=#{bus_model},field_name=#{field_name},date_create=#{date_create},date_update=#{date_update},update_user_id=#{update_user_id},create_user_id=#{create_user_id} + where id = #{id} + + + + + + + + delete from data_column_config where id = #{id} + + + + + diff --git a/codemaker-cola/cola-infrast/src/main/resources/mapper/MenuMapper.xml b/codemaker-cola/cola-infrast/src/main/resources/mapper/MenuMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..a318d7c0b6a2533886ca55875b853116a5d5f0a6 --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/resources/mapper/MenuMapper.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id,menu_name,menu_code,module_code,system_code,module_url,date_create,date_update,update_user_id,create_user_id + + + + insert into menu( + menu_name,menu_code,module_code,system_code,module_url,date_create,date_update,update_user_id,create_user_id + ) + values( + #{menu_name},#{menu_code},#{module_code},#{system_code},#{module_url},#{date_create},#{date_update},#{update_user_id},#{create_user_id} + ) + + + + update menu + set + menu_name=#{menu_name},menu_code=#{menu_code},module_code=#{module_code},system_code=#{system_code},module_url=#{module_url},date_create=#{date_create},date_update=#{date_update},update_user_id=#{update_user_id},create_user_id=#{create_user_id} + where id = #{id} + + + + + + + + delete from menu where id = #{id} + + + + + + + diff --git a/codemaker-cola/cola-infrast/src/main/resources/mapper/ModuleMapper.xml b/codemaker-cola/cola-infrast/src/main/resources/mapper/ModuleMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..11108015362bb19a7a6fbaa771146d8ce8ac4c4e --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/resources/mapper/ModuleMapper.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id,module_name,module_code,system_code,module_url,date_create,date_update,update_user_id,create_user_id + + + + insert into module( + module_name,module_code,system_code,module_url,date_create,date_update,update_user_id,create_user_id + ) + values( + #{module_name},#{module_code},#{system_code},#{module_url},#{date_create},#{date_update},#{update_user_id},#{create_user_id} + ) + + + + update module + set + module_name=#{module_name},module_code=#{module_code},system_code=#{system_code},module_url=#{module_url},date_create=#{date_create},date_update=#{date_update},update_user_id=#{update_user_id},create_user_id=#{create_user_id} + where id = #{id} + + + + + + + + delete from module where id = #{id} + + + + + + + diff --git a/codemaker-cola/cola-infrast/src/main/resources/mapper/RoleGroupMapper.xml b/codemaker-cola/cola-infrast/src/main/resources/mapper/RoleGroupMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..67d6592a0f40579935b22870c7080079baf33936 --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/resources/mapper/RoleGroupMapper.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id,group_name,group_code,role_code_list,date_create,date_update,update_user_id,create_user_id + + + + insert into role_group( + group_name,group_code,role_code_list,date_create,date_update,update_user_id,create_user_id + ) + values( + #{group_name},#{group_code},#{role_code_list},#{date_create},#{date_update},#{update_user_id},#{create_user_id} + ) + + + + update role_group + set + group_name=#{group_name},group_code=#{group_code},role_code_list=#{role_code_list},date_create=#{date_create},date_update=#{date_update},update_user_id=#{update_user_id},create_user_id=#{create_user_id} + where id = #{id} + + + + + + + + delete from role_group where id = #{id} + + + + + diff --git a/codemaker-cola/cola-infrast/src/main/resources/mapper/RoleMapper.xml b/codemaker-cola/cola-infrast/src/main/resources/mapper/RoleMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..37794e6898b7167fb1357c931e4125764c1dfa16 --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/resources/mapper/RoleMapper.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id,role_name,role_code,status,date_create,date_update,update_user_id,create_user_id + + + + insert into role( + role_name,role_code,status,date_create,date_update,update_user_id,create_user_id + ) + values( + #{role_name},#{role_code},#{status},#{date_create},#{date_update},#{update_user_id},#{create_user_id} + ) + + + + update role + set + role_name=#{role_name},role_code=#{role_code},status=#{status},date_create=#{date_create},date_update=#{date_update},update_user_id=#{update_user_id},create_user_id=#{create_user_id} + where id = #{id} + + + + + + + + delete from role where id = #{id} + + + + + diff --git a/codemaker-cola/cola-infrast/src/main/resources/mapper/SystemAuthorityMapper.xml b/codemaker-cola/cola-infrast/src/main/resources/mapper/SystemAuthorityMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..be15380a730a50e01607bd4d2a7a6a1c62c04176 --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/resources/mapper/SystemAuthorityMapper.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id,auth_code,system_code,module_code,menu_code,date_create,create_user_id + + + + insert into system_authority( + auth_code,system_code,module_code,menu_code,date_create,create_user_id + ) + values( + #{auth_code},#{system_code},#{module_code},#{menu_code},#{date_create},#{create_user_id} + ) + + + + update system_authority + set + auth_code=#{auth_code},system_code=#{system_code},module_code=#{module_code},menu_code=#{menu_code},date_create=#{date_create},create_user_id=#{create_user_id} + where id = #{id} + + + + + + + + delete from system_authority where id = #{id} + + + + + diff --git a/codemaker-cola/cola-infrast/src/main/resources/mapper/SystemMapper.xml b/codemaker-cola/cola-infrast/src/main/resources/mapper/SystemMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..b6d588db7cb1a66574e0071d0ebcfca67ee1fd76 --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/resources/mapper/SystemMapper.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id,system_name,system_code,system_url,system_picurl,tec_admin_user_id,bus_admin_user_id,department_id,date_create,create_user_id + + + + insert into system( + system_name,system_code,system_url,system_picurl,tec_admin_user_id,bus_admin_user_id,department_id,date_create,create_user_id + ) + values( + #{system_name},#{system_code},#{system_url},#{system_picurl},#{tec_admin_user_id},#{bus_admin_user_id},#{department_id},#{date_create},#{create_user_id} + ) + + + + update system + set + system_name=#{system_name},system_code=#{system_code},system_url=#{system_url},system_picurl=#{system_picurl},tec_admin_user_id=#{tec_admin_user_id},bus_admin_user_id=#{bus_admin_user_id},department_id=#{department_id},date_create=#{date_create},create_user_id=#{create_user_id} + where id = #{id} + + + + + + + + delete from system where id = #{id} + + + + + + + + + + + + update system + set + ${table.updateColumnNameList} + where id = #{id} + + + + + diff --git a/codemaker-cola/cola-infrast/src/main/resources/mapper/UserGroupMapper.xml b/codemaker-cola/cola-infrast/src/main/resources/mapper/UserGroupMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..492c37762788cbd31217df4b2df3d38c6e690502 --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/resources/mapper/UserGroupMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id,group_name,group_code,status,user_list,date_create,date_update,update_user_id,create_user_id + + + + insert into user_group( + group_name,group_code,status,user_list,date_create,date_update,update_user_id,create_user_id + ) + values( + #{group_name},#{group_code},#{status},#{user_list},#{date_create},#{date_update},#{update_user_id},#{create_user_id} + ) + + + + update user_group + set + group_name=#{group_name},group_code=#{group_code},status=#{status},user_list=#{user_list},date_create=#{date_create},date_update=#{date_update},update_user_id=#{update_user_id},create_user_id=#{create_user_id} + where id = #{id} + + + + + + + + delete from user_group where id = #{id} + + + + + diff --git a/codemaker-cola/cola-infrast/src/main/resources/mapper/UserRoleMappingMapper.xml b/codemaker-cola/cola-infrast/src/main/resources/mapper/UserRoleMappingMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..83eee5f9a49255c733c17c0cb99ce0e734b07f88 --- /dev/null +++ b/codemaker-cola/cola-infrast/src/main/resources/mapper/UserRoleMappingMapper.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + id,user_id,role_code + + + + insert into user_role_mapping( + user_id,role_code + ) + values( + #{user_id},#{role_code} + ) + + + + update user_role_mapping + set + user_id=#{user_id},role_code=#{role_code} + where id = #{id} + + + + + + + + delete from user_role_mapping where id = #{id} + + + + + diff --git a/codemaker-cola/pom.xml b/codemaker-cola/pom.xml index ce2f10b1355a78fb51e6a30c0c1d224478c2c535..5ddc90670647acae6ed28c4f433ddb5ed1d447ad 100644 --- a/codemaker-cola/pom.xml +++ b/codemaker-cola/pom.xml @@ -173,10 +173,6 @@ ${rocketmq.version} - - - - diff --git a/codemaker-core/pom.xml b/codemaker-core/pom.xml index 74b169ce6d5176341ab043bd17750d1a560e1da3..3b45070a0ebf572f64168d168d6106772c6db9e5 100644 --- a/codemaker-core/pom.xml +++ b/codemaker-core/pom.xml @@ -11,7 +11,7 @@ com.coderman.codemaker codemaker-core - 1.2.0-- + 1.2.1-beta codemaker-core diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/AppService.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/AppService.java index 1722c49fdda33312b0426b403fbf6c8eb9a84e7d..3e885bd2c0e93b366fc07902299fef9eeaf9f029 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/AppService.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/AppService.java @@ -1,7 +1,5 @@ package com.coderman.codemaker.app; -import com.coderman.codemaker.service.IWriteFileService; - /** * Description: * date: 2021/6/22 diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/ColaAppService.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/ColaAppService.java index 5213c2e36a29a48290e2187afd3e54aa6b4692f8..85f928395d9cbc095f061184f61a2899940c0168 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/ColaAppService.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/ColaAppService.java @@ -1,7 +1,6 @@ package com.coderman.codemaker.app; import com.coderman.codemaker.enums.ModuleEnum; -import com.coderman.codemaker.service.IWriteFileService; import org.springframework.stereotype.Component; import javax.annotation.Resource; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/CommonWriteService.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/CommonWriteService.java new file mode 100644 index 0000000000000000000000000000000000000000..cd469ba2f594778c09f90ef5462dfacfbd4b4750 --- /dev/null +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/CommonWriteService.java @@ -0,0 +1,98 @@ +package com.coderman.codemaker.app; + +import com.coderman.codemaker.config.AppServiceConfig; +import com.coderman.codemaker.utils.Constant; +import org.apache.commons.io.FileUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.io.File; +import java.io.IOException; + +/** + * Description: + * date: 2021/7/8 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +@Service +public class CommonWriteService { + + @Autowired + private AppServiceConfig appServiceConfig; + + /** + * 写工具类文件 + * @param content + * @param modulePath + */ + public void writeSpringApplicationContext(String content,String modulePath) { + String packageName = appServiceConfig.getPackage(); + String packagePath = packageName.replace(".", "/"); + String filePath = Constant.JAVA + "/" + packagePath + "/utils"; + String fileName = "SpringApplicationContext.java"; + filePath = modulePath + filePath + "/" + fileName; + try { + FileUtils.write(new File(filePath), content, "UTF-8"); + } catch (IOException e) { + e.printStackTrace(); + } + } + + /** + * 写工具类文件 + * @param content + * @param modulePath + */ + public void writeAppEventPublisher(String content, String modulePath) { + String packageName = appServiceConfig.getPackage(); + String packagePath = packageName.replace(".", "/"); + String filePath = Constant.JAVA + "/" + packagePath + "/utils"; + String fileName = "AppEventPublisher.java"; + filePath = modulePath + filePath + "/" + fileName; + try { + FileUtils.write(new File(filePath), content, "UTF-8"); + } catch (IOException e) { + e.printStackTrace(); + } + } + + /** + * 写工具类文件 + * + * @param content + */ + public void writeBaseEvent(String content, String modulePath) { + String packageName = appServiceConfig.getPackage()+".domain.event"; + String packagePath = packageName.replace(".", "/"); + String filePath = Constant.JAVA + "/" + packagePath; + String fileName = "BaseEvent.java"; + filePath = modulePath + filePath + "/" + fileName; + try { + FileUtils.write(new File(filePath), content, "UTF-8"); + } catch (IOException e) { + e.printStackTrace(); + } + } + + + /** + * 写BaseController文件 + * + * @param content + */ + public void writeBaseController(String content, String modulePath) { + String packageName = appServiceConfig.getPackage(); + String packagePath = packageName.replace(".", "/"); + String filePath = Constant.JAVA + "/" + packagePath + "/controller"; + String fileName = "BaseController.java"; + filePath = modulePath + filePath + "/" + fileName; + try { + FileUtils.write(new File(filePath), content, "UTF-8"); + } catch (IOException e) { + e.printStackTrace(); + } + } +} diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/DubboAppService.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/DubboAppService.java index f438124097202f0503c12d237e91cadaa350937e..88e649b8a6ea5b62c99e68214e64a2c631f8cbe3 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/DubboAppService.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/DubboAppService.java @@ -1,7 +1,6 @@ package com.coderman.codemaker.app; import com.coderman.codemaker.enums.ModuleEnum; -import com.coderman.codemaker.service.IWriteFileService; import org.springframework.stereotype.Component; import javax.annotation.Resource; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/DynamicDDDAppService.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/DynamicDDDAppService.java index 30e9773fa989e39acae805e806a7c2a6d59baf3f..71d6d0b7d85d7a803d41ab5e5aeedcbdaeafcfe8 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/DynamicDDDAppService.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/DynamicDDDAppService.java @@ -1,6 +1,5 @@ package com.coderman.codemaker.app; -import com.coderman.codemaker.service.IWriteFileService; import org.springframework.stereotype.Component; import javax.annotation.Resource; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/IWriteFileService.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/IWriteFileService.java similarity index 47% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/IWriteFileService.java rename to codemaker-core/src/main/java/com/coderman/codemaker/app/IWriteFileService.java index 1d608a04fc45265722eb4d1f9b4efb2b773fc876..2e95c16fd7d150b91b32610f7ac3956a2bf48051 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/IWriteFileService.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/IWriteFileService.java @@ -1,4 +1,4 @@ -package com.coderman.codemaker.service; +package com.coderman.codemaker.app; import com.coderman.codemaker.bean.WriteContentBean; @@ -14,27 +14,10 @@ import java.util.Map; */ public interface IWriteFileService { - /** * 抽象写模块class文件 * @param writeContentBean */ void writeContent(WriteContentBean writeContentBean); - /** - * 一次性生成单表需要的所有模块代码 - * - * @param humpClassName - * @param varMap - */ - void writeAllContent(String humpClassName, Map varMap, String fast); - - /** - * 写公共基础服务类 - * - * @param varMap - */ - void writeCommonContent(Map varMap, String fast); - - } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/SpringBootAppService.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/SpringBootAppService.java index e2787c58486a5b2c8a05e93a72d327e980b90792..eacbee3bf1a8fa48e04610d198c0acf6e7274948 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/SpringBootAppService.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/SpringBootAppService.java @@ -1,7 +1,5 @@ package com.coderman.codemaker.app; -import com.coderman.codemaker.service.IWriteFileService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import javax.annotation.Resource; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/WriteService.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/WriteService.java index f72a7b8fb05c7425b60f8aeeff1a7c2546d9676e..ed33ea6eefcc36839cad4dbc2b820667ebd46063 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/WriteService.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/WriteService.java @@ -6,6 +6,7 @@ import com.coderman.codemaker.config.AppServiceConfig; import com.coderman.codemaker.utils.Constant; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -77,4 +78,19 @@ public abstract class WriteService { String fileName = classContentBean.getHumpClassName() + ".java"; return classContentBean.getModulePath() + packagePath + "/" + fileName; } + + + /** + * 写路由 + * @param classContentBean + */ + protected void writeRoute(ClassContentBean classContentBean){ + //走默认的包生成方式 + if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ + writeClassFile(classContentBean); + }else { + //走文档里的package包生成方式 + writeClassFileV2(classContentBean); + } + } } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaAdapterWriteServiceImpl.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaAdapterWriteServiceImpl.java index 49d2811a47ffebb93500a9a46fc584c8cdadd446..727f5fece12515d5d0fd19b63ee7d77af5a5f7a9 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaAdapterWriteServiceImpl.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaAdapterWriteServiceImpl.java @@ -1,22 +1,15 @@ package com.coderman.codemaker.app.cola; +import com.coderman.codemaker.app.CommonWriteService; import com.coderman.codemaker.app.WriteService; import com.coderman.codemaker.bean.ClassContentBean; import com.coderman.codemaker.bean.WriteContentBean; -import com.coderman.codemaker.config.AppServiceConfig; import com.coderman.codemaker.config.ProjectTemplateColaConfig; import com.coderman.codemaker.enums.TemplateFileEnum; -import com.coderman.codemaker.service.IWriteFileService; -import com.coderman.codemaker.utils.Constant; -import org.apache.commons.io.FileUtils; -import org.apache.commons.lang3.StringUtils; +import com.coderman.codemaker.app.IWriteFileService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.io.File; -import java.io.IOException; -import java.util.Map; - /** * Description: * date: 2021/7/6 @@ -31,115 +24,52 @@ public class ColaAdapterWriteServiceImpl extends WriteService implements IWriteF private ProjectTemplateColaConfig projectTemplateColaConfig; @Autowired - private AppServiceConfig appServiceConfig; + private CommonWriteService commonWriteService; @Override public void writeContent(WriteContentBean writeContentBean) { + ClassContentBean classContentBean = writeContentBean.buildClassContentBean(projectTemplateColaConfig.getModuleAdapterPath()); + //写vo if(writeContentBean.getTemplateName().equals(TemplateFileEnum.VO.getTempFileName())){ - - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); classContentBean.setHumpClassName(writeContentBean.getHumpClassName().endsWith("VO") ? writeContentBean.getHumpClassName() : writeContentBean.getHumpClassName()+"VO"); classContentBean.setChildPackageName("vo"); classContentBean.setClassSuffix("VO.java"); - classContentBean.setModulePath(projectTemplateColaConfig.getModuleAdapterPath()); - writeClassFile(classContentBean); } //写vo-ddd if(writeContentBean.getTemplateName().equals(TemplateFileEnum.VO_DDD.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setChildPackageName("adapter.vo"); classContentBean.setClassSuffix("VO.java"); - classContentBean.setModulePath(projectTemplateColaConfig.getModuleAdapterPath()); - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } + writeRoute(classContentBean); } //写controller if(writeContentBean.getTemplateName().equals(TemplateFileEnum.CONTROLLER.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); classContentBean.setHumpClassName(writeContentBean.getHumpClassName().endsWith("Controller") ? writeContentBean.getHumpClassName() : writeContentBean.getHumpClassName()+"Controller"); classContentBean.setChildPackageName("controller"); classContentBean.setClassSuffix("Controller.java"); - classContentBean.setModulePath(projectTemplateColaConfig.getModuleAdapterPath()); writeClassFile(classContentBean); } //写controller-ddd if(writeContentBean.getTemplateName().equals(TemplateFileEnum.CONTROLLER_DDD.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setChildPackageName("adapter.controller"); classContentBean.setClassSuffix("Controller.java"); - classContentBean.setModulePath(projectTemplateColaConfig.getModuleAdapterPath()); - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } + writeRoute(classContentBean); } //写convert if(writeContentBean.getTemplateName().equals(TemplateFileEnum.CONVERT.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateColaConfig.getModuleAdapterPath()); writeClassFileV2(classContentBean); } //指定服务类 or 工具类 if(writeContentBean.getTemplateName().equals(TemplateFileEnum.BASE_CONTROLLER.getTempFileName())){ - writeBaseController(writeContentBean.getContent()); + commonWriteService.writeBaseController(writeContentBean.getContent(),projectTemplateColaConfig.getModuleAdapterPath()); } - } - @Override - public void writeAllContent(String humpClassName, Map varMap, String fast) { - - } - - @Override - public void writeCommonContent(Map varMap, String fast) { - - } - - /** - * 写BaseController文件 - * - * @param content - */ - public void writeBaseController(String content) { - String packageName = appServiceConfig.getPackage(); - String packagePath = packageName.replace(".", "/"); - String filePath = Constant.JAVA + "/" + packagePath + "/controller"; - String fileName = "BaseController.java"; - filePath = projectTemplateColaConfig.getModuleAdapterPath() + filePath + "/" + fileName; - try { - FileUtils.write(new File(filePath), content, "UTF-8"); - } catch (IOException e) { - e.printStackTrace(); - } - } } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaAppWriteServiceImpl.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaAppWriteServiceImpl.java index 228676785c3e1bc8d7b57bbf58ddcee2c17baa09..4b6bd7d6b7d36c302f6d6be9b63b3c2dfedc17cc 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaAppWriteServiceImpl.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaAppWriteServiceImpl.java @@ -1,22 +1,16 @@ package com.coderman.codemaker.app.cola; +import com.coderman.codemaker.app.CommonWriteService; import com.coderman.codemaker.app.WriteService; import com.coderman.codemaker.bean.ClassContentBean; import com.coderman.codemaker.bean.WriteContentBean; import com.coderman.codemaker.config.AppServiceConfig; import com.coderman.codemaker.config.ProjectTemplateColaConfig; import com.coderman.codemaker.enums.TemplateFileEnum; -import com.coderman.codemaker.service.IWriteFileService; -import com.coderman.codemaker.utils.Constant; -import org.apache.commons.io.FileUtils; -import org.apache.commons.lang3.StringUtils; +import com.coderman.codemaker.app.IWriteFileService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.io.File; -import java.io.IOException; -import java.util.Map; - /** * Description: * date: 2021/7/6 @@ -33,132 +27,52 @@ public class ColaAppWriteServiceImpl extends WriteService implements IWriteFileS @Autowired private ProjectTemplateColaConfig projectTemplateColaConfig; + @Autowired + private CommonWriteService commonWriteService; + + @Override public void writeContent(WriteContentBean writeContentBean) { + ClassContentBean classContentBean = writeContentBean.buildClassContentBean(projectTemplateColaConfig.getModuleAppPath()); + //写FacadeImpl if(writeContentBean.getTemplateName().equals(TemplateFileEnum.FACADE_IMPL.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); classContentBean.setHumpClassName(writeContentBean.getHumpClassName().toLowerCase().endsWith("facadeimpl") ? writeContentBean.getHumpClassName() : writeContentBean.getHumpClassName()+"FacadeImpl"); classContentBean.setChildPackageName("app.facadeimpl"); - classContentBean.setModulePath(projectTemplateColaConfig.getModuleAppPath()); - writeClassFile(classContentBean); - - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //lassContentBean.setClassPackageName(appServiceConfig.getPackage()+"/app/facadeimpl"); - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } + writeRoute(classContentBean); } - //写app.cmd if(writeContentBean.getTemplateName().equals(TemplateFileEnum.CMD.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); classContentBean.setChildPackageName("app.command"); - classContentBean.setModulePath(projectTemplateColaConfig.getModuleAppPath()); - - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } + writeRoute(classContentBean); } //写app.exe if(writeContentBean.getTemplateName().equals(TemplateFileEnum.EXE.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); classContentBean.setChildPackageName("app.executor"); - classContentBean.setModulePath(projectTemplateColaConfig.getModuleAppPath()); - - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } + writeRoute(classContentBean); } //写convert if(writeContentBean.getTemplateName().equals(TemplateFileEnum.CONVERT.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); - classContentBean.setModulePath(projectTemplateColaConfig.getModuleAppPath()); classContentBean.setClassPackageName(appServiceConfig.getPackage()+".app.convert"); - writeClassFileV2(classContentBean); } //写app.listener if(writeContentBean.getTemplateName().equals(TemplateFileEnum.MQ_LISTENER.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("app.listener"); - classContentBean.setClassSuffix(""); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateColaConfig.getModuleAppPath()); - - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } + writeRoute(classContentBean); } - - //指定服务类 or 工具类 if(writeContentBean.getTemplateName().equals(TemplateFileEnum.SPRING_APPLICATION_CONTEXT.getTempFileName())){ - writeSpringApplicationContext(writeContentBean.getContent()); + commonWriteService.writeSpringApplicationContext(writeContentBean.getContent(),projectTemplateColaConfig.getModuleAppPath()); } - } - - @Override - public void writeAllContent(String humpClassName, Map varMap, String fast) { - - } - - @Override - public void writeCommonContent(Map varMap, String fast) { - - } - - - /** - * 写工具类文件 - * - * @param content - */ - public void writeSpringApplicationContext(String content) { - String packageName = appServiceConfig.getPackage(); - String packagePath = packageName.replace(".", "/"); - String filePath = Constant.JAVA + "/" + packagePath + "/utils"; - String fileName = "SpringApplicationContext.java"; - filePath = projectTemplateColaConfig.getModuleAppPath() + filePath + "/" + fileName; - try { - FileUtils.write(new File(filePath), content, "UTF-8"); - } catch (IOException e) { - e.printStackTrace(); + //指定服务类 or 工具类 + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.APP_EVENT_PUBLISHER.getTempFileName())){ + commonWriteService.writeAppEventPublisher(writeContentBean.getContent(),projectTemplateColaConfig.getModuleAppPath()); } } - - - - } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaClientWriteServiceImpl.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaClientWriteServiceImpl.java index 621d24b800055b7b2bf9de4c7cdf6ea107b75cfc..8749ac5a01b4ecf5cf96810fe1d4f223457937fb 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaClientWriteServiceImpl.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaClientWriteServiceImpl.java @@ -6,7 +6,7 @@ import com.coderman.codemaker.bean.WriteContentBean; import com.coderman.codemaker.config.AppServiceConfig; import com.coderman.codemaker.config.ProjectTemplateColaConfig; import com.coderman.codemaker.enums.TemplateFileEnum; -import com.coderman.codemaker.service.IWriteFileService; +import com.coderman.codemaker.app.IWriteFileService; import com.coderman.codemaker.utils.Constant; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; @@ -15,7 +15,6 @@ import org.springframework.stereotype.Component; import java.io.File; import java.io.IOException; -import java.util.Map; /** * Description: @@ -36,63 +35,33 @@ public class ColaClientWriteServiceImpl extends WriteService implements IWriteFi @Override public void writeContent(WriteContentBean writeContentBean) { + ClassContentBean classContentBean = writeContentBean.buildClassContentBean(projectTemplateColaConfig.getModuleClientPath()); + //写api.dto-ddd if(writeContentBean.getTemplateName().equals(TemplateFileEnum.DTO_DDD.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); classContentBean.setChildPackageName("api.dto"); classContentBean.setClassSuffix("DTO.java"); - classContentBean.setModulePath(projectTemplateColaConfig.getModuleClientPath()); - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } + writeRoute(classContentBean); } //写api.dto if(writeContentBean.getTemplateName().equals(TemplateFileEnum.DTO.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("dto"); classContentBean.setClassSuffix("DTO.java"); writeDTO(classContentBean); } - //写api.facade if(writeContentBean.getTemplateName().equals(TemplateFileEnum.FACADE.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); classContentBean.setHumpClassName(writeContentBean.getHumpClassName().toLowerCase().endsWith("facade") ? writeContentBean.getHumpClassName() : writeContentBean.getHumpClassName()+"Facade"); classContentBean.setChildPackageName("api.facade"); classContentBean.setClassSuffix("Facade.java"); - - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateColaConfig.getModuleClientPath()); - - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } + writeRoute(classContentBean); } //写domain.enum if(writeContentBean.getTemplateName().equals(TemplateFileEnum.ENUM.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("api.enums"); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateColaConfig.getModuleClientPath()); //走默认的包生成方式 if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ writeClassFile(classContentBean); @@ -102,18 +71,6 @@ public class ColaClientWriteServiceImpl extends WriteService implements IWriteFi writeClassFileV2(classContentBean); } } - - - } - - @Override - public void writeAllContent(String humpClassName, Map varMap, String fast) { - - } - - @Override - public void writeCommonContent(Map varMap, String fast) { - } /** @@ -143,5 +100,4 @@ public class ColaClientWriteServiceImpl extends WriteService implements IWriteFi return projectTemplateColaConfig.getModuleClientPath() + packagePath + "/" + fileName; } - } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaDomainWriteServiceImpl.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaDomainWriteServiceImpl.java index 7c0a7256f2676c8c0b15bec149f4bd415f9bb485..e805ab7a514e02cb85328b51f89db0af6bf7c87e 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaDomainWriteServiceImpl.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaDomainWriteServiceImpl.java @@ -1,23 +1,15 @@ package com.coderman.codemaker.app.cola; +import com.coderman.codemaker.app.CommonWriteService; import com.coderman.codemaker.app.WriteService; import com.coderman.codemaker.bean.ClassContentBean; import com.coderman.codemaker.bean.WriteContentBean; -import com.coderman.codemaker.config.AppServiceConfig; import com.coderman.codemaker.config.ProjectTemplateColaConfig; -import com.coderman.codemaker.config.ProjectTemplateDynamicDDDConfig; import com.coderman.codemaker.enums.TemplateFileEnum; -import com.coderman.codemaker.service.IWriteFileService; -import com.coderman.codemaker.utils.Constant; -import org.apache.commons.io.FileUtils; -import org.apache.commons.lang3.StringUtils; +import com.coderman.codemaker.app.IWriteFileService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.io.File; -import java.io.IOException; -import java.util.Map; - /** * Description: * date: 2021/7/6 @@ -32,175 +24,75 @@ public class ColaDomainWriteServiceImpl extends WriteService implements IWriteFi @Autowired private ProjectTemplateColaConfig projectTemplateColaConfig; + @Autowired + private CommonWriteService commonWriteService; + @Override public void writeContent(WriteContentBean writeContentBean) { - //写domain.bo-ddd + ClassContentBean classContentBean = writeContentBean.buildClassContentBean(projectTemplateColaConfig.getModuleDomainPath()); + + //写domain.bo-ddd if(writeContentBean.getTemplateName().equals(TemplateFileEnum.BUSINESS_OBJECT_DDD.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("domain.bo"); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateColaConfig.getModuleDomainPath()); - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } + writeRoute(classContentBean); } //写model.bo if(writeContentBean.getTemplateName().equals(TemplateFileEnum.BUSINESS_OBJECT.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); classContentBean.setHumpClassName(writeContentBean.getHumpClassName().toLowerCase().endsWith("bo") ? writeContentBean.getHumpClassName() : writeContentBean.getHumpClassName()+"BO"); classContentBean.setChildPackageName("model.bo"); classContentBean.setClassSuffix("BO.java"); - classContentBean.setModulePath(projectTemplateColaConfig.getModuleDomainPath()); - writeClassFile(classContentBean); } //写domain.enum if(writeContentBean.getTemplateName().equals(TemplateFileEnum.ENUM.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("domain.enums"); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateColaConfig.getModuleDomainPath()); - - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } + writeRoute(classContentBean); } //写domain.valueobject if(writeContentBean.getTemplateName().equals(TemplateFileEnum.VALUE_OBJECT.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("domain.valueobject"); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateColaConfig.getModuleDomainPath()); - - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } + writeRoute(classContentBean); } //写domain.msgbody if(writeContentBean.getTemplateName().equals(TemplateFileEnum.MESSAGE_BODY.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("domain.msgbody"); - classContentBean.setClassSuffix(""); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateColaConfig.getModuleDomainPath()); - - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } - + writeRoute(classContentBean); } //写domain.event if(writeContentBean.getTemplateName().equals(TemplateFileEnum.EVENT_BODY.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("domain.event"); - classContentBean.setClassSuffix(""); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateColaConfig.getModuleDomainPath()); - - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } - + writeRoute(classContentBean); } //写domain.gataway if(writeContentBean.getTemplateName().equals(TemplateFileEnum.GATAWAY.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("domain.gataway"); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateColaConfig.getModuleDomainPath()); - - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } + writeRoute(classContentBean); } //写domain.factory if(writeContentBean.getTemplateName().equals(TemplateFileEnum.FACTORY.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("domain.factory"); - classContentBean.setClassSuffix(""); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateColaConfig.getModuleDomainPath()); - - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } + writeRoute(classContentBean); } //写service if(writeContentBean.getTemplateName().equals(TemplateFileEnum.SERVICE.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("service"); classContentBean.setClassSuffix("Service.java"); classContentBean.setHumpClassName(writeContentBean.getHumpClassName().toLowerCase().endsWith("service") ? writeContentBean.getHumpClassName() : writeContentBean.getHumpClassName()+"Service"); - classContentBean.setModulePath(projectTemplateColaConfig.getModuleDomainPath()); writeClassFile(classContentBean); } + //写BaseEvent + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.APP_EVENT_PUBLISHER.getTempFileName())){ + commonWriteService.writeBaseEvent(writeContentBean.getContent(),projectTemplateColaConfig.getModuleDomainPath()); + } } - @Override - public void writeAllContent(String humpClassName, Map varMap, String fast) { - - } - - @Override - public void writeCommonContent(Map varMap, String fast) { - - } - - - - } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaInfrastWriteServiceImpl.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaInfrastWriteServiceImpl.java index d330c535bf92386d36fb254b33cbae2ed0e6f56a..8aa7893f69a23fea33537df1dc6a57ab93317614 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaInfrastWriteServiceImpl.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaInfrastWriteServiceImpl.java @@ -5,9 +5,8 @@ import com.coderman.codemaker.bean.ClassContentBean; import com.coderman.codemaker.bean.WriteContentBean; import com.coderman.codemaker.config.AppServiceConfig; import com.coderman.codemaker.config.ProjectTemplateColaConfig; -import com.coderman.codemaker.config.ProjectTemplateDubboConfig; import com.coderman.codemaker.enums.TemplateFileEnum; -import com.coderman.codemaker.service.IWriteFileService; +import com.coderman.codemaker.app.IWriteFileService; import com.coderman.codemaker.utils.Constant; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; @@ -16,7 +15,6 @@ import org.springframework.stereotype.Component; import java.io.File; import java.io.IOException; -import java.util.Map; /** * Description: @@ -36,20 +34,16 @@ public class ColaInfrastWriteServiceImpl extends WriteService implements IWriteF @Override public void writeContent(WriteContentBean writeContentBean) { + ClassContentBean classContentBean = writeContentBean.buildClassContentBean(projectTemplateColaConfig.getModuleInfrastPath()); + //写do class if(writeContentBean.getTemplateName().equals(TemplateFileEnum.DATA_OBJECT.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("dataobject"); classContentBean.setClassSuffix("DO.java"); writeDO(classContentBean); } //写mapper class if(writeContentBean.getTemplateName().equals(TemplateFileEnum.MAPPER.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("mapper"); classContentBean.setClassSuffix("Mapper.java"); writeMapper(classContentBean); @@ -57,9 +51,6 @@ public class ColaInfrastWriteServiceImpl extends WriteService implements IWriteF //写mapper.xml if(writeContentBean.getTemplateName().equals(TemplateFileEnum.MAPPER_XML.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("mapper"); classContentBean.setClassSuffix("Mapper.xml"); writeMapperXml(classContentBean); @@ -67,12 +58,8 @@ public class ColaInfrastWriteServiceImpl extends WriteService implements IWriteF //写domain.gataway.impl if(writeContentBean.getTemplateName().equals(TemplateFileEnum.GATAWAY_IMPL.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("gatawayimpl"); classContentBean.setClassPackageName(writeContentBean.getClassPackageName()+".gatawayimpl"); - classContentBean.setModulePath(projectTemplateColaConfig.getModuleInfrastPath()); //走默认的包生成方式 if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ @@ -86,13 +73,8 @@ public class ColaInfrastWriteServiceImpl extends WriteService implements IWriteF //写domain.repository.impl if(writeContentBean.getTemplateName().equals(TemplateFileEnum.REPOSITORY_IMPL.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("repositoryimpl"); classContentBean.setClassPackageName(writeContentBean.getClassPackageName()+".repositoryimpl"); - classContentBean.setModulePath(projectTemplateColaConfig.getModuleInfrastPath()); - //走默认的包生成方式 if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ writeClassFile(classContentBean); @@ -106,95 +88,46 @@ public class ColaInfrastWriteServiceImpl extends WriteService implements IWriteF //写infrast.acl if(writeContentBean.getTemplateName().equals(TemplateFileEnum.ACL.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); if(writeContentBean.getHumpClassName().toLowerCase().contains(TemplateFileEnum.ACL.getTempFileName())){ classContentBean.setChildPackageName("infrast.acl"); }else { classContentBean.setChildPackageName("infrast.adapter"); } - classContentBean.setClassSuffix(""); - classContentBean.setModulePath(projectTemplateColaConfig.getModuleInfrastPath()); - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } + writeRoute(classContentBean); } //写infrast.acl.impl if(writeContentBean.getTemplateName().equals(TemplateFileEnum.ACL_IMPL.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); if(writeContentBean.getHumpClassName().toLowerCase().contains(TemplateFileEnum.ACL.getTempFileName())){ classContentBean.setChildPackageName("infrast.acl.impl"); }else { classContentBean.setChildPackageName("infrast.adapter.impl"); } - classContentBean.setClassSuffix(""); - classContentBean.setModulePath(projectTemplateColaConfig.getModuleInfrastPath()); - - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } + writeRoute(classContentBean); } //写acl.param if(writeContentBean.getTemplateName().equals(TemplateFileEnum.ACL_PARAM.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateColaConfig.getModuleInfrastPath()); writeClassFileV2(classContentBean); } //写convert if(writeContentBean.getTemplateName().equals(TemplateFileEnum.CONVERT.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateColaConfig.getModuleInfrastPath()); classContentBean.setClassPackageName(appServiceConfig.getPackage()+".infrast.dataconvert"); - writeClassFileV2(classContentBean); } //写serviceimpl if(writeContentBean.getTemplateName().equals(TemplateFileEnum.SERVICE_IMPL.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); - classContentBean.setChildPackageName("service.impl"); + classContentBean.setChildPackageName("infrast.service.impl"); classContentBean.setClassSuffix("ServiceImpl.java"); classContentBean.setHumpClassName(writeContentBean.getHumpClassName().toLowerCase().endsWith("serviceimpl") ? writeContentBean.getHumpClassName() : writeContentBean.getHumpClassName()+"ServiceImpl"); - - classContentBean.setModulePath(projectTemplateColaConfig.getModuleInfrastPath()); - writeClassFile(classContentBean); } //写infras.mq.consumer if(writeContentBean.getTemplateName().equals(TemplateFileEnum.MQ_CONSUMER.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("mq.consumer"); - classContentBean.setClassSuffix(""); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateColaConfig.getModuleInfrastPath()); - //走默认的包生成方式 if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ writeClassFile(classContentBean); @@ -208,14 +141,7 @@ public class ColaInfrastWriteServiceImpl extends WriteService implements IWriteF //写infras.mq.handler if(writeContentBean.getTemplateName().equals(TemplateFileEnum.MQ_HANDLER.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("mq.handler"); - classContentBean.setClassSuffix(""); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateColaConfig.getModuleInfrastPath()); - //走默认的包生成方式 if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ writeClassFile(classContentBean); @@ -228,14 +154,7 @@ public class ColaInfrastWriteServiceImpl extends WriteService implements IWriteF //写infras.mq.producer if(writeContentBean.getTemplateName().equals(TemplateFileEnum.MQ_PRODUCER.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("mq.producer"); - classContentBean.setClassSuffix(""); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateColaConfig.getModuleInfrastPath()); - //走默认的包生成方式 if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ writeClassFile(classContentBean); @@ -247,15 +166,17 @@ public class ColaInfrastWriteServiceImpl extends WriteService implements IWriteF } - } - - @Override - public void writeAllContent(String humpClassName, Map varMap, String fast) { - - } - - @Override - public void writeCommonContent(Map varMap, String fast) { + //写infrast.dao.mapper + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.MAPPER_DDD.getTempFileName())){ + classContentBean.setChildPackageName("infrast.dao.mapper"); + writeRoute(classContentBean); + } + //写mapper.xml + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.MAPPER_XML_DDD.getTempFileName())){ + classContentBean.setChildPackageName("mapper"); + classContentBean.setClassSuffix(".xml"); + writeMapperXml(classContentBean); + } } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dubbo/DubboApiWriteServiceImpl.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/dubbo/DubboApiWriteServiceImpl.java index 20ce8b3d0efdfecec6f086e92fa67a9bfd2a0f05..bd1fa1a266e79c5fc637b7aafd4f568240efee31 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/dubbo/DubboApiWriteServiceImpl.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/dubbo/DubboApiWriteServiceImpl.java @@ -6,16 +6,14 @@ import com.coderman.codemaker.bean.WriteContentBean; import com.coderman.codemaker.config.AppServiceConfig; import com.coderman.codemaker.config.ProjectTemplateDubboConfig; import com.coderman.codemaker.enums.TemplateFileEnum; -import com.coderman.codemaker.service.IWriteFileService; +import com.coderman.codemaker.app.IWriteFileService; import com.coderman.codemaker.utils.Constant; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.io.File; import java.io.IOException; -import java.util.Map; /** * Description: @@ -38,90 +36,31 @@ public class DubboApiWriteServiceImpl extends WriteService implements IWriteFile @Override public void writeContent(WriteContentBean writeContentBean) { + ClassContentBean classContentBean = writeContentBean.buildClassContentBean(projectTemplateDubboConfig.getModuleApiPath()); + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.DTO.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); - classContentBean.setChildPackageName("dto"); + classContentBean.setChildPackageName("api.dto"); classContentBean.setClassSuffix("DTO.java"); writeDTO(classContentBean); } //写api.dto-ddd if(writeContentBean.getTemplateName().equals(TemplateFileEnum.DTO_DDD.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setChildPackageName("api.dto"); classContentBean.setClassSuffix("DTO.java"); - classContentBean.setModulePath(projectTemplateDubboConfig.getModuleApiPath()); - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } + writeRoute(classContentBean); } //写facade if(writeContentBean.getTemplateName().equals(TemplateFileEnum.FACADE.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); classContentBean.setHumpClassName(writeContentBean.getHumpClassName().toLowerCase().endsWith("facade") ? writeContentBean.getHumpClassName() : writeContentBean.getHumpClassName()+"Facade"); - classContentBean.setChildPackageName("facade"); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); + classContentBean.setChildPackageName("api.facade"); classContentBean.setClassSuffix("Facade.java"); - classContentBean.setModulePath(projectTemplateDubboConfig.getModuleApiPath()); - - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } + writeRoute(classContentBean); } //写domain.enum if(writeContentBean.getTemplateName().equals(TemplateFileEnum.ENUM.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); - classContentBean.setChildPackageName("enums"); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateDubboConfig.getModuleApiPath()); - - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } - } - } - - @Override - public void writeAllContent(String humpClassName, Map varMap, String fast) { - - } - - @Override - public void writeCommonContent(Map varMap, String fast) { - - } - - /** - * 写Facade文件 - * @param classContentBean - */ - public void writeFacade(ClassContentBean classContentBean) { - String filePath = getFilePath(classContentBean.getChildPackageName(), classContentBean.getHumpClassName(), classContentBean.getClassSuffix()); - try { - FileUtils.write(new File(filePath), classContentBean.getClassContent(), "UTF-8"); - } catch (IOException e) { - e.printStackTrace(); + classContentBean.setChildPackageName("domain.enums"); + writeRoute(classContentBean); } } @@ -147,7 +86,7 @@ public class DubboApiWriteServiceImpl extends WriteService implements IWriteFile */ private String getFilePath(String childPackageName, String humpClassName, String classSuffix) { String packageName = appServiceConfig.getPackage(); - String packagePath = packageName.replace(".", "/") + "/api"; + String packagePath = packageName.replace(".", "/"); packagePath = Constant.JAVA + "/" + packagePath + "/" + childPackageName; String fileName = humpClassName + classSuffix; return projectTemplateDubboConfig.getModuleApiPath() + packagePath + "/" + fileName; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dubbo/DubboCommonWriteServiceImpl.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/dubbo/DubboCommonWriteServiceImpl.java index fe0dc64e256d3755af94aa3e922eb18a0c79b65a..0bdbe9fe392057598fa6ed98fd483a7c7aa3a181 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/dubbo/DubboCommonWriteServiceImpl.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/dubbo/DubboCommonWriteServiceImpl.java @@ -1,11 +1,12 @@ package com.coderman.codemaker.app.dubbo; +import com.coderman.codemaker.app.WriteService; import com.coderman.codemaker.bean.ClassContentBean; import com.coderman.codemaker.bean.WriteContentBean; import com.coderman.codemaker.config.AppServiceConfig; import com.coderman.codemaker.config.ProjectTemplateDubboConfig; import com.coderman.codemaker.enums.TemplateFileEnum; -import com.coderman.codemaker.service.IWriteFileService; +import com.coderman.codemaker.app.IWriteFileService; import com.coderman.codemaker.utils.Constant; import org.apache.commons.io.FileUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -13,7 +14,6 @@ import org.springframework.stereotype.Component; import java.io.File; import java.io.IOException; -import java.util.Map; /** * Description: @@ -25,7 +25,7 @@ import java.util.Map; * 写持久层模块服务 */ @Component(value = "dubboCommonWriteFileService") -public class DubboCommonWriteServiceImpl implements IWriteFileService { +public class DubboCommonWriteServiceImpl extends WriteService implements IWriteFileService { @Autowired private ProjectTemplateDubboConfig projectTemplateDubboConfig; @@ -35,20 +35,16 @@ public class DubboCommonWriteServiceImpl implements IWriteFileService { @Override public void writeContent(WriteContentBean writeContentBean) { + ClassContentBean classContentBean = writeContentBean.buildClassContentBean(projectTemplateDubboConfig.getModuleCommonPath()); + //写do class if(writeContentBean.getTemplateName().equals(TemplateFileEnum.DATA_OBJECT.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); - classContentBean.setChildPackageName("dataobject"); + classContentBean.setChildPackageName("infrast.dao.dataobject"); classContentBean.setClassSuffix("DO.java"); writeDO(classContentBean); } //写mapper class if(writeContentBean.getTemplateName().equals(TemplateFileEnum.MAPPER.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("mapper"); classContentBean.setClassSuffix("Mapper.java"); writeMapper(classContentBean); @@ -56,23 +52,15 @@ public class DubboCommonWriteServiceImpl implements IWriteFileService { //写mapper.xml if(writeContentBean.getTemplateName().equals(TemplateFileEnum.MAPPER_XML.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("mapper"); classContentBean.setClassSuffix("Mapper.xml"); writeMapperXml(classContentBean); } - } - - @Override - public void writeAllContent(String humpClassName, Map varMap, String fast) { - - } - - @Override - public void writeCommonContent(Map varMap, String fast) { - + //写infrast.dao.mapper + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.MAPPER_DDD.getTempFileName())){ + classContentBean.setChildPackageName("infrast.dao.mapper"); + writeRoute(classContentBean); + } } /** @@ -123,7 +111,7 @@ public class DubboCommonWriteServiceImpl implements IWriteFileService { */ private String getFilePath(String childPackageName, String humpClassName, String classSuffix) { String packageName = appServiceConfig.getPackage(); - String packagePath = packageName.replace(".", "/") + "/dao"; + String packagePath = packageName.replace(".", "/") ; packagePath = Constant.JAVA + "/" + packagePath + "/" + childPackageName; String fileName = humpClassName + classSuffix; return projectTemplateDubboConfig.getModuleCommonPath() + packagePath + "/" + fileName; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dubbo/DubboCoreWriteServiceImpl.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/dubbo/DubboCoreWriteServiceImpl.java index de0dfc286b73806501cbc811611af55d841f0eee..9a9a3c6ad7bce08d90dedfd5771496cb8efd6867 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/dubbo/DubboCoreWriteServiceImpl.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/dubbo/DubboCoreWriteServiceImpl.java @@ -1,12 +1,13 @@ package com.coderman.codemaker.app.dubbo; +import com.coderman.codemaker.app.CommonWriteService; import com.coderman.codemaker.app.WriteService; import com.coderman.codemaker.bean.ClassContentBean; import com.coderman.codemaker.bean.WriteContentBean; import com.coderman.codemaker.config.AppServiceConfig; import com.coderman.codemaker.config.ProjectTemplateDubboConfig; import com.coderman.codemaker.enums.TemplateFileEnum; -import com.coderman.codemaker.service.IWriteFileService; +import com.coderman.codemaker.app.IWriteFileService; import com.coderman.codemaker.utils.Constant; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; @@ -15,7 +16,6 @@ import org.springframework.stereotype.Component; import java.io.File; import java.io.IOException; -import java.util.Map; /** * Description: @@ -35,69 +35,39 @@ public class DubboCoreWriteServiceImpl extends WriteService implements IWriteFi @Autowired private AppServiceConfig appServiceConfig; + @Autowired + private CommonWriteService commonWriteService; + @Override public void writeContent(WriteContentBean writeContentBean) { + ClassContentBean classContentBean = writeContentBean.buildClassContentBean(projectTemplateDubboConfig.getModuleCorePath()); + //写FacadeImpl if(writeContentBean.getTemplateName().equals(TemplateFileEnum.FACADE_IMPL.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("facade.impl"); classContentBean.setClassSuffix("FacadeImpl.java"); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateDubboConfig.getModuleCorePath()); - - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } + writeRoute(classContentBean); } //写model.bo if(writeContentBean.getTemplateName().equals(TemplateFileEnum.BUSINESS_OBJECT.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("model.bo"); classContentBean.setClassSuffix("BO.java"); writeClassFile(classContentBean); } //写domain.bo-ddd if(writeContentBean.getTemplateName().equals(TemplateFileEnum.BUSINESS_OBJECT_DDD.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("domain.bo"); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateDubboConfig.getModuleCorePath()); - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } + writeRoute(classContentBean); } - //写convert if(writeContentBean.getTemplateName().equals(TemplateFileEnum.CONVERT.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateDubboConfig.getModuleCorePath()); writeClassFileV2(classContentBean); } //写service if(writeContentBean.getTemplateName().equals(TemplateFileEnum.SERVICE.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("service"); classContentBean.setClassSuffix("Service.java"); writeClassFile(classContentBean); @@ -106,9 +76,6 @@ public class DubboCoreWriteServiceImpl extends WriteService implements IWriteFi //写serviceimpl if(writeContentBean.getTemplateName().equals(TemplateFileEnum.SERVICE_IMPL.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("service.impl"); classContentBean.setClassSuffix("ServiceImpl.java"); writeClassFile(classContentBean); @@ -116,9 +83,6 @@ public class DubboCoreWriteServiceImpl extends WriteService implements IWriteFi //写test if(writeContentBean.getTemplateName().equals(TemplateFileEnum.TEST.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("test"); classContentBean.setClassSuffix("FacadeTest.java"); writeClassTestFile(classContentBean); @@ -126,281 +90,131 @@ public class DubboCoreWriteServiceImpl extends WriteService implements IWriteFi //写Application类 if(writeContentBean.getTemplateName().equals(TemplateFileEnum.APPLICATION.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName(""); - classContentBean.setClassSuffix(""); writeClassFile(classContentBean); } //写Aop类 if(writeContentBean.getTemplateName().equals(TemplateFileEnum.FACADE_AOP.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("aop"); - classContentBean.setClassSuffix(""); writeClassFile(classContentBean); } //写springapplication if(writeContentBean.getTemplateName().equals(TemplateFileEnum.SPRING_APPLICATION_CONTEXT.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("utils"); - classContentBean.setClassSuffix(""); + writeClassFile(classContentBean); + } + + + //指定服务类 or 工具类 + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.APP_EVENT_PUBLISHER.getTempFileName())){ + classContentBean.setChildPackageName("utils"); writeClassFile(classContentBean); } //写domain.enum if(writeContentBean.getTemplateName().equals(TemplateFileEnum.ENUM.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("domain.enums"); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateDubboConfig.getModuleCorePath()); - - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } + writeRoute(classContentBean); } //写domain.valueobject if(writeContentBean.getTemplateName().equals(TemplateFileEnum.VALUE_OBJECT.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("domain.valueobject"); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateDubboConfig.getModuleCorePath()); - - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } + writeRoute(classContentBean); } //写domain.msgbody if(writeContentBean.getTemplateName().equals(TemplateFileEnum.MESSAGE_BODY.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("domain.msgbody"); - classContentBean.setClassSuffix(""); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateDubboConfig.getModuleCorePath()); - - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } - + writeRoute(classContentBean); } - //写domain.event if(writeContentBean.getTemplateName().equals(TemplateFileEnum.EVENT_BODY.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("domain.event"); - classContentBean.setClassSuffix(""); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateDubboConfig.getModuleCorePath()); - - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } - + writeRoute(classContentBean); } //写domain.gataway if(writeContentBean.getTemplateName().equals(TemplateFileEnum.GATAWAY.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("domain.gataway"); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateDubboConfig.getModuleCorePath()); - - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } + writeRoute(classContentBean); } //写domain.gataway.impl if(writeContentBean.getTemplateName().equals(TemplateFileEnum.GATAWAY_IMPL.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("gataway.impl"); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateDubboConfig.getModuleCorePath()); + writeRoute(classContentBean); + } + + //写domain.repository.impl + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.REPOSITORY_IMPL.getTempFileName())){ + classContentBean.setChildPackageName("repositoryimpl"); + classContentBean.setClassPackageName(writeContentBean.getClassPackageName()+".repositoryimpl"); //走默认的包生成方式 if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ writeClassFile(classContentBean); }else { //走文档里的package包生成方式 + classContentBean.setClassPackageName(appServiceConfig.getPackage()+".infrast.repositoryimpl"); writeClassFileV2(classContentBean); } } + + //写infrast.acl if(writeContentBean.getTemplateName().equals(TemplateFileEnum.ACL.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); if(writeContentBean.getHumpClassName().toLowerCase().contains(TemplateFileEnum.ACL.getTempFileName())){ classContentBean.setChildPackageName("infrast.acl"); }else { classContentBean.setChildPackageName("infrast.adapter"); } - classContentBean.setClassSuffix(""); - classContentBean.setModulePath(projectTemplateDubboConfig.getModuleCorePath()); - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } + writeRoute(classContentBean); } //写infrast.acl.impl if(writeContentBean.getTemplateName().equals(TemplateFileEnum.ACL_IMPL.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); if(writeContentBean.getHumpClassName().toLowerCase().contains(TemplateFileEnum.ACL.getTempFileName())){ classContentBean.setChildPackageName("infrast.acl.impl"); }else { classContentBean.setChildPackageName("infrast.adapter.impl"); } - classContentBean.setClassSuffix(""); - classContentBean.setModulePath(projectTemplateDubboConfig.getModuleCorePath()); - - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } + writeRoute(classContentBean); } //写acl.param if(writeContentBean.getTemplateName().equals(TemplateFileEnum.ACL_PARAM.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateDubboConfig.getModuleCorePath()); writeClassFileV2(classContentBean); } //写app.cmd if(writeContentBean.getTemplateName().equals(TemplateFileEnum.CMD.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); classContentBean.setChildPackageName("app.command"); - classContentBean.setModulePath(projectTemplateDubboConfig.getModuleCorePath()); - - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } + writeRoute(classContentBean); } //写app.exe if(writeContentBean.getTemplateName().equals(TemplateFileEnum.EXE.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); classContentBean.setChildPackageName("app.executor"); classContentBean.setModulePath(projectTemplateDubboConfig.getModuleCorePath()); - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } + writeRoute(classContentBean); } //写domain.factory if(writeContentBean.getTemplateName().equals(TemplateFileEnum.FACTORY.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("domain.factory"); - classContentBean.setClassSuffix(""); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateDubboConfig.getModuleCorePath()); - - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } + writeRoute(classContentBean); } //写app.listener if(writeContentBean.getTemplateName().equals(TemplateFileEnum.MQ_LISTENER.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("app.listener"); - classContentBean.setClassSuffix(""); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateDubboConfig.getModuleCorePath()); - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } } //写infras.mq.consumer if(writeContentBean.getTemplateName().equals(TemplateFileEnum.MQ_CONSUMER.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("infrast.mq.consumer"); - classContentBean.setClassSuffix(""); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateDubboConfig.getModuleCorePath()); - //走默认的包生成方式 if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ writeClassFile(classContentBean); @@ -413,14 +227,7 @@ public class DubboCoreWriteServiceImpl extends WriteService implements IWriteFi //写infras.mq.handler if(writeContentBean.getTemplateName().equals(TemplateFileEnum.MQ_HANDLER.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("infrast.mq.handler"); - classContentBean.setClassSuffix(""); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateDubboConfig.getModuleCorePath()); - //走默认的包生成方式 if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ writeClassFile(classContentBean); @@ -433,14 +240,7 @@ public class DubboCoreWriteServiceImpl extends WriteService implements IWriteFi //写infras.mq.producer if(writeContentBean.getTemplateName().equals(TemplateFileEnum.MQ_PRODUCER.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("infrast.mq.producer"); - classContentBean.setClassSuffix(""); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateDubboConfig.getModuleCorePath()); - //走默认的包生成方式 if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ writeClassFile(classContentBean); @@ -451,16 +251,11 @@ public class DubboCoreWriteServiceImpl extends WriteService implements IWriteFi } } - } - - @Override - public void writeAllContent(String humpClassName, Map varMap, String fast) { - - } - - @Override - public void writeCommonContent(Map varMap, String fast) { + //写BaseEvent + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.APP_EVENT_PUBLISHER.getTempFileName())){ + commonWriteService.writeBaseEvent(writeContentBean.getContent(),projectTemplateDubboConfig.getModuleCorePath()); + } } /** @@ -484,7 +279,7 @@ public class DubboCoreWriteServiceImpl extends WriteService implements IWriteFi */ private String getFilePath(String childPackageName, String humpClassName, String classSuffix) { String packageName = appServiceConfig.getPackage(); - String packagePath = packageName.replace(".", "/") + "/core"; + String packagePath = packageName.replace(".", "/"); packagePath = Constant.JAVA + "/" + packagePath + "/" + childPackageName; String fileName = humpClassName + classSuffix; return projectTemplateDubboConfig.getModuleCorePath() + packagePath + "/" + fileName; @@ -499,7 +294,7 @@ public class DubboCoreWriteServiceImpl extends WriteService implements IWriteFi */ public String getTestFilePath(String childPackageName, String humpClassName, String classSuffix) { String packageName = appServiceConfig.getPackage(); - String packagePath = packageName.replace(".", "/")+"/core/"; + String packagePath = packageName.replace(".", "/"); packagePath = Constant.TEST_JAVA + "/" + packagePath + childPackageName; String fileName = humpClassName + classSuffix; return projectTemplateDubboConfig.getModuleCorePath() + packagePath + "/" + fileName; @@ -517,4 +312,5 @@ public class DubboCoreWriteServiceImpl extends WriteService implements IWriteFi e.printStackTrace(); } } + } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/ClassBeanFactory.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/ClassBeanFactory.java new file mode 100644 index 0000000000000000000000000000000000000000..8618cca733f5450abe01e560e1cd93d3e10e440a --- /dev/null +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/ClassBeanFactory.java @@ -0,0 +1,68 @@ +package com.coderman.codemaker.app.dynamicddd; + +import com.coderman.codemaker.bean.plantuml.ClassBean; +import com.coderman.codemaker.bean.plantuml.FieldBean; +import com.coderman.codemaker.bean.plantuml.InterfaceBean; +import com.coderman.codemaker.enums.DomainDerivedElementEnum; +import org.assertj.core.util.Lists; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Description: + * date: 2021/11/1 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +@Service +public class ClassBeanFactory { + + /** + * 构建dtobean + * @param className + * @param classBean + * @param fieldBeanList + * @return + */ + public ClassBean buildDtoClassBean(String className, ClassBean classBean, List fieldBeanList){ + String dtoClassName = className; + if (!className.toLowerCase().endsWith("dto")) { + dtoClassName = className + "DTO"; + } + return classBean.derivedNewClassBean(dtoClassName,"api.dto",fieldBeanList); + } + + + /** + * + * @param className + * @param classBean + * @param fieldBeanList + * @return + */ + public ClassBean buildVOClassBean(String className, ClassBean classBean, List fieldBeanList){ + String dtoClassName = className; + if (!className.toLowerCase().endsWith("vo")) { + dtoClassName = className + "VO"; + } + return classBean.derivedNewClassBean(dtoClassName,"adapter.vo",fieldBeanList); + } + + public InterfaceBean buildInterfaceBean(ClassBean classBean){ + InterfaceBean interfaceBean = new InterfaceBean(); + int x = classBean.getClassName().toLowerCase().lastIndexOf(DomainDerivedElementEnum.DTO.getElement()); + if (x >= 0) { + String className = classBean.getClassName().substring(0, x) + "Facade"; + interfaceBean.setClassName(className); + interfaceBean.setPlantUMLPackage("api.facade"); + interfaceBean.setClassDesc(classBean.getClassDesc()); + interfaceBean.setMethodBeanList(Lists.newArrayList()); + return interfaceBean; + } + return null; + } + +} diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/ClassConvertFactory.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/ClassConvertFactory.java index b0463140bcf5f945636de8f635396486220533cf..a2aa8ec73c4e80c2ea523e7b065409b8f114a847 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/ClassConvertFactory.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/ClassConvertFactory.java @@ -28,6 +28,12 @@ public class ClassConvertFactory { @Autowired private AppServiceConfig appServiceConfig; + @Autowired + private ClassBeanFactory classBeanFactory; + + @Autowired + private MethodBeanFactory methodBeanFactory; + /** * 处理派生类bo->dto * @@ -36,23 +42,11 @@ public class ClassConvertFactory { */ public List getDTOClassList(List domainBOClassList) { List dtoClassList = new ArrayList<>(); - for (ClassBean classBean : domainBOClassList) { List fieldBeanList = classBean.buildSimpleFieldList(); String[] classNameArr = classBean.getExtendFieldBean().getDtoKeyList(); for (String className : classNameArr) { - ClassBean dtoClassBean = new ClassBean(); - if (!className.toLowerCase().endsWith("dto")) { - dtoClassBean.setClassName(className + "DTO"); - } else { - dtoClassBean.setClassName(className); - } - dtoClassBean.setFieldBeanList(fieldBeanList); - dtoClassBean.setClassDesc(classBean.getClassDesc()); - dtoClassBean.setMethodBeanList(Lists.newArrayList()); - dtoClassBean.setPlantUMLPackage("api.dto"); - dtoClassBean.setDerivedChainClassList(Lists.newArrayList(classBean.getClassName())); - dtoClassList.add(dtoClassBean); + dtoClassList.add(classBeanFactory.buildDtoClassBean(className,classBean,fieldBeanList)); } } return dtoClassList; @@ -65,7 +59,7 @@ public class ClassConvertFactory { * @return */ public List getVOClassList(List domainBOClassList) { - List dtoClassList = new ArrayList<>(); + List voClassList = new ArrayList<>(); for (ClassBean classBean : domainBOClassList) { List fieldBeanList = classBean.buildSimpleFieldList(); @@ -74,21 +68,11 @@ public class ClassConvertFactory { continue; } for (String className : classNameArr) { - ClassBean dtoClassBean = new ClassBean(); - if (!className.toLowerCase().endsWith("vo")) { - dtoClassBean.setClassName(className + "VO"); - } else { - dtoClassBean.setClassName(className); - } - dtoClassBean.setFieldBeanList(fieldBeanList); - dtoClassBean.setClassDesc(classBean.getClassDesc()); - dtoClassBean.setMethodBeanList(Lists.newArrayList()); - dtoClassBean.setPlantUMLPackage("adapter.vo"); - dtoClassList.add(dtoClassBean); + voClassList.add(classBeanFactory.buildVOClassBean(className,classBean,fieldBeanList)); } } - return dtoClassList; + return voClassList; } @@ -102,16 +86,12 @@ public class ClassConvertFactory { List facadeInterfaceList = new ArrayList<>(); for (ClassBean classBean : dtoClassList) { - InterfaceBean interfaceBean = new InterfaceBean(); - int x = classBean.getClassName().toLowerCase().lastIndexOf(DomainDerivedElementEnum.DTO.getElement()); - if (x >= 0) { - String className = classBean.getClassName().substring(0, x) + "Facade"; - interfaceBean.setClassName(className); - interfaceBean.setPlantUMLPackage("api.facade"); - interfaceBean.setClassDesc(classBean.getClassDesc()); - interfaceBean.setMethodBeanList(Lists.newArrayList()); - facadeInterfaceList.add(interfaceBean); + InterfaceBean interfaceBean = classBeanFactory.buildInterfaceBean(classBean); + if(interfaceBean == null){ + continue; } + facadeInterfaceList.add(interfaceBean); + } return facadeInterfaceList; } @@ -568,11 +548,10 @@ public class ClassConvertFactory { .replace("string", "") .trim(); - String[] arr = voClassNameStr.split(","); + int i = 0; for (String voClassName : arr) { String varBOClassName = classBean.getClassName().substring(0, 1).toLowerCase().concat(classBean.getClassName().substring(1)); - importClassSet.add(appServiceConfig.getPackage() + ".adapter.vo." + voClassName); MethodBean dto2bo = new MethodBean(); String varVoName = voClassName.substring(0, 1).toLowerCase().concat(voClassName.substring(1)); @@ -586,8 +565,8 @@ public class ClassConvertFactory { if (StringUtils.isEmpty(varVoName)) { varVoName = "vo"; } - - dtoList2boList.setMethodName(varVoName + "List2boList(List<" + voClassName + "> " + varVoName + "List)"); + String volist2bolist = methodBeanFactory.getvolist2boListMethod(i); + dtoList2boList.setMethodName(volist2bolist + "(List<" + voClassName + "> " + varVoName + "List)"); dtoList2boList.setReturnClass("List<" + classBean.getClassName() + ">"); methodBeanList.add(dtoList2boList); @@ -599,9 +578,12 @@ public class ClassConvertFactory { methodBeanList.add(bo2to); MethodBean boList2dtoList = new MethodBean(); - boList2dtoList.setMethodName(varBOClassName + "List2" + tmpVar + "List(List<" + classBean.getClassName() + "> " + varBOClassName + "List)"); + String bolist2volist = methodBeanFactory.getbolist2voListMethod(i); + + boList2dtoList.setMethodName(bolist2volist+"(List<" + classBean.getClassName() + "> " + varBOClassName + "List)"); boList2dtoList.setReturnClass("List<" + voClassName + ">"); methodBeanList.add(boList2dtoList); + i++; } classMethodList.addAll(methodBeanList); } @@ -622,17 +604,12 @@ public class ClassConvertFactory { convertInterfaceBean.setMethodBeanList(map.values().stream().collect(Collectors.toList())); convertInterfaceBean.getMethodBeanList().forEach(methodBean -> methodBean.buildParamArr()); interfaceConvertBeanList.add(convertInterfaceBean); - - }); convertMap.put("voboconvertlist", interfaceConvertBeanList); convertMap.put("voboconvertrelation", boConvertRelationMap); - return convertMap; - } - /** * 构建方法内容 * @@ -675,7 +652,6 @@ public class ClassConvertFactory { return gatawayImplList; } - /** * 处理派生类infrastacl->infrastaclimpl * @@ -734,7 +710,6 @@ public class ClassConvertFactory { return repositoryImplList; } - /** * 构建api的枚举数据 * @param enumBeanList diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/DerivedClassFactory.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/DerivedClassFactory.java index 7e08f6decda90c484d578b0fcce650aca8556d32..d39dd5519d4ff14c1d27c1d85a11c87871bfc4bd 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/DerivedClassFactory.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/DerivedClassFactory.java @@ -1,9 +1,7 @@ package com.coderman.codemaker.app.dynamicddd; import com.coderman.codemaker.bean.plantuml.*; -import com.coderman.codemaker.service.ReadInvokePlantUMLFileService; import org.apache.commons.collections4.CollectionUtils; -import org.assertj.core.util.Lists; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -258,7 +256,7 @@ public class DerivedClassFactory { } /** - * 处理bo-dto到convert的派生 + * 处理bo-vo到convert的派生 * @param domainBoElementBeanList * @param plantUmlContextBean */ diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/DynamicDDDWriteServiceImpl.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/DynamicDDDWriteServiceImpl.java index f830d786d329e2db8ecc367fe64535266cdffd14..5372faa458c82d5205126070f69697cbf195dcf0 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/DynamicDDDWriteServiceImpl.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/DynamicDDDWriteServiceImpl.java @@ -3,19 +3,12 @@ package com.coderman.codemaker.app.dynamicddd; import com.coderman.codemaker.app.WriteService; import com.coderman.codemaker.bean.ClassContentBean; import com.coderman.codemaker.bean.WriteContentBean; -import com.coderman.codemaker.config.AppServiceConfig; import com.coderman.codemaker.config.ProjectTemplateDynamicDDDConfig; import com.coderman.codemaker.enums.TemplateFileEnum; -import com.coderman.codemaker.service.IWriteFileService; -import com.coderman.codemaker.utils.Constant; -import org.apache.commons.io.FileUtils; -import org.apache.commons.lang3.StringUtils; +import com.coderman.codemaker.app.IWriteFileService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.io.File; -import java.io.IOException; -import java.util.Map; /** * Description: @@ -28,266 +21,94 @@ import java.util.Map; @Component(value = "dynamicDDDWriteServiceImpl") public class DynamicDDDWriteServiceImpl extends WriteService implements IWriteFileService { - - @Autowired - private AppServiceConfig appServiceConfig; - @Autowired private ProjectTemplateDynamicDDDConfig projectTemplateDynamicDDDConfig; @Override public void writeContent(WriteContentBean writeContentBean) { + ClassContentBean classContentBean = writeContentBean.buildClassContentBean(projectTemplateDynamicDDDConfig.getOutPath()); //写domain.bo if(writeContentBean.getTemplateName().equals(TemplateFileEnum.BUSINESS_OBJECT_DDD.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("domain.bo"); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateDynamicDDDConfig.getOutPath()); - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } + writeRoute(classContentBean); } //写domain.valueobject if(writeContentBean.getTemplateName().equals(TemplateFileEnum.VALUE_OBJECT.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("domain.valueobject"); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateDynamicDDDConfig.getOutPath()); - - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } + writeRoute(classContentBean); } //写domain.msgbody if(writeContentBean.getTemplateName().equals(TemplateFileEnum.MESSAGE_BODY.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("domain.msgbody"); - classContentBean.setClassSuffix(""); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateDynamicDDDConfig.getOutPath()); - - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } - + writeRoute(classContentBean); } //写domain.event if(writeContentBean.getTemplateName().equals(TemplateFileEnum.EVENT_BODY.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("domain.event"); - classContentBean.setClassSuffix(""); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateDynamicDDDConfig.getOutPath()); - - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } - + writeRoute(classContentBean); } //写domain.gataway if(writeContentBean.getTemplateName().equals(TemplateFileEnum.GATAWAY.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("domain.gataway"); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateDynamicDDDConfig.getOutPath()); - - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } + writeRoute(classContentBean); } //写domain.gataway.impl if(writeContentBean.getTemplateName().equals(TemplateFileEnum.GATAWAY_IMPL.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("domain.gataway.impl"); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateDynamicDDDConfig.getOutPath()); - - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } + writeRoute(classContentBean); } //写domain.enum if(writeContentBean.getTemplateName().equals(TemplateFileEnum.ENUM.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("domain.enums"); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateDynamicDDDConfig.getOutPath()); - - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } + writeRoute(classContentBean); } //写domain.factory if(writeContentBean.getTemplateName().equals(TemplateFileEnum.FACTORY.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("domain.factory"); - classContentBean.setClassSuffix(""); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateDynamicDDDConfig.getOutPath()); - - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } + writeRoute(classContentBean); } //写infrast.acl if(writeContentBean.getTemplateName().equals(TemplateFileEnum.ACL.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); if(writeContentBean.getHumpClassName().toLowerCase().contains(TemplateFileEnum.ACL.getTempFileName())){ classContentBean.setChildPackageName("infrast.acl"); }else { classContentBean.setChildPackageName("infrast.adapter"); } - classContentBean.setClassSuffix(""); - classContentBean.setModulePath(projectTemplateDynamicDDDConfig.getOutPath()); - - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } + writeRoute(classContentBean); } //写infrast.acl.impl if(writeContentBean.getTemplateName().equals(TemplateFileEnum.ACL_IMPL.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); if(writeContentBean.getHumpClassName().toLowerCase().contains(TemplateFileEnum.ACL.getTempFileName())){ classContentBean.setChildPackageName("infrast.acl.impl"); }else { classContentBean.setChildPackageName("infrast.adapter.impl"); } - classContentBean.setClassSuffix(""); - classContentBean.setModulePath(projectTemplateDynamicDDDConfig.getOutPath()); - - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } + writeRoute(classContentBean); } //写acl.param if(writeContentBean.getTemplateName().equals(TemplateFileEnum.ACL_PARAM.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateDynamicDDDConfig.getOutPath()); - writeClassFileV2(classContentBean); } //写app.cmd if(writeContentBean.getTemplateName().equals(TemplateFileEnum.CMD.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); classContentBean.setChildPackageName("app.command"); - classContentBean.setModulePath(projectTemplateDynamicDDDConfig.getOutPath()); - - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } + writeRoute(classContentBean); } //写app.exe if(writeContentBean.getTemplateName().equals(TemplateFileEnum.EXE.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); classContentBean.setChildPackageName("app.executor"); - classContentBean.setModulePath(projectTemplateDynamicDDDConfig.getOutPath()); - - //走默认的包生成方式 - if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ - writeClassFile(classContentBean); - }else { - //走文档里的package包生成方式 - writeClassFileV2(classContentBean); - } + writeRoute(classContentBean); } } - - @Override - public void writeAllContent(String humpClassName, Map varMap, String fast) { - - } - - @Override - public void writeCommonContent(Map varMap, String fast) { - - } - - - } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/MethodBeanFactory.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/MethodBeanFactory.java new file mode 100644 index 0000000000000000000000000000000000000000..f3e1421d2dbf811a10dc26cdf820cc9a32676eb2 --- /dev/null +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/MethodBeanFactory.java @@ -0,0 +1,78 @@ +package com.coderman.codemaker.app.dynamicddd; + +import com.coderman.codemaker.bean.plantuml.ClassBean; +import com.coderman.codemaker.bean.plantuml.MethodBean; +import org.assertj.core.util.Lists; +import org.springframework.stereotype.Service; + +import java.security.SecureRandom; +import java.util.List; + + +/** + * Description:动态方法工厂 + * date: 2021/11/1 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +@Service +public class MethodBeanFactory { + private List do2boList = Lists.newArrayList("do2bo", "DO2DO", "do2Bo", "Do2Bo"); + private List vos2bosList = Lists.newArrayList("VOs2BOs", "voList2boList", "volist2boList", "voList2BoList","vos2bos"); + + private List bos2vosList = Lists.newArrayList("BOs2VOs", "boList2voList", "bolist2voList", "boList2VoList","bos2vos"); + + + + private SecureRandom random = new SecureRandom(); + public MethodBean buildDO2BO(ClassBean classBean,String classDOName){ + MethodBean do2bo = new MethodBean(); + String boClassName = classBean.getClassName(); + String varClassName = classDOName.substring(0, 1).toLowerCase().concat(classDOName.substring(1)); + String randomMethodName = do2boList.get(Math.abs(random.nextInt(do2boList.size()))); + + do2bo.setMethodName(randomMethodName + "(" + classDOName + " " + varClassName + ")"); + do2bo.setReturnClass(boClassName); + return do2bo; + } + + public MethodBean buildBO2DO(ClassBean classBean,String boClassName,String classDOName){ + MethodBean bo2do = new MethodBean(); + String varClassName = boClassName.substring(0, 1).toLowerCase().concat(classBean.getClassName().substring(1)); + bo2do.setMethodName("bo2do(" + boClassName + " " + varClassName + ")"); + bo2do.setReturnClass(classDOName); + return bo2do; + } + + + public MethodBean buildDOList2BOList(String classDOName,String varClassName,String boClassName){ + MethodBean doList2boList = new MethodBean(); + doList2boList.setMethodName("doList2boList(List<" + classDOName + "> " + varClassName + "List)"); + doList2boList.setReturnClass("List<" + boClassName + ">"); + return doList2boList; + } + + public MethodBean buildBOList2DOList(String classDOName,String varClassName,String boClassName){ + MethodBean boList2doList = new MethodBean(); + boList2doList.setMethodName("boList2doList(List<" + boClassName + "> " + varClassName + "List)"); + boList2doList.setReturnClass("List<" + classDOName + ">"); + return boList2doList; + } + + + public String getvolist2boListMethod(int index){ + if(index >= vos2bosList.size()){ + return vos2bosList.get(vos2bosList.size()-1)+"V"+(index - vos2bosList.size()); + } + return vos2bosList.get(Math.abs(random.nextInt(vos2bosList.size()))); + } + + public String getbolist2voListMethod(int index){ + if(index >= bos2vosList.size()){ + return bos2vosList.get(bos2vosList.size()-1)+"V"+(index - bos2vosList.size()); + } + return bos2vosList.get(index); + } +} diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedControllerElementHandler.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedControllerElementHandler.java index 45c234e9f34cfb950cade98c97c5d02ae115cece..b8fd10732739c5d655d1bd00b8ced7d81c658513 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedControllerElementHandler.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedControllerElementHandler.java @@ -1,6 +1,7 @@ package com.coderman.codemaker.app.dynamicddd.derivedhandler; -import com.coderman.codemaker.app.ImportPackageService; +import com.coderman.codemaker.enums.dynamic.ReadWriteTypeEnum; +import com.coderman.codemaker.service.ImportPackageService; import com.coderman.codemaker.app.dynamicddd.DomainElementHandler; import com.coderman.codemaker.bean.dddelementderive.ControllerElementBean; import com.coderman.codemaker.bean.plantuml.ClassBean; @@ -10,6 +11,7 @@ import com.coderman.codemaker.enums.DomainDerivedElementEnum; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.RequestBody; import java.util.ArrayList; import java.util.List; @@ -53,7 +55,10 @@ public class DerivedControllerElementHandler implements DomainElementHandler methodBean.setMethodName(methodBean.getMethodName().split("\\.")[1])); v.setMethodBeanList(methodBeanFilterList); } - v.getMethodBeanList().forEach(methodBean -> methodBean.buildDoc()); + v.getMethodBeanList().forEach(methodBean -> { + methodBean.buildDoc(); + buildParamAnnotation(methodBean); + }); classBeanList.add(v); } }); @@ -63,4 +68,41 @@ public class DerivedControllerElementHandler implements DomainElementHandler methodBeanList = v.getMethodBeanList().stream().filter(methodBean -> !methodBean.getReturnClass().toLowerCase().contains("vo") && !methodBean.getMethodName().toLowerCase().contains("vo") + && StringUtils.isEmpty(methodBean.getPathValue()) ).collect(Collectors.toList()); v.setMethodBeanList(methodBeanList); @@ -67,6 +65,7 @@ public class DerivedFacadeElementHandler implements DomainElementHandler methodBean.buildDoc()); + importPackageService.dealImportClass(v,plantUmlContextBean); facadeElementBeanList.add(v); } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedFacadeImplElementHandler.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedFacadeImplElementHandler.java index 7bcc0bf103beabd5dbb38a9ec3f85f127be3697e..57c2173b1182435c8a1d842398b09ea7051c0b40 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedFacadeImplElementHandler.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedFacadeImplElementHandler.java @@ -1,12 +1,10 @@ package com.coderman.codemaker.app.dynamicddd.derivedhandler; -import com.coderman.codemaker.app.ImportPackageService; +import com.coderman.codemaker.service.ImportPackageService; import com.coderman.codemaker.app.dynamicddd.DerivedClassFactory; import com.coderman.codemaker.app.dynamicddd.DomainElementHandler; -import com.coderman.codemaker.bean.dddelementderive.FacadeElementBean; import com.coderman.codemaker.bean.dddelementderive.FacadeImplElementBean; import com.coderman.codemaker.bean.plantuml.ClassBean; -import com.coderman.codemaker.bean.plantuml.InterfaceBean; import com.coderman.codemaker.bean.plantuml.PlantUmlContextBean; import com.coderman.codemaker.enums.DomainDerivedElementEnum; import org.springframework.beans.factory.annotation.Autowired; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedGatawayImplElementHandler.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedGatawayImplElementHandler.java index 5c5d4a628f0ffe03ff47a6aae79f6b4b2760939f..4558d75825f6e1455897e1284b7586aa1cedc60b 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedGatawayImplElementHandler.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedGatawayImplElementHandler.java @@ -1,14 +1,12 @@ package com.coderman.codemaker.app.dynamicddd.derivedhandler; -import com.coderman.codemaker.app.ImportPackageService; +import com.coderman.codemaker.service.ImportPackageService; import com.coderman.codemaker.app.dynamicddd.DerivedClassFactory; import com.coderman.codemaker.app.dynamicddd.DomainElementHandler; -import com.coderman.codemaker.bean.dddelementderive.FacadeImplElementBean; import com.coderman.codemaker.bean.dddelementderive.GatawayImplElementBean; import com.coderman.codemaker.bean.plantuml.ClassBean; import com.coderman.codemaker.bean.plantuml.InterfaceBean; import com.coderman.codemaker.bean.plantuml.PlantUmlContextBean; -import com.coderman.codemaker.enums.DomainDerivedElementEnum; import com.coderman.codemaker.enums.DomainElementEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedInfrastAclImplElementHandler.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedInfrastAclImplElementHandler.java index 90ceea6e17f758b303467e571ada786168e12add..5a79ff1dce1f2aad96f0724d11233a76f9a19a3a 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedInfrastAclImplElementHandler.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedInfrastAclImplElementHandler.java @@ -1,9 +1,8 @@ package com.coderman.codemaker.app.dynamicddd.derivedhandler; -import com.coderman.codemaker.app.ImportPackageService; +import com.coderman.codemaker.service.ImportPackageService; import com.coderman.codemaker.app.dynamicddd.DerivedClassFactory; import com.coderman.codemaker.app.dynamicddd.DomainElementHandler; -import com.coderman.codemaker.bean.dddelementderive.GatawayImplElementBean; import com.coderman.codemaker.bean.dddelementderive.InfrastAclImplElementBean; import com.coderman.codemaker.bean.plantuml.ClassBean; import com.coderman.codemaker.bean.plantuml.InterfaceBean; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedRepositoryImplElementHandler.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedRepositoryImplElementHandler.java index 589fa323f356cdf663d4ad38d912c0ae1d0f4e35..d4a007954e8b24efd71bac15892c0b8575cb495f 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedRepositoryImplElementHandler.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedRepositoryImplElementHandler.java @@ -1,15 +1,12 @@ package com.coderman.codemaker.app.dynamicddd.derivedhandler; -import com.coderman.codemaker.app.ImportPackageService; +import com.coderman.codemaker.service.ImportPackageService; import com.coderman.codemaker.app.dynamicddd.DerivedClassFactory; import com.coderman.codemaker.app.dynamicddd.DomainElementHandler; -import com.coderman.codemaker.bean.dddelementderive.FacadeImplElementBean; -import com.coderman.codemaker.bean.dddelementderive.GatawayImplElementBean; import com.coderman.codemaker.bean.dddelementderive.RepositoryImplElementBean; import com.coderman.codemaker.bean.plantuml.ClassBean; import com.coderman.codemaker.bean.plantuml.InterfaceBean; import com.coderman.codemaker.bean.plantuml.PlantUmlContextBean; -import com.coderman.codemaker.enums.DomainDerivedElementEnum; import com.coderman.codemaker.enums.DomainElementEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedVOBOConvertElementHandler.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedVOBOConvertElementHandler.java index 71aef0231698a921ef2045c5d03522fdb01f8863..3435e60e04d74dca5a792adba7b426d6605bd68e 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedVOBOConvertElementHandler.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedVOBOConvertElementHandler.java @@ -1,8 +1,7 @@ package com.coderman.codemaker.app.dynamicddd.derivedhandler; -import com.coderman.codemaker.app.ImportPackageService; +import com.coderman.codemaker.service.ImportPackageService; import com.coderman.codemaker.app.dynamicddd.DomainElementHandler; -import com.coderman.codemaker.bean.dddelementderive.DtoBoConvertElementBean; import com.coderman.codemaker.bean.dddelementderive.VoBoConvertElementBean; import com.coderman.codemaker.bean.plantuml.InterfaceBean; import com.coderman.codemaker.bean.plantuml.PlantUmlContextBean; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedVOElementHandler.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedVOElementHandler.java index cf99ec051853e4ce7065024efe29b8d3969a3334..b9636e332ee3638a3c73742ac91dba5da3b3867e 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedVOElementHandler.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedVOElementHandler.java @@ -1,16 +1,13 @@ package com.coderman.codemaker.app.dynamicddd.derivedhandler; -import com.coderman.codemaker.app.ImportPackageService; +import com.coderman.codemaker.service.ImportPackageService; import com.coderman.codemaker.app.dynamicddd.DerivedClassFactory; import com.coderman.codemaker.app.dynamicddd.DomainElementHandler; -import com.coderman.codemaker.bean.dddelementderive.DtoElementBean; import com.coderman.codemaker.bean.dddelementderive.VoElementBean; import com.coderman.codemaker.bean.plantuml.ClassBean; import com.coderman.codemaker.bean.plantuml.FieldBean; -import com.coderman.codemaker.bean.plantuml.InterfaceBean; import com.coderman.codemaker.bean.plantuml.PlantUmlContextBean; import com.coderman.codemaker.enums.DomainDerivedElementEnum; -import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/AppCmdElementHandler.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/AppCmdElementHandler.java index a6d9fa54e5101d7098c4f38399fd1cddfb8463fa..2773ce6714d647a8da9f58230c8f6d00dc2bf435 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/AppCmdElementHandler.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/AppCmdElementHandler.java @@ -1,6 +1,6 @@ package com.coderman.codemaker.app.dynamicddd.handler; -import com.coderman.codemaker.app.ImportPackageService; +import com.coderman.codemaker.service.ImportPackageService; import com.coderman.codemaker.app.dynamicddd.DomainElementHandler; import com.coderman.codemaker.bean.dddelement.CommandElementBean; import com.coderman.codemaker.bean.plantuml.ClassBean; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/AppExeElementHandler.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/AppExeElementHandler.java index 2a4d7a3db53556ad04b3ca1a3f7ca8bdb2d9add4..32e3259ff6619f5ddb19021723eaf8d43645a70e 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/AppExeElementHandler.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/AppExeElementHandler.java @@ -1,6 +1,6 @@ package com.coderman.codemaker.app.dynamicddd.handler; -import com.coderman.codemaker.app.ImportPackageService; +import com.coderman.codemaker.service.ImportPackageService; import com.coderman.codemaker.app.dynamicddd.DomainElementHandler; import com.coderman.codemaker.bean.dddelement.ExecutorElementBean; import com.coderman.codemaker.bean.plantuml.ClassBean; @@ -53,7 +53,12 @@ public class AppExeElementHandler implements DomainElementHandler methodBean.buildDoc()); + List methodBeanList = new ArrayList<>(); + v.getMethodBeanList().forEach(methodBean -> { + methodBean.buildDoc(); + methodBeanList.add(methodBean.copySelf(null)); + }); + v.setMethodBeanList(methodBeanList); classBeanList.add(v); } }); diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/AppListenerElementHandler.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/AppListenerElementHandler.java index 6ab4d620e4fda6c9cbafee2d569df72b112b14ca..96c070ead9efc4c2232783317e7b040111c41893 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/AppListenerElementHandler.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/AppListenerElementHandler.java @@ -1,9 +1,8 @@ package com.coderman.codemaker.app.dynamicddd.handler; -import com.coderman.codemaker.app.ImportPackageService; +import com.coderman.codemaker.service.ImportPackageService; import com.coderman.codemaker.app.dynamicddd.DomainElementHandler; import com.coderman.codemaker.bean.dddelement.AppListenerElementBean; -import com.coderman.codemaker.bean.dddelement.FactoryElementBean; import com.coderman.codemaker.bean.plantuml.ClassBean; import com.coderman.codemaker.bean.plantuml.PlantUmlContextBean; import com.coderman.codemaker.enums.DomainElementEnum; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/DomainBoElementHandler.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/DomainBoElementHandler.java index e7af09010db487a16213f8f292b56b632ba7c8ba..9d842c752a859f8fad190d303e314c05feecb88f 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/DomainBoElementHandler.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/DomainBoElementHandler.java @@ -1,12 +1,10 @@ package com.coderman.codemaker.app.dynamicddd.handler; -import com.alibaba.fastjson.JSON; -import com.coderman.codemaker.app.ImportPackageService; +import com.coderman.codemaker.bean.TableBean; +import com.coderman.codemaker.service.ImportPackageService; import com.coderman.codemaker.app.dynamicddd.DerivedClassFactory; import com.coderman.codemaker.app.dynamicddd.DomainElementHandler; -import com.coderman.codemaker.bean.GlobalConstant; import com.coderman.codemaker.bean.dddelement.DomainBoElementBean; -import com.coderman.codemaker.bean.dddelementderive.DtoElementBean; import com.coderman.codemaker.bean.plantuml.*; import com.coderman.codemaker.enums.DomainElementEnum; import org.apache.commons.collections4.CollectionUtils; @@ -14,8 +12,6 @@ import org.assertj.core.util.Lists; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.lang.invoke.MethodHandle; -import java.lang.reflect.Method; import java.util.*; import java.util.stream.Collectors; @@ -49,12 +45,18 @@ public class DomainBoElementHandler implements DomainElementHandler { - - if (v.getClassName().toLowerCase().endsWith(DomainElementEnum.BO.getElement())) { + //过滤掉pagebo + if (v.getClassName().toLowerCase().endsWith(DomainElementEnum.BO.getElement()) && !v.getClassName().equals("PageBO")) { importPackageService.setPackageName(v, "domain.bo"); Optional optionalFieldBean = v.getFieldBeanList().stream().filter(f -> f.isTableKey()).findFirst(); if (optionalFieldBean.isPresent()) { boWithTableKeyList.add(v); + //处理bo关联表的ID + FieldBean idFieldBean = new FieldBean("Long id","主键ID","id"); + List fieldBeanList = Lists.newArrayList(idFieldBean); + fieldBeanList.addAll(v.getFieldBeanList()); + v.setFieldBeanList(fieldBeanList); + setTableBean(v,plantUmlContextBean,optionalFieldBean.get().getFieldName()); v.getExtendFieldBean().buildTableKey(optionalFieldBean.get().getFieldName()); } Optional optionalFieldBeanDtoKey = v.getFieldBeanList().stream().filter(f -> f.isDtoKey()).findFirst(); @@ -101,7 +103,6 @@ public class DomainBoElementHandler implements DomainElementHandler { - if (v.getClassName().toLowerCase().endsWith(DomainElementEnum.BO.getElement())) { + if (v.getClassName().toLowerCase().endsWith(DomainElementEnum.BO.getElement()) && !v.getClassName().equals("PageBO")) { //过滤扩展属性 List beanList = v.getFieldBeanList().stream().filter(f -> !f.isTableKey() && !f.isDtoKey() @@ -151,12 +152,29 @@ public class DomainBoElementHandler implements DomainElementHandler importPackageService.dealImportClass(v, plantUmlContextBean)); domainBoElementBean.setClassBeanList(domainBoElementBeanList); return domainBoElementBean; } + + /** + * 根据table名称标示找到table对应的DO进而找到TableBean + * @param boClassBean + * @param plantUmlContextBean + * @param tableFieldName + */ + private void setTableBean(ClassBean boClassBean,PlantUmlContextBean plantUmlContextBean,String tableFieldName){ + String tableName = tableFieldName.toLowerCase().trim().replace("string","").replace(" ",""); + for (Map.Entry entry : plantUmlContextBean.getClassBeanMap().entrySet()){ + TableBean tableBean = entry.getValue().getTableBean(); + if(tableBean != null && tableBean.getTableName().equals(tableName)){ + boClassBean.setTableBean(tableBean); + } + } + + } + } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/DomainFactoryElementHandler.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/DomainFactoryElementHandler.java index ce78bf21578a7b4421d21be8b659c1f2fd4ca772..2b32fe2c667d22bce6bb1a7f2610127200d63cdc 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/DomainFactoryElementHandler.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/DomainFactoryElementHandler.java @@ -1,6 +1,6 @@ package com.coderman.codemaker.app.dynamicddd.handler; -import com.coderman.codemaker.app.ImportPackageService; +import com.coderman.codemaker.service.ImportPackageService; import com.coderman.codemaker.app.dynamicddd.DomainElementHandler; import com.coderman.codemaker.bean.dddelement.FactoryElementBean; import com.coderman.codemaker.bean.plantuml.ClassBean; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/DomainGatawayElementHandler.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/DomainGatawayElementHandler.java index ccef099aa01216529a37abaaec5b3f88694e6661..44813efeb6185b2aba5fd48bdc15eb7f006762cf 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/DomainGatawayElementHandler.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/DomainGatawayElementHandler.java @@ -1,14 +1,11 @@ package com.coderman.codemaker.app.dynamicddd.handler; -import com.coderman.codemaker.app.ImportPackageService; +import com.coderman.codemaker.service.ImportPackageService; import com.coderman.codemaker.app.dynamicddd.DomainElementHandler; import com.coderman.codemaker.bean.dddelement.GatawayElementBean; -import com.coderman.codemaker.bean.plantuml.ClassBean; import com.coderman.codemaker.bean.plantuml.InterfaceBean; -import com.coderman.codemaker.bean.plantuml.MethodBean; import com.coderman.codemaker.bean.plantuml.PlantUmlContextBean; import com.coderman.codemaker.enums.DomainElementEnum; -import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/DynamicMapperElementHandler.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/DynamicMapperElementHandler.java new file mode 100644 index 0000000000000000000000000000000000000000..9fc70ce7b13937597860e8f79438dbe8327afb09 --- /dev/null +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/DynamicMapperElementHandler.java @@ -0,0 +1,208 @@ +package com.coderman.codemaker.app.dynamicddd.handler; + +import com.coderman.codemaker.service.ImportPackageService; +import com.coderman.codemaker.app.dynamicddd.DomainElementHandler; +import com.coderman.codemaker.bean.MapperMethodConstant; +import com.coderman.codemaker.bean.dddelement.DynamicMapperElementBean; +import com.coderman.codemaker.bean.plantuml.*; +import com.coderman.codemaker.enums.DomainElementEnum; +import com.coderman.codemaker.enums.dynamic.ReadWriteTypeEnum; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * Description: + * date: 2021/6/29 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +@Component(value = "dynamicMapperElementHandler") +public class DynamicMapperElementHandler implements DomainElementHandler { + @Autowired + private ImportPackageService importPackageService; + + @Override + public DynamicMapperElementBean getElementBeanList(PlantUmlContextBean plantUmlContextBean) { + DynamicMapperElementBean dynamicMapperElementBean = new DynamicMapperElementBean(); + List mapperInterfaceBeanList = new ArrayList<>(); + List classBeanList = new ArrayList<>(); + plantUmlContextBean.getInterfaceBeanMap().forEach((k, v) -> { + if (v.getClassName().toLowerCase().endsWith(DomainElementEnum.DYNAMIC_MAPPER.getElement())) { + importPackageService.dealImportClass(v, plantUmlContextBean); + v.getMethodBeanList().forEach(methodBean -> { + methodBean.buildDoc(); + buildParamAnnotation(methodBean); + methodBean.setMethodName(methodBean.refreshMethodName()); + }); + mapperInterfaceBeanList.add(v); + //这里把mapperxml当作class将动态增加的方法当作field，构建xml sql循环渲染 + ClassBean mapperXmlBean = new ClassBean(); + mapperXmlBean.setClassName(v.getClassName()); + mapperXmlBean.setTableBean(v.getTableBean()); + mapperXmlBean.setColumnBeanList(v.getColumnBeanList()); + mapperXmlBean.setPackageName(v.getPackageName()); + mapperXmlBean.setImportClassList(v.getImportClassList()); + mapperXmlBean.setFieldBeanList(convertToFieldBeanList(v.getMethodBeanList(), mapperXmlBean)); + classBeanList.add(mapperXmlBean); + } + }); + dynamicMapperElementBean.setClassBeanList(classBeanList); + dynamicMapperElementBean.setInterfaceBeanList(mapperInterfaceBeanList); + return dynamicMapperElementBean; + } + + /** + * 获取plantuml动态调用时序图中的方法，不是内置的mapper方法 + * + * @param methodBeanList + * @return + */ + private List getInvokeSequenceMethod(List methodBeanList) { + Set defaultMethodSet = MapperMethodConstant.defaultMethodSet(); + return methodBeanList.stream().filter(methodBean -> !defaultMethodSet.contains(methodBean.getSimplMethodName())).collect(Collectors.toList()); + } + + + /** + * 这里将mapper方法映射成class的fieldBean,构建sql xml + * + * @param methodBeanList + * @param mapperXmlBean + * @return + */ + private List convertToFieldBeanList(List methodBeanList, ClassBean mapperXmlBean) { + List newMethodBeanList = getInvokeSequenceMethod(methodBeanList); + List fieldBeanList = new ArrayList<>(); + String tableName = mapperXmlBean.getTableBean().getTableName(); + Optional doTypePackage = mapperXmlBean.getImportClassList().stream().filter(str -> str.endsWith("DO")).findFirst(); + String parameterTypeStr = tableName; + if (doTypePackage.isPresent()) { + parameterTypeStr = doTypePackage.get(); + } + + + for (MethodBean methodBean : newMethodBeanList) { + //判断method是curd哪种 + FieldBean fieldBean = new FieldBean(); + String rwType = ReadWriteTypeEnum.getCodeByMethod(methodBean.getMethodName().trim()); + //读场景-->查询 + if (ReadWriteTypeEnum.READ.getCode().equals(rwType)) { + fieldBean.setFieldName(buildSelectSqlXml(methodBean.getSimplMethodName(), tableName)); + fieldBeanList.add(fieldBean); + continue; + } + if (ReadWriteTypeEnum.isInsert(methodBean.getMethodName())) { + fieldBean.setFieldName(buildInsertSqlXml(methodBean.getSimplMethodName(), tableName)); + fieldBeanList.add(fieldBean); + continue; + } + if (ReadWriteTypeEnum.isUpdate(methodBean.getMethodName())) { + fieldBean.setFieldName(buildUpdateSqlXml(methodBean.getSimplMethodName(), tableName, parameterTypeStr)); + fieldBeanList.add(fieldBean); + continue; + } + if (ReadWriteTypeEnum.isDelete(methodBean.getMethodName())) { + fieldBean.setFieldName(buildDeleteSqlXml(methodBean.getSimplMethodName(), tableName)); + fieldBeanList.add(fieldBean); + continue; + } + + } + return fieldBeanList; + } + + /** + * 构建查询sqlxml + * + * @param methodName + * @return + */ + private String buildSelectSqlXml(String methodName, String tableName) { + String sqlTemplate = " "; + return sqlTemplate.replace("methodName", methodName).replace("tableName", tableName); + } + + /** + * 构建更新sqlxml + * + * @param methodName + * @return + */ + private String buildUpdateSqlXml(String methodName, String tableName, String parameterTypeStr) { + String sqlTemplate = " \n" + + " update tableName\n" + + " set\n" + + " ${table.updateColumnNameList}\n" + + " where id = #{id}\n" + + " "; + return sqlTemplate.replace("methodName", methodName).replace("tableName", tableName).replace("parameterTypeStr", parameterTypeStr); + } + + /** + * 构建删除sqlxml + * + * @param methodName + * @return + */ + private String buildDeleteSqlXml(String methodName, String tableName) { + String sqlTemplate = " \n" + + " delete from table.tableName where id = <#noparse>#{id<#noparse>}\n" + + " "; + return sqlTemplate.replace("methodName", methodName).replace("tableName", tableName); + } + + + /** + * 构建插入sqlxml + * + * @param methodName + * @return + */ + private String buildInsertSqlXml(String methodName, String tableName) { + String sqlTemplate = " \n" + + " insert into tableName(\n" + + " ${table.insertColumnNames}\n" + + " )\n" + + " values(\n" + + " ${table.insertColumnNameList}\n" + + " )\n" + + " "; + return sqlTemplate.replace("methodName", methodName).replace("tableName", tableName); + } + + /** + * 动态构建方法参数注解 + * 这里是处理controller的注解 + * + * @param methodBean + */ + private void buildParamAnnotation(MethodBean methodBean) { + if (methodBean.getParamArr() == null || methodBean.getParamArr().length == 0) { + return; + } + + String[] paramAnnotationArr = new String[methodBean.getParamArr().length]; + for (int i = 0; i < paramAnnotationArr.length; i++) { + String value = methodBean.getParamArr()[i]; + if (value.contains(" ")) { + value = value.split(" ")[1]; + } else { + value = value.substring(0, 1).toLowerCase() + value.substring(1); + } + paramAnnotationArr[i] = "@Param(value = \"" + value + "\")"; + } + methodBean.setParamAnnotationArr(paramAnnotationArr); + return; + } + +} diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/DynamicMapperXmlElementHandler.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/DynamicMapperXmlElementHandler.java new file mode 100644 index 0000000000000000000000000000000000000000..7ee7d1ee69562dad59e365a9a6cd09be41c04bd2 --- /dev/null +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/DynamicMapperXmlElementHandler.java @@ -0,0 +1,44 @@ +package com.coderman.codemaker.app.dynamicddd.handler; + +import com.coderman.codemaker.service.ImportPackageService; +import com.coderman.codemaker.app.dynamicddd.DomainElementHandler; +import com.coderman.codemaker.bean.dddelement.DynamicMapperXmlElementBean; +import com.coderman.codemaker.bean.plantuml.InterfaceBean; +import com.coderman.codemaker.bean.plantuml.PlantUmlContextBean; +import com.coderman.codemaker.enums.DomainElementEnum; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.ArrayList; +import java.util.List; + +/** + * Description: + * date: 2021/6/29 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +@Component(value = "dynamicMapperXmlElementHandler") +public class DynamicMapperXmlElementHandler implements DomainElementHandler { + @Autowired + private ImportPackageService importPackageService; + + @Override + public DynamicMapperXmlElementBean getElementBeanList(PlantUmlContextBean plantUmlContextBean) { + DynamicMapperXmlElementBean dynamicMapperElementBean = new DynamicMapperXmlElementBean(); + List mapperInterfaceBeanList = new ArrayList<>(); + plantUmlContextBean.getInterfaceBeanMap().forEach((k,v)->{ + if(v.getClassName().toLowerCase().endsWith(DomainElementEnum.DYNAMIC_MAPPER.getElement())){ + importPackageService.dealImportClass(v,plantUmlContextBean); + mapperInterfaceBeanList.add(v); + v.getMethodBeanList().forEach(methodBean -> methodBean.buildDoc()); + } + }); + dynamicMapperElementBean.setInterfaceBeanList(mapperInterfaceBeanList); + return dynamicMapperElementBean; + } + + +} diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/EventElementHandler.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/EventElementHandler.java index 1d5f5076ec536e7d39624dd7a44f0e33c75bdeaf..251514cfb37e481c766d18a85d97b5ac88300640 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/EventElementHandler.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/EventElementHandler.java @@ -1,9 +1,8 @@ package com.coderman.codemaker.app.dynamicddd.handler; -import com.coderman.codemaker.app.ImportPackageService; +import com.coderman.codemaker.service.ImportPackageService; import com.coderman.codemaker.app.dynamicddd.DomainElementHandler; import com.coderman.codemaker.bean.dddelement.DomainEventElementBean; -import com.coderman.codemaker.bean.dddelement.DomainMsgBodyElementBean; import com.coderman.codemaker.bean.plantuml.ClassBean; import com.coderman.codemaker.bean.plantuml.PlantUmlContextBean; import com.coderman.codemaker.enums.DomainElementEnum; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/InfrastAclElementHandler.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/InfrastAclElementHandler.java index b5c7a86b25b71a5fda7d5d3ca77244384c44fdc1..df41695e6e9c69265074cbd4e7419cde6025846d 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/InfrastAclElementHandler.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/InfrastAclElementHandler.java @@ -1,14 +1,12 @@ package com.coderman.codemaker.app.dynamicddd.handler; -import com.alibaba.fastjson.JSON; -import com.coderman.codemaker.app.ImportPackageService; +import com.coderman.codemaker.service.ImportPackageService; import com.coderman.codemaker.app.dynamicddd.DomainElementHandler; import com.coderman.codemaker.bean.dddelement.InfrastAclElementBean; import com.coderman.codemaker.bean.plantuml.ClassBean; import com.coderman.codemaker.bean.plantuml.InterfaceBean; import com.coderman.codemaker.bean.plantuml.MethodBean; import com.coderman.codemaker.bean.plantuml.PlantUmlContextBean; -import com.coderman.codemaker.config.ProjectTemplateDynamicDDDConfig; import com.coderman.codemaker.enums.DomainElementEnum; import com.google.common.collect.Sets; import org.apache.commons.lang3.StringUtils; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/MqConsumerElementHandler.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/MqConsumerElementHandler.java index 2371befab27f4c8d86412d84d2d81d2601f3da84..53e298d3057e818054cbb69c626caedd864a1cbd 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/MqConsumerElementHandler.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/MqConsumerElementHandler.java @@ -1,8 +1,7 @@ package com.coderman.codemaker.app.dynamicddd.handler; -import com.coderman.codemaker.app.ImportPackageService; +import com.coderman.codemaker.service.ImportPackageService; import com.coderman.codemaker.app.dynamicddd.DomainElementHandler; -import com.coderman.codemaker.bean.dddelement.AppListenerElementBean; import com.coderman.codemaker.bean.dddelement.MqConsumerElementBean; import com.coderman.codemaker.bean.plantuml.ClassBean; import com.coderman.codemaker.bean.plantuml.PlantUmlContextBean; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/MqHandlerElementHandler.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/MqHandlerElementHandler.java index 6247b926a90cc6a58e28f69d585ba9c3d00a47f4..00ba65122b0ef9b3425f2951e2734854d7a59dd3 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/MqHandlerElementHandler.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/MqHandlerElementHandler.java @@ -1,8 +1,7 @@ package com.coderman.codemaker.app.dynamicddd.handler; -import com.coderman.codemaker.app.ImportPackageService; +import com.coderman.codemaker.service.ImportPackageService; import com.coderman.codemaker.app.dynamicddd.DomainElementHandler; -import com.coderman.codemaker.bean.dddelement.AppListenerElementBean; import com.coderman.codemaker.bean.dddelement.MqHandlerElementBean; import com.coderman.codemaker.bean.plantuml.ClassBean; import com.coderman.codemaker.bean.plantuml.PlantUmlContextBean; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/MqProducerElementHandler.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/MqProducerElementHandler.java index 1014de216e3c32144fbb055ecb8e9c978c0d9783..f28aff5e83a366c122d43e514af34044507b855b 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/MqProducerElementHandler.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/MqProducerElementHandler.java @@ -1,8 +1,7 @@ package com.coderman.codemaker.app.dynamicddd.handler; -import com.coderman.codemaker.app.ImportPackageService; +import com.coderman.codemaker.service.ImportPackageService; import com.coderman.codemaker.app.dynamicddd.DomainElementHandler; -import com.coderman.codemaker.bean.dddelement.AppListenerElementBean; import com.coderman.codemaker.bean.dddelement.MqProducerElementBean; import com.coderman.codemaker.bean.plantuml.ClassBean; import com.coderman.codemaker.bean.plantuml.PlantUmlContextBean; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/MsgBodyElementHandler.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/MsgBodyElementHandler.java index 4ae3fb8f43a8d7b137b377abf38e8e715cc3767a..c14b2014d5960cfe837c0563e82724f0a0d502a6 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/MsgBodyElementHandler.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/MsgBodyElementHandler.java @@ -1,6 +1,6 @@ package com.coderman.codemaker.app.dynamicddd.handler; -import com.coderman.codemaker.app.ImportPackageService; +import com.coderman.codemaker.service.ImportPackageService; import com.coderman.codemaker.app.dynamicddd.DomainElementHandler; import com.coderman.codemaker.bean.dddelement.DomainMsgBodyElementBean; import com.coderman.codemaker.bean.plantuml.ClassBean; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/RepositoryElementHandler.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/RepositoryElementHandler.java index afe28d964eebb0accb83a709772b9b1d29930a81..223a00dc879609c93fc1607abcb0c83aff7c9a11 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/RepositoryElementHandler.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/RepositoryElementHandler.java @@ -1,12 +1,11 @@ package com.coderman.codemaker.app.dynamicddd.handler; -import com.coderman.codemaker.app.ImportPackageService; +import com.coderman.codemaker.service.ImportPackageService; import com.coderman.codemaker.app.dynamicddd.DomainElementHandler; import com.coderman.codemaker.bean.dddelement.RepositoryElementBean; import com.coderman.codemaker.bean.plantuml.InterfaceBean; import com.coderman.codemaker.bean.plantuml.PlantUmlContextBean; import com.coderman.codemaker.enums.DomainElementEnum; -import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/ValueObjectElementHandler.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/ValueObjectElementHandler.java index 14b6837a068bf85189af4c9e953b01234f02f4f8..9d8c4ba90e1ded9cf67f9116be4e8aea1401d438 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/ValueObjectElementHandler.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/ValueObjectElementHandler.java @@ -1,6 +1,6 @@ package com.coderman.codemaker.app.dynamicddd.handler; -import com.coderman.codemaker.app.ImportPackageService; +import com.coderman.codemaker.service.ImportPackageService; import com.coderman.codemaker.app.dynamicddd.DerivedClassFactory; import com.coderman.codemaker.app.dynamicddd.DomainElementHandler; import com.coderman.codemaker.bean.dddelement.ValueObjectElementBean; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/springboot/SpringBootWriteServiceImpl.java b/codemaker-core/src/main/java/com/coderman/codemaker/app/springboot/SpringBootWriteServiceImpl.java index 259498a3d64d9f8e27bbf25404b1947cd34f5415..2448ddb2af4740988de2c184a02887eaaaafe2c1 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/springboot/SpringBootWriteServiceImpl.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/app/springboot/SpringBootWriteServiceImpl.java @@ -1,5 +1,6 @@ package com.coderman.codemaker.app.springboot; +import com.coderman.codemaker.app.CommonWriteService; import com.coderman.codemaker.app.WriteService; import com.coderman.codemaker.bean.ClassContentBean; import com.coderman.codemaker.bean.ColumnBean; @@ -8,8 +9,8 @@ import com.coderman.codemaker.bean.WriteContentBean; import com.coderman.codemaker.config.AppServiceConfig; import com.coderman.codemaker.config.ProjectTemplateSpringbootConfig; import com.coderman.codemaker.enums.TemplateFileEnum; -import com.coderman.codemaker.service.DBErPictureService; -import com.coderman.codemaker.service.IWriteFileService; +import com.coderman.codemaker.service.dberpicture.DBErPictureService; +import com.coderman.codemaker.app.IWriteFileService; import com.coderman.codemaker.utils.Constant; import com.coderman.codemaker.utils.FreemarkerUtils; import org.apache.commons.io.FileUtils; @@ -44,18 +45,17 @@ public class SpringBootWriteServiceImpl extends WriteService implements IWriteFi private DBErPictureService erPictureService; + @Autowired + private CommonWriteService commonWriteService; + + @Override public void writeContent(WriteContentBean writeContentBean) { + ClassContentBean classContentBean = writeContentBean.buildClassContentBean(projectTemplateConfig.getOutPath()); //写api.dto-ddd if(writeContentBean.getTemplateName().equals(TemplateFileEnum.DTO_DDD.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setChildPackageName("api.dto"); classContentBean.setClassSuffix("DTO.java"); - classContentBean.setModulePath(projectTemplateConfig.getOutPath()); //走默认的包生成方式 if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ writeClassFile(classContentBean); @@ -66,9 +66,6 @@ public class SpringBootWriteServiceImpl extends WriteService implements IWriteFi } //写api.dto if(writeContentBean.getTemplateName().equals(TemplateFileEnum.DTO.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("dto"); classContentBean.setClassSuffix("DTO.java"); writeDTO(classContentBean); @@ -77,10 +74,6 @@ public class SpringBootWriteServiceImpl extends WriteService implements IWriteFi //写entity class if(writeContentBean.getTemplateName().equals(TemplateFileEnum.ENTITY.getTempFileName())){ - - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("entity"); classContentBean.setClassSuffix("Entity.java"); writeClassFile(classContentBean); @@ -88,19 +81,13 @@ public class SpringBootWriteServiceImpl extends WriteService implements IWriteFi //写do class if(writeContentBean.getTemplateName().equals(TemplateFileEnum.DATA_OBJECT.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); - classContentBean.setChildPackageName("dao.dataobject"); + classContentBean.setChildPackageName("infrast.dao.dataobject"); classContentBean.setClassSuffix("DO.java"); - writeDO(classContentBean); + // writeDO(classContentBean); + writeClassFile(classContentBean); } //写mapper class if(writeContentBean.getTemplateName().equals(TemplateFileEnum.MAPPER.getTempFileName())){ - - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("dao.mapper"); classContentBean.setClassSuffix("Mapper.java"); writeClassFile(classContentBean); @@ -113,10 +100,6 @@ public class SpringBootWriteServiceImpl extends WriteService implements IWriteFi //写vo if(writeContentBean.getTemplateName().equals(TemplateFileEnum.VO.getTempFileName())){ - - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("vo"); classContentBean.setClassSuffix("VO.java"); writeClassFile(classContentBean); @@ -124,14 +107,8 @@ public class SpringBootWriteServiceImpl extends WriteService implements IWriteFi //写vo-ddd if(writeContentBean.getTemplateName().equals(TemplateFileEnum.VO_DDD.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setChildPackageName("adapter.vo"); classContentBean.setClassSuffix("VO.java"); - classContentBean.setModulePath(projectTemplateConfig.getOutPath()); //走默认的包生成方式 if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ writeClassFile(classContentBean); @@ -144,10 +121,6 @@ public class SpringBootWriteServiceImpl extends WriteService implements IWriteFi //写service if(writeContentBean.getTemplateName().equals(TemplateFileEnum.SERVICE.getTempFileName())){ - - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("service"); classContentBean.setClassSuffix("Service.java"); writeClassFile(classContentBean); @@ -155,9 +128,6 @@ public class SpringBootWriteServiceImpl extends WriteService implements IWriteFi //写serviceImpl if(writeContentBean.getTemplateName().equals(TemplateFileEnum.SERVICE_IMPL.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("service.impl"); classContentBean.setClassSuffix("ServiceImpl.java"); writeClassFile(classContentBean); @@ -165,10 +135,6 @@ public class SpringBootWriteServiceImpl extends WriteService implements IWriteFi //写controller if(writeContentBean.getTemplateName().equals(TemplateFileEnum.CONTROLLER.getTempFileName())){ - - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("controller"); classContentBean.setClassSuffix("Controller.java"); writeClassFile(classContentBean); @@ -176,14 +142,8 @@ public class SpringBootWriteServiceImpl extends WriteService implements IWriteFi //写controller-ddd if(writeContentBean.getTemplateName().equals(TemplateFileEnum.CONTROLLER_DDD.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setChildPackageName("adapter.controller"); classContentBean.setClassSuffix("Controller.java"); - classContentBean.setModulePath(projectTemplateConfig.getOutPath()); //走默认的包生成方式 if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ writeClassFile(classContentBean); @@ -200,7 +160,7 @@ public class SpringBootWriteServiceImpl extends WriteService implements IWriteFi //指定服务类 or 工具类 if(writeContentBean.getTemplateName().equals(TemplateFileEnum.SPRING_APPLICATION_CONTEXT.getTempFileName())){ - writeSpringApplicationContext(writeContentBean.getContent()); + commonWriteService.writeSpringApplicationContext(writeContentBean.getContent(),projectTemplateConfig.getOutPath()); } //指定服务类 or 工具类 @@ -212,26 +172,26 @@ public class SpringBootWriteServiceImpl extends WriteService implements IWriteFi if(writeContentBean.getTemplateName().equals(TemplateFileEnum.APPLICATION.getTempFileName())){ writeApplication(writeContentBean.getContent()); } + //指定服务类 or 工具类 + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.APP_EVENT_PUBLISHER.getTempFileName())){ + commonWriteService.writeAppEventPublisher(writeContentBean.getContent(),projectTemplateConfig.getOutPath()); + } + //写BaseEvent + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.APP_EVENT_PUBLISHER.getTempFileName())){ + commonWriteService.writeBaseEvent(writeContentBean.getContent(),projectTemplateConfig.getOutPath()); + } //写model.bo if(writeContentBean.getTemplateName().equals(TemplateFileEnum.BUSINESS_OBJECT.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); - classContentBean.setChildPackageName("model.bo"); + classContentBean.setChildPackageName("bo"); classContentBean.setClassSuffix("BO.java"); writeClassFile(classContentBean); } //写domain.bo-ddd if(writeContentBean.getTemplateName().equals(TemplateFileEnum.BUSINESS_OBJECT_DDD.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("domain.bo"); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateConfig.getOutPath()); //走默认的包生成方式 if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ writeClassFile(classContentBean); @@ -241,25 +201,13 @@ public class SpringBootWriteServiceImpl extends WriteService implements IWriteFi } } - //写convert if(writeContentBean.getTemplateName().equals(TemplateFileEnum.CONVERT.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateConfig.getOutPath()); writeClassFileV2(classContentBean); } //写domain.enum if(writeContentBean.getTemplateName().equals(TemplateFileEnum.ENUM.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("domain.enums"); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateConfig.getOutPath()); - //走默认的包生成方式 if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ writeClassFile(classContentBean); @@ -271,13 +219,7 @@ public class SpringBootWriteServiceImpl extends WriteService implements IWriteFi //写domain.valueobject if(writeContentBean.getTemplateName().equals(TemplateFileEnum.VALUE_OBJECT.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("domain.valueobject"); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateConfig.getOutPath()); - //走默认的包生成方式 if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ writeClassFile(classContentBean); @@ -289,14 +231,7 @@ public class SpringBootWriteServiceImpl extends WriteService implements IWriteFi //写domain.event if(writeContentBean.getTemplateName().equals(TemplateFileEnum.EVENT_BODY.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("domain.event"); - classContentBean.setClassSuffix(""); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateConfig.getOutPath()); - //走默认的包生成方式 if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ writeClassFile(classContentBean); @@ -310,14 +245,7 @@ public class SpringBootWriteServiceImpl extends WriteService implements IWriteFi //写domain.msgbody if(writeContentBean.getTemplateName().equals(TemplateFileEnum.MESSAGE_BODY.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("domain.msgbody"); - classContentBean.setClassSuffix(""); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateConfig.getOutPath()); - //走默认的包生成方式 if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ writeClassFile(classContentBean); @@ -330,13 +258,7 @@ public class SpringBootWriteServiceImpl extends WriteService implements IWriteFi //写domain.gataway if(writeContentBean.getTemplateName().equals(TemplateFileEnum.GATAWAY.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("domain.gataway"); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateConfig.getOutPath()); - //走默认的包生成方式 if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ writeClassFile(classContentBean); @@ -348,35 +270,39 @@ public class SpringBootWriteServiceImpl extends WriteService implements IWriteFi //写domain.gataway.impl if(writeContentBean.getTemplateName().equals(TemplateFileEnum.GATAWAY_IMPL.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("gataway.impl"); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateConfig.getOutPath()); + //走默认的包生成方式 + if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ + writeClassFile(classContentBean); + }else { + //走文档里的package包生成方式 + writeClassFileV2(classContentBean); + } + } + + //写domain.repository.impl + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.REPOSITORY_IMPL.getTempFileName())){ + classContentBean.setChildPackageName("repositoryimpl"); + classContentBean.setClassPackageName(writeContentBean.getClassPackageName()+".repositoryimpl"); //走默认的包生成方式 if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ writeClassFile(classContentBean); }else { //走文档里的package包生成方式 + classContentBean.setClassPackageName(appServiceConfig.getPackage()+".infrast.repositoryimpl"); writeClassFileV2(classContentBean); } } + //写infrast.acl if(writeContentBean.getTemplateName().equals(TemplateFileEnum.ACL.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); if(writeContentBean.getHumpClassName().toLowerCase().contains(TemplateFileEnum.ACL.getTempFileName())){ classContentBean.setChildPackageName("infrast.acl"); }else { classContentBean.setChildPackageName("infrast.adapter"); } - classContentBean.setClassSuffix(""); - classContentBean.setModulePath(projectTemplateConfig.getOutPath()); //走默认的包生成方式 if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ writeClassFile(classContentBean); @@ -387,17 +313,11 @@ public class SpringBootWriteServiceImpl extends WriteService implements IWriteFi } //写infrast.acl.impl if(writeContentBean.getTemplateName().equals(TemplateFileEnum.ACL_IMPL.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); if(writeContentBean.getHumpClassName().toLowerCase().contains(TemplateFileEnum.ACL.getTempFileName())){ classContentBean.setChildPackageName("infrast.acl.impl"); }else { classContentBean.setChildPackageName("infrast.adapter.impl"); } - classContentBean.setClassSuffix(""); - classContentBean.setModulePath(projectTemplateConfig.getOutPath()); //走默认的包生成方式 if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ @@ -410,23 +330,12 @@ public class SpringBootWriteServiceImpl extends WriteService implements IWriteFi //写acl.param if(writeContentBean.getTemplateName().equals(TemplateFileEnum.ACL_PARAM.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateConfig.getOutPath()); writeClassFileV2(classContentBean); } //写app.cmd if(writeContentBean.getTemplateName().equals(TemplateFileEnum.CMD.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); classContentBean.setChildPackageName("app.command"); - classContentBean.setModulePath(projectTemplateConfig.getOutPath()); - //走默认的包生成方式 if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ writeClassFile(classContentBean); @@ -437,12 +346,7 @@ public class SpringBootWriteServiceImpl extends WriteService implements IWriteFi } //写app.exe if(writeContentBean.getTemplateName().equals(TemplateFileEnum.EXE.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); classContentBean.setChildPackageName("app.executor"); - classContentBean.setModulePath(projectTemplateConfig.getOutPath()); //走默认的包生成方式 if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ writeClassFile(classContentBean); @@ -454,13 +358,7 @@ public class SpringBootWriteServiceImpl extends WriteService implements IWriteFi //写domain.factory if(writeContentBean.getTemplateName().equals(TemplateFileEnum.FACTORY.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("domain.factory"); - classContentBean.setClassSuffix(""); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateConfig.getOutPath()); //走默认的包生成方式 if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ @@ -474,14 +372,7 @@ public class SpringBootWriteServiceImpl extends WriteService implements IWriteFi //写app.listener if(writeContentBean.getTemplateName().equals(TemplateFileEnum.MQ_LISTENER.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("app.listener"); - classContentBean.setClassSuffix(""); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateConfig.getOutPath()); - //走默认的包生成方式 if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ writeClassFile(classContentBean); @@ -491,39 +382,22 @@ public class SpringBootWriteServiceImpl extends WriteService implements IWriteFi } } - - //写infras.mq.consumer if(writeContentBean.getTemplateName().equals(TemplateFileEnum.MQ_CONSUMER.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("infrast.mq.consumer"); - classContentBean.setClassSuffix(""); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateConfig.getOutPath()); - //走默认的包生成方式 if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ writeClassFile(classContentBean); }else { //走文档里的package包生成方式 classContentBean.setClassPackageName(appServiceConfig.getPackage()+".infrast.mq.consumer"); - writeClassFileV2(classContentBean); } } //写infras.mq.handler if(writeContentBean.getTemplateName().equals(TemplateFileEnum.MQ_HANDLER.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("infrast.mq.handler"); - classContentBean.setClassSuffix(""); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateConfig.getOutPath()); - //走默认的包生成方式 if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ writeClassFile(classContentBean); @@ -536,14 +410,7 @@ public class SpringBootWriteServiceImpl extends WriteService implements IWriteFi //写infras.mq.producer if(writeContentBean.getTemplateName().equals(TemplateFileEnum.MQ_PRODUCER.getTempFileName())){ - ClassContentBean classContentBean = new ClassContentBean(); - classContentBean.setClassContent(writeContentBean.getContent()); - classContentBean.setHumpClassName(writeContentBean.getHumpClassName()); classContentBean.setChildPackageName("infrast.mq.producer"); - classContentBean.setClassSuffix(""); - classContentBean.setClassPackageName(writeContentBean.getClassPackageName()); - classContentBean.setModulePath(projectTemplateConfig.getOutPath()); - //走默认的包生成方式 if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ writeClassFile(classContentBean); @@ -554,20 +421,13 @@ public class SpringBootWriteServiceImpl extends WriteService implements IWriteFi } } - - } - - @Override - public void writeAllContent(String humpClassName, Map varMap, String fast) { - writeAll(humpClassName, varMap, fast); - } - - @Override - public void writeCommonContent(Map varMap, String fast) { - writeCommon(varMap, fast); + //写infrast.dao.mapper + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.MAPPER_DDD.getTempFileName())){ + classContentBean.setChildPackageName("infrast.dao.mapper"); + writeRoute(classContentBean); + } } - /** * 写mapper xml文件 * @@ -700,25 +560,6 @@ public class SpringBootWriteServiceImpl extends WriteService implements IWriteFi } } - /** - * 写工具类文件 - * - * @param content - */ - public void writeSpringApplicationContext(String content) { - String packageName = appServiceConfig.getPackage(); - String packagePath = packageName.replace(".", "/"); - String filePath = Constant.JAVA + "/" + packagePath + "/utils"; - String fileName = "SpringApplicationContext.java"; - filePath = projectTemplateConfig.getOutPath() + filePath + "/" + fileName; - try { - FileUtils.write(new File(filePath), content, "UTF-8"); - } catch (IOException e) { - e.printStackTrace(); - } - } - - /** * 写测试文件 * @@ -805,10 +646,9 @@ public class SpringBootWriteServiceImpl extends WriteService implements IWriteFi String testContent = FreemarkerUtils.parseTpl(fast+ TemplateFileEnum.TEST.getTempFileName(), varMap); this.writeTest(testContent, humpClassName); - } - + } /** * 写公共基础服务类 @@ -820,7 +660,7 @@ public class SpringBootWriteServiceImpl extends WriteService implements IWriteFi this.writeBaseController(baseControllerContent); String SpringApplicationContextContent = FreemarkerUtils.parseTpl(fast+ TemplateFileEnum.SPRING_APPLICATION_CONTEXT.getTempFileName(), varMap); - this.writeSpringApplicationContext(SpringApplicationContextContent); + commonWriteService.writeSpringApplicationContext(SpringApplicationContextContent,projectTemplateConfig.getOutPath()); String application = FreemarkerUtils.parseTpl(fast+ TemplateFileEnum.APPLICATION.getTempFileName(), varMap); this.writeApplication(application); diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/ColumnBean.java b/codemaker-core/src/main/java/com/coderman/codemaker/bean/ColumnBean.java index ade86906ac08f7de9c8eab9c8010ead90394bb13..549205944cbe5598447a25d7af909446a2b5afee 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/bean/ColumnBean.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/bean/ColumnBean.java @@ -1,5 +1,8 @@ package com.coderman.codemaker.bean; +import com.coderman.codemaker.bean.plantuml.FieldBean; +import com.coderman.codemaker.enums.VisibilityEnum; + /** * Created on 2018-7-19. * @@ -187,4 +190,14 @@ public class ColumnBean { ", columnComment='" + columnComment + '\'' + '}'; } + + public FieldBean convert2FieldBean(){ + FieldBean fieldBean = new FieldBean(); + fieldBean.setDesc(columnComment); + fieldBean.setVisibility(VisibilityEnum.PRIVATE.getVisibility()); + fieldBean.setDbColumnName(columnName); + fieldBean.setFieldName(columnTypeName+" "+ columnFieldName); + return fieldBean; + } + } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/GlobalConstant.java b/codemaker-core/src/main/java/com/coderman/codemaker/bean/GlobalConstant.java index 9956420a9dc9086ead8cdbd99d7a1124b410f326..90c90b274352c82fe2517715474d45b5be7bf44a 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/bean/GlobalConstant.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/bean/GlobalConstant.java @@ -52,4 +52,23 @@ public class GlobalConstant { * plantuml bo中的特殊属性-标示BO对应的业务方法调用流程 */ public static final String INVOKE_FILE_KEY = "invokefilekey"; + + + /** + * 调用时序文档存储文件夹名称 + */ + public static final String INVOKE_SEQUENCE_FILE_DIR = "invoke-plantuml"; + + + /** + * 领域类图模型文档存储文件夹名称 + */ + public static final String DOMAIN_MODLE_FILE_DIR = "ddd-plantuml"; + + + /** + * 以!开头的则忽略解析 + */ + public static final String PLANT_DOC_IGNORE = "!"; + } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/MapperMethodConstant.java b/codemaker-core/src/main/java/com/coderman/codemaker/bean/MapperMethodConstant.java new file mode 100644 index 0000000000000000000000000000000000000000..aad3bfd020cbd3c3f76bac607091abb128e2ed63 --- /dev/null +++ b/codemaker-core/src/main/java/com/coderman/codemaker/bean/MapperMethodConstant.java @@ -0,0 +1,30 @@ +package com.coderman.codemaker.bean; + +import java.util.HashSet; +import java.util.Set; + +/** + * Description: mapperxml默认方法名 + * date: 2021/10/27 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +public class MapperMethodConstant { + public static final String INSERT = "insert"; + public static final String UPDATE = "update"; + public static final String GET_BYID = "getById"; + public static final String GET_ALL = "getAll"; + public static final String DELETE_BYID = "deleteById"; + public static Set defaultMethodSet(){ + Set set = new HashSet<>(); + set.add(INSERT); + set.add(UPDATE); + set.add(DELETE_BYID); + set.add(GET_ALL); + set.add(GET_BYID); + + return set; + } +} diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/TableBean.java b/codemaker-core/src/main/java/com/coderman/codemaker/bean/TableBean.java index 74fbac36baa54031f9ff081038912be668c33d5a..80e441491533979964e28cb0c66c653bd82011c2 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/bean/TableBean.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/bean/TableBean.java @@ -1,8 +1,10 @@ package com.coderman.codemaker.bean; import com.coderman.codemaker.bean.plantuml.ClassBean; +import com.coderman.codemaker.bean.plantuml.FieldBean; import com.coderman.codemaker.bean.plantuml.InterfaceBean; import com.coderman.codemaker.bean.plantuml.MethodBean; +import org.apache.commons.collections4.CollectionUtils; import org.assertj.core.util.Lists; import java.util.ArrayList; @@ -75,14 +77,30 @@ public class TableBean { */ private ClassBean classBean; - public ClassBean convertToClassBean(String packageName){ + /** + * 将tablebean对象转换为classBean对象，代表DO类对象 + * @param packageName + * @param columnBeanList + * @return + */ + public ClassBean convertToClassBean(String packageName,List columnBeanList){ ClassBean classBean = new ClassBean(); classBean.setClassName(this.getHumpClassName()+"DO"); classBean.setPackageName(packageName); classBean.setClassDesc(tableComment); classBean.setPlantUMLPackage("dao.dataobject"); - classBean.setMethodBeanList(Lists.newArrayList()); + classBean.setMethodBeanList(Lists.newArrayList()); + classBean.setTableBean(this); + classBean.setColumnBeanList(columnBeanList); + + if(CollectionUtils.isNotEmpty(columnBeanList)){ + List fieldBeanList = new ArrayList<>(); + columnBeanList.forEach(columnBean -> fieldBeanList.add(columnBean.convert2FieldBean())); + classBean.setFieldBeanList(fieldBeanList); + }else { + classBean.setFieldBeanList(Lists.newArrayList()); + } return classBean; } @@ -91,23 +109,20 @@ public class TableBean { * @param packageName * @return */ - public InterfaceBean convertToMapperInterface(String packageName){ + public InterfaceBean convertToMapperInterface(String packageName,List columnBeanList){ InterfaceBean interfaceBean = new InterfaceBean(); interfaceBean.setClassName(this.getHumpClassName()+"Mapper"); interfaceBean.setPackageName(packageName); interfaceBean.setClassDesc(tableComment); interfaceBean.setPlantUMLPackage("dao.mapper"); + String doPackageName = packageName.replace("mapper","dataobject"); + String importDO = doPackageName+"."+this.getHumpClassName()+"DO"; + interfaceBean.setImportClassList(Lists.newArrayList(importDO)); + interfaceBean.setMethodBeanList(getDefaultMapperMethod()); + interfaceBean.setTableBean(this); + interfaceBean.setColumnBeanList(columnBeanList); - List methodBeanList = new ArrayList<>(); - String paramType = this.getHumpClassName()+"DO"; - String varName = paramType.substring(0,1).toLowerCase()+paramType.substring(1); - methodBeanList.add(new MethodBean("insert("+paramType+" "+varName+")","int")); - methodBeanList.add(new MethodBean("update("+paramType+" "+varName+")","int")); - methodBeanList.add(new MethodBean("getAll()","Long")); - methodBeanList.add(new MethodBean("getById(Long id)","Long")); - methodBeanList.add(new MethodBean("deleteById(Long id)","int")); - interfaceBean.setMethodBeanList(methodBeanList); return interfaceBean; } @@ -207,4 +222,18 @@ public class TableBean { public void setTableCollation(String tableCollation) { this.tableCollation = tableCollation; } + + + public List getDefaultMapperMethod(){ + List methodBeanList = new ArrayList<>(); + String paramType = this.getHumpClassName()+"DO"; + String varName = paramType.substring(0,1).toLowerCase()+paramType.substring(1); + methodBeanList.add(new MethodBean("insert("+paramType+" "+varName+")","long","保存数据记录")); + methodBeanList.add(new MethodBean("update("+paramType+" "+varName+")","int","更新数据记录")); + methodBeanList.add(new MethodBean("getAll()","List<"+paramType+">","获取所有数据记录")); + methodBeanList.add(new MethodBean("getById(Long id)",paramType,"根据ID获取单条记录")); + methodBeanList.add(new MethodBean("deleteById(Long id)","int","根据ID删除单条记录")); + methodBeanList.stream().forEach(methodBean -> methodBean.buildParamArr()); + return methodBeanList; + } } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/WriteContentBean.java b/codemaker-core/src/main/java/com/coderman/codemaker/bean/WriteContentBean.java index c020599ee86c01c75270db8badc3f6c5192fdf30..23fa9738f41a313f8651c0f3e1bad525ec5a9fbf 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/bean/WriteContentBean.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/bean/WriteContentBean.java @@ -20,9 +20,6 @@ public class WriteContentBean { private String humpClassName; private String classPackageName; - - - private AbstractClassBean abstractClassBean; public AbstractClassBean getAbstractClassBean() { @@ -56,4 +53,21 @@ public class WriteContentBean { public void setHumpClassName(String humpClassName) { this.humpClassName = humpClassName; } + + /** + * 将writeContentbean对象转换为classcontentBean对象 + * @return + */ + public ClassContentBean buildClassContentBean(String modulePath){ + ClassContentBean classContentBean = new ClassContentBean(); + classContentBean.setClassContent(this.getContent()); + classContentBean.setHumpClassName(this.getHumpClassName()); + classContentBean.setClassPackageName(this.getClassPackageName()); + classContentBean.setClassSuffix(""); + classContentBean.setModulePath(modulePath); + return classContentBean; + } + + + } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/WriteHelperService.java b/codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/DynamicMapperElementBean.java similarity index 37% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/WriteHelperService.java rename to codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/DynamicMapperElementBean.java index 1047b2bd44a5cfa27a9a17d352fbe9056309bcef..6a8785119e2a4d5f1b0179f29cc590ae526c7dff 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/WriteHelperService.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/DynamicMapperElementBean.java @@ -1,12 +1,14 @@ -package com.coderman.codemaker.app; +package com.coderman.codemaker.bean.dddelement; /** * Description: - * date: 2021/7/8 + * date: 2021/6/28 + * + * 动态mapper元素 * * @author fanchunshuai * @version 1.0.0 * @since JDK 1.8 */ -public class WriteHelperService { +public class DynamicMapperElementBean extends ElementBean { } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/DynamicMapperXmlElementBean.java b/codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/DynamicMapperXmlElementBean.java new file mode 100644 index 0000000000000000000000000000000000000000..8547c781f6fda99efdce5b399fd284f35d0d143e --- /dev/null +++ b/codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/DynamicMapperXmlElementBean.java @@ -0,0 +1,14 @@ +package com.coderman.codemaker.bean.dddelement; + +/** + * Description: + * date: 2021/6/28 + * + * 动态mapperxml元素 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +public class DynamicMapperXmlElementBean extends ElementBean { +} diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/ElementBean.java b/codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/ElementBean.java index 68850fd93ebec1beb45b63697e79984a79d75e54..2b2340fe444d75f7e5ec9cf1a3d1735346c6851d 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/ElementBean.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/ElementBean.java @@ -130,16 +130,20 @@ public abstract class ElementBean { List newInterfaceBeanList = new ArrayList<>(); plantUmlContextBean.getInterfaceBeanMap().forEach((k,v)->{ if(v.getClassName().toLowerCase().endsWith(elementType)){ + v.getMethodBeanList().forEach(methodBean -> methodBean.refreshMethodName()); newInterfaceBeanList.add(v); } }); if(plantUmlContextBean.getDerivedPlantUmlContextBean() != null){ plantUmlContextBean.getDerivedPlantUmlContextBean().getInterfaceBeanMap().forEach((k,v)->{ if(v.getClassName().toLowerCase().endsWith(elementType)){ + v.getMethodBeanList().forEach(methodBean -> methodBean.refreshMethodName()); newInterfaceBeanList.add(v); } }); } + + this.setInterfaceBeanList(newInterfaceBeanList); return this; } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/invoke/InvokeContextBean.java b/codemaker-core/src/main/java/com/coderman/codemaker/bean/invoke/InvokeContextBean.java index 825d227fa8fba73794f7e6bbbda21f0f9189edbe..d980f7aa3e694a65dcdea9e6deb95d82d68be1b6 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/bean/invoke/InvokeContextBean.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/bean/invoke/InvokeContextBean.java @@ -19,8 +19,9 @@ import org.apache.commons.lang3.StringUtils; public class InvokeContextBean { /** * 需要绘制方法内容的方法对象 + * 调用方的方法 */ - private MethodBean methodBean; + private MethodBean invokerMethodBean; /** * plantuml 调用流程图中的被调用类 @@ -30,14 +31,7 @@ public class InvokeContextBean { /** * plantuml 调用流程图中的被调用方法 */ - private String providerClassMethod; - - - /** - * plantuml 调用流程图中的被调用方法返回值 - */ - private String providerClassMethodReturn; - + private MethodBean providerClassMethod; /** * plantuml 调用流程图中的调用方法 @@ -48,7 +42,6 @@ public class InvokeContextBean { /** * 调用方向 * 如 应用层->领域层,应用层->基础设施层,应用层->应用层,领域层->领域层 - * */ private String InvokeSceneType; @@ -79,6 +72,14 @@ public class InvokeContextBean { */ private InvokeRowBean currentInvokeRowBean; + public MethodBean getProviderClassMethod() { + return providerClassMethod; + } + + public void setProviderClassMethod(MethodBean providerClassMethod) { + this.providerClassMethod = providerClassMethod; + } + public InvokeRowBean getCurrentInvokeRowBean() { return currentInvokeRowBean; } @@ -103,13 +104,6 @@ public class InvokeContextBean { this.invokerClassBean = invokerClassBean; } - public String getProviderClassMethodReturn() { - return providerClassMethodReturn; - } - - public void setProviderClassMethodReturn(String providerClassMethodReturn) { - this.providerClassMethodReturn = providerClassMethodReturn; - } public String getInvokeSceneType() { return InvokeSceneType; @@ -127,15 +121,14 @@ public class InvokeContextBean { this.methodRWType = methodRWType; } - public MethodBean getMethodBean() { - return methodBean; + public MethodBean getInvokerMethodBean() { + return invokerMethodBean; } - public void setMethodBean(MethodBean methodBean) { - this.methodBean = methodBean; + public void setInvokerMethodBean(MethodBean invokerMethodBean) { + this.invokerMethodBean = invokerMethodBean; } - public String getInvokerMethod() { return invokerMethod; } @@ -152,13 +145,6 @@ public class InvokeContextBean { this.providerClassName = providerClassName; } - public String getProviderClassMethod() { - return providerClassMethod; - } - - public void setProviderClassMethod(String providerClassMethod) { - this.providerClassMethod = providerClassMethod; - } public PlantUmlContextBean getPlantUmlContextBean() { return plantUmlContextBean; @@ -170,54 +156,64 @@ public class InvokeContextBean { /** * 根据调用者和被调用者以及当前需要绘制的方法构判断调用场景和读写类型 + * * @param invokeClassName * @param providerClassName */ - public void buildInvokeScene(String invokeClassName,String providerClassName){ + public void buildInvokeScene(String invokeClassName, String providerClassName) { String invokeScene = InvokeSceneTypeEnum.getInvokeScene(invokeClassName, providerClassName); - if(StringUtils.isNotEmpty(invokeScene)){ + if (StringUtils.isNotEmpty(invokeScene)) { this.setInvokeSceneType(invokeScene); } - if(StringUtils.isNotEmpty(this.getInvokerMethod())){ - String rwType = ReadWriteTypeEnum.getCodeByMethod(this.getInvokerMethod()); - this.setMethodRWType(rwType); + if (StringUtils.isNotEmpty(this.getInvokerMethod())) { + String rwType = ReadWriteTypeEnum.getCodeByMethod(this.getInvokerMethod()); + this.setMethodRWType(rwType); } } /** * 构建当前调用行bean + * * @param currentInvokeRowContent */ - public void buildCurrentInvokeRow(String currentInvokeRowContent){ + public void buildCurrentInvokeRow(String currentInvokeRowContent) { this.setCurrentInvokeRowContent(currentInvokeRowContent); /** * 如果有返回值 */ InvokeRowBean invokeRowBean = new InvokeRowBean(); - String invokeBody = currentInvokeRowContent; - if(currentInvokeRowContent.contains("=")){ - String [] rowContentArr = currentInvokeRowContent.split("="); + if (currentInvokeRowContent.contains("=")) { + String[] rowContentArr = currentInvokeRowContent.split("="); String returnBody = rowContentArr[0]; - invokeBody = rowContentArr[1]; - invokeRowBean.setReturnClassName(returnBody.trim().split(" ")[0]); - invokeRowBean.setReturnClassValue(returnBody.trim().split(" ")[1]); - } - String [] providerArr = invokeBody.split("\\."); - invokeRowBean.setProviderClassName(providerArr[0]); - String methodContent = providerArr[1]; - if(methodContent.contains("()")){ - invokeRowBean.setProviderMethodName(methodContent); - this.setCurrentInvokeRowBean(invokeRowBean); - return; - }else { - String [] methodArr = methodContent.split("\\("); - invokeRowBean.setProviderMethodName(methodArr[0]); - String [] paramValueArr = methodArr[1].replace(")","").split(","); - invokeRowBean.setProviderMethodParamValueArr(paramValueArr); - this.setCurrentInvokeRowBean(invokeRowBean); - return; + invokeRowBean.setReturnClassName(returnBody.trim().split(" ")[0].trim()); + invokeRowBean.setReturnClassValue(returnBody.trim().split(" ")[1].trim()); } + String classNameVar = this.getProviderClassName().substring(0,1).toLowerCase()+ this.getProviderClassName().substring(1); + invokeRowBean.setProviderClassNameVar(classNameVar); + + invokeRowBean.setProviderClassName(this.getProviderClassName()); + invokeRowBean.setProviderMethodName(this.getProviderClassMethod().getSimplMethodName()); + invokeRowBean.setReturnClassName(this.getProviderClassMethod().getReturnClass()); + this.getProviderClassMethod().buildParamArr(); + invokeRowBean.setProviderMethodParamTypeArr(this.getProviderClassMethod().getParamArr()); + invokeRowBean.buildParamValueArr(); + + this.setCurrentInvokeRowBean(invokeRowBean); + } + + @Override + public String toString() { + return "InvokeContextBean{" + + "invokerMethodBean=" + invokerMethodBean + + ", providerClassName='" + providerClassName + '\'' + + ", invokerMethod='" + invokerMethod + '\'' + + ", InvokeSceneType='" + InvokeSceneType + '\'' + + ", methodRWType='" + methodRWType + '\'' + + ", invokerClassBean=" + invokerClassBean + + ", currentInvokeRowContent='" + currentInvokeRowContent + '\'' + + ", currentInvokeRowBean=" + currentInvokeRowBean + + '}'; } } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/invoke/InvokeRowBean.java b/codemaker-core/src/main/java/com/coderman/codemaker/bean/invoke/InvokeRowBean.java index aaf2aaf50eabeec409475a361700ce4b0f7a1d4c..6d6d130a79e70aeb2f65918bd3b9207a722019e9 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/bean/invoke/InvokeRowBean.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/bean/invoke/InvokeRowBean.java @@ -1,5 +1,14 @@ package com.coderman.codemaker.bean.invoke; +import com.coderman.codemaker.bean.plantuml.ClassBean; +import com.coderman.codemaker.bean.plantuml.FieldBean; +import com.coderman.codemaker.bean.plantuml.PlantUmlContextBean; +import org.apache.commons.lang3.StringUtils; +import org.assertj.core.util.Lists; +import org.mockito.internal.util.StringUtil; + +import java.util.ArrayList; +import java.util.List; import java.util.Objects; /** @@ -15,6 +24,11 @@ public class InvokeRowBean { * 被调用方的类名 */ private String providerClassName; + + /** + * 被调用方的类名对应的变量名 + */ + private String providerClassNameVar; /** * 被调用方的方法名 */ @@ -91,6 +105,14 @@ public class InvokeRowBean { } + public String getProviderClassNameVar() { + return providerClassNameVar; + } + + public void setProviderClassNameVar(String providerClassNameVar) { + this.providerClassNameVar = providerClassNameVar; + } + @Override public boolean equals(Object o) { if (this == o) return true; @@ -105,4 +127,86 @@ public class InvokeRowBean { public int hashCode() { return Objects.hash(providerClassName, providerMethodName, returnClassName); } + + + /** + * 转换成字符串调用行 + * @return + */ + public String buildInvokeContent(){ + StringBuilder builder = new StringBuilder(); + if(!StringUtils.isEmpty(this.getReturnClassName()) && StringUtils.isNotEmpty(this.getReturnClassValue())){ + builder.append(this.getReturnClassName()+" "); + builder.append(this.getReturnClassValue()+" = "); + } + builder.append(this.getProviderClassNameVar()+"."); + builder.append(this.getProviderMethodName()); + if(this.getProviderMethodParamTypeArr() == null || this.getProviderMethodParamTypeArr().length == 0){ + builder.append("()"); + return builder.toString(); + } + builder.append("("); + + for (String paramValue : this.getProviderMethodParamValueArr()){ + builder.append(paramValue+", "); + } + return builder.substring(0,builder.length() - 2)+")"; + } + + /** + * 根据依赖的代码行内容，完善本身的代码行内容 + * + * 这里主要是完善本身的方法入参内容，将上一行调用内容的变量类和变量名应用到当前行 + * @param invokeRowBean + * @return + */ + public String refreshInvokeContent(InvokeRowBean invokeRowBean, PlantUmlContextBean plantUmlContextBean){ + String preRowClassName = invokeRowBean.getReturnClassName(); + if (StringUtils.isEmpty(preRowClassName) || this.getProviderMethodParamTypeArr() == null || this.getProviderMethodParamTypeArr().length == 0) { + return buildInvokeContent(); + } + + for (int i = 0;i < this.getProviderMethodParamTypeArr().length;i++){ + String currentRowClassName = this.getProviderMethodParamTypeArr()[i]; + String currentRowClassNameType = currentRowClassName; + String currentRowClassNameTypeVar = currentRowClassName; + if(currentRowClassNameType.contains(" ")){ + currentRowClassNameType = currentRowClassName.split(" ")[0]; + currentRowClassNameTypeVar = currentRowClassName.split(" ")[1]; + } + //通过类型推导 + if(preRowClassName.equals(currentRowClassNameType)){ + this.getProviderMethodParamValueArr()[i] = invokeRowBean.getReturnClassValue(); + }else { + //通过变量名推导，当前调用行的参数名与上一行的返回值是否存在has a关系，如getBySystemName(String systemName),上一行的返回值刚好是SystemBO + ClassBean classBean = plantUmlContextBean.getClassBeanMap().get(preRowClassName); + if(classBean == null){ + continue; + } + for (FieldBean fieldBean : classBean.getFieldBeanList()){ + String fieldName = fieldBean.getFieldName(); + String fieldNameVar = fieldName; + String fieldNameType = fieldName; + + if (fieldName.contains(" ")){ + fieldNameVar = fieldName.split(" ")[1]; + fieldNameType = fieldName.split(" ")[0]; + } + if(fieldNameVar.equals(currentRowClassNameTypeVar) && fieldNameType.equals(currentRowClassNameType)){ + this.getProviderMethodParamValueArr()[i] = invokeRowBean.getReturnClassValue()+"."+fieldBean.buildGetterMethodName(); + } + } + } + } + + return buildInvokeContent(); + } + + + public void buildParamValueArr(){ + if(this.getProviderMethodParamTypeArr() == null || this.getProviderMethodParamTypeArr().length == 0){ + return; + } + this.setProviderMethodParamValueArr(new String[this.getProviderMethodParamTypeArr().length]); + } } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/plantuml/AbstractClassBean.java b/codemaker-core/src/main/java/com/coderman/codemaker/bean/plantuml/AbstractClassBean.java index 3f8311a31c70a2280155d3bb82fe1196fcbfbd39..df37b572a9bfdabd9d7c7c7a4c2b15f46f2b354a 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/bean/plantuml/AbstractClassBean.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/bean/plantuml/AbstractClassBean.java @@ -1,16 +1,20 @@ package com.coderman.codemaker.bean.plantuml; +import com.coderman.codemaker.bean.ColumnBean; +import com.coderman.codemaker.bean.TableBean; +import com.coderman.codemaker.bean.WriteContentBean; import com.coderman.codemaker.enums.DomainElementEnum; +import com.coderman.codemaker.enums.TemplateFileEnum; import com.coderman.codemaker.utils.StringHelperUtils; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; -import java.util.Set; +import java.lang.reflect.Method; +import java.util.*; +import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; /** @@ -109,6 +113,31 @@ public abstract class AbstractClassBean { */ private ExtendFieldBean extendFieldBean = new ExtendFieldBean(); + /** + * 对应的tableBean mapper对象使用 + */ + private TableBean tableBean; + + /** + * 对应的columnBeanList mapper对象使用 + */ + private List columnBeanList; + + public TableBean getTableBean() { + return tableBean; + } + + public void setTableBean(TableBean tableBean) { + this.tableBean = tableBean; + } + + public List getColumnBeanList() { + return columnBeanList; + } + + public void setColumnBeanList(List columnBeanList) { + this.columnBeanList = columnBeanList; + } public ExtendFieldBean getExtendFieldBean() { return extendFieldBean; @@ -293,19 +322,6 @@ public abstract class AbstractClassBean { this.setPlantUMLPackage(plantUMLPackage.trim().trim()); } - - /** - * 如果是bo类的情况下可以通过bo类找到对应的DO类名 - * @return - */ - public String getDOClassFromTableKey(){ - String tableKey = this.getExtendFieldBean().getTableKey(); - if(StringUtils.isEmpty(tableKey)){ - return null; - } - return StringHelperUtils.getClassDOName(tableKey); - } - /** * 合并引用包， * 接口的引用包与实现的引用包合并 @@ -364,4 +380,149 @@ public abstract class AbstractClassBean { newFieldBeanList.addAll(fieldBeanFilterList); return newFieldBeanList; } + + + /** + * 在动态调用过程中匹配出调用者的调用方法和提供者的提供方法 + * 兼容写法 + * xxx.methodName invoke yyy.methodName + * xxx.method(2) invoke yyy.method(3) + * xxx.method(XxxBO, XxxEvent) invoke yyy.method(YyyDTO, YyyCmd) + * xxx.method(XxxBO xxxBO, XxxEvent xxxEvent) invoke yyy.method(YyyDTO yyyDTO, YyyCmd yyyCmd) + * @param currentMethod + * @return + */ + public Optional getMatchMethodBean(String currentMethod){ + + //如果没有方法参数则直接匹配 + if(!currentMethod.contains("(")){ + return this.getMethodBeanList().stream().filter(methodBean1 -> methodBean1.getMethodName().toLowerCase().startsWith(currentMethod.toLowerCase()+"(")).findFirst(); + } + + String methodName = currentMethod.split("\\(")[0]; + String currentMethodTag = currentMethod+"("; + String paramCountStr = currentMethod.replace(methodName,"").trim(); + //判断是否是xxx.method(2)这种写法 + int count = 0; + if(paramCountStr.length() == 3){ + String paramCount = paramCountStr.replace("(","").replace(")",""); + count = Integer.parseInt(paramCount); + } + + //方法名一样，参数数量不同 + if(count > 0){ + int finalCount = count; + return this.getMethodBeanList().stream() + .filter(methodBean1 -> methodBean1.getMethodName().toLowerCase().startsWith(currentMethodTag) + && methodBean1.getParamArr().length == finalCount + ) + .findFirst(); + } + + + //通过参数类型进行匹配 + String [] currentParamArr = currentMethod.split("\\(")[1].split(","); + + AtomicReference matchResultBean = new AtomicReference<>(); + this.getMethodBeanList().stream().forEach( + methodBean -> { + if(methodBean.getMethodName().toLowerCase().startsWith(currentMethodTag)){ + String [] paramArr = methodBean.getParamArr(); + for (int i = 0;i < paramArr.length;i ++){ + for (int j = 0;j < currentParamArr.length;j ++){ + String currentParamType = currentParamArr[j].trim().split(" ")[0]; + String paramType = paramArr[i].trim().split(" ")[0]; + if(currentParamType.equals(paramType.toLowerCase())){ + matchResultBean.set(methodBean); + } + } + } + } + } + ); + if(matchResultBean.get() == null){ + return Optional.empty(); + } + + return Optional.of(matchResultBean.get()); + } + + + /** + * 如果匹配不到，则将plantUML调用时序图中的方法注册到当前类中，做动态扩展 + * @param currentMethod + * @return + */ + public MethodBean getOrAddMethodBean(String currentMethod){ + Optional methodBeanOptional = getMatchMethodBean(currentMethod); + if(methodBeanOptional.isPresent()){ + methodBeanOptional.get().initInvokeRowContentList(); + return methodBeanOptional.get(); + } + if(!currentMethod.contains("(")){ + currentMethod = currentMethod +"()"; + } + + MethodBean methodBean = new MethodBean(); + methodBean.setDesc(""); + methodBean.setMethodName(currentMethod); + methodBean.buildParamArr(); + methodBean.setReturnClass("void"); + methodBean.setVisibility("public"); + methodBean.initInvokeRowContentList(); + this.getMethodBeanList().add(methodBean); + return methodBean; + } + + + /** + * 根据调用时序的调用内容判断调用方和被调用方是不是当前类 + * @param contentArr + * @return + */ + public boolean checkMatchClass(String [] contentArr){ + for (String content : contentArr){ + if(content.trim().toLowerCase().endsWith(this.getClassName().toLowerCase())){ + return true; + } + } + return false; + } + + /** + * 将classBean转换为WrteContentBean为后续的写文件做准备 + * @param content + * @param templateFileEnum + * @return + */ + public WriteContentBean buildWriteContentBean(String content, TemplateFileEnum templateFileEnum){ + return WriteContentBean.builder().content(content) + .templateName(templateFileEnum.getTempFileName()) + .humpClassName(this.getClassName()) + .classPackageName(this.getPackageName()) + .build(); + } + + + /** + * 由当前对象派生到新对象 + * @param className + * @param plantUMLPackage + * @param fieldBeanList + * @return + */ + public ClassBean derivedNewClassBean(String className,String plantUMLPackage,List fieldBeanList){ + ClassBean modelClassBean = new ClassBean(); + modelClassBean.setClassName(className); + modelClassBean.setFieldBeanList(fieldBeanList); + modelClassBean.setClassDesc(this.getClassDesc()); + modelClassBean.setMethodBeanList(Lists.newArrayList()); + modelClassBean.setPlantUMLPackage(plantUMLPackage); + modelClassBean.setDerivedChainClassList(Lists.newArrayList(this.getClassName())); + return modelClassBean; + } + + + + } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/plantuml/ClassBean.java b/codemaker-core/src/main/java/com/coderman/codemaker/bean/plantuml/ClassBean.java index 36484d1c50504bb2ff251692857d3b1bfe4c01ca..e1c043e0b80b2c42ab795c291acaca70180d45d4 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/bean/plantuml/ClassBean.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/bean/plantuml/ClassBean.java @@ -17,6 +17,8 @@ public class ClassBean extends AbstractClassBean { public Map buildVarMap(){ Map varMap = new HashMap<>(); varMap.put("class",this); + varMap.put("table",this.getTableBean()); + varMap.put("columns",this.getColumnBeanList()); varMap.put("fields",this.getFieldBeanList()); varMap.put("methods",this.getMethodBeanList()); varMap.put("imports",this.getImportClassList()); diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/plantuml/FieldBean.java b/codemaker-core/src/main/java/com/coderman/codemaker/bean/plantuml/FieldBean.java index 9a98772d0ad1f521121407f68246c6fd98c1d477..56c15e1a93850b2eeab95fce907ad9e087c3296b 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/bean/plantuml/FieldBean.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/bean/plantuml/FieldBean.java @@ -26,6 +26,60 @@ public class FieldBean { */ private String desc; + /** + * do对应class下的数据库表字段名 + */ + private String dbColumnName; + + + /** + * 属性类型 + */ + private String fieldType; + + /** + * 属性简单名称 + */ + private String fieldSimpleName; + + public String getFieldType() { + return fieldType; + } + + public void setFieldType(String fieldType) { + this.fieldType = fieldType; + } + + public String getFieldSimpleName() { + return fieldSimpleName; + } + + public void setFieldSimpleName(String fieldSimpleName) { + this.fieldSimpleName = fieldSimpleName; + } + + public FieldBean(){ + + } + + public FieldBean(String fieldName,String desc,String dbColumnName ){ + this(fieldName,desc,dbColumnName, VisibilityEnum.PRIVATE.getVisibility()); + } + + public FieldBean(String fieldName,String desc,String dbColumnName,String visibility ){ + this.fieldName = fieldName; + this.desc = desc; + this.dbColumnName = dbColumnName; + this.visibility = visibility; + } + + public String getDbColumnName() { + return dbColumnName; + } + + public void setDbColumnName(String dbColumnName) { + this.dbColumnName = dbColumnName; + } public String getFieldName() { return fieldName; @@ -109,4 +163,39 @@ public class FieldBean { fieldBean.setDesc(this.getDesc()); return fieldBean; } + + + /** + * 构建属性的getter方法名 + * @return + */ + public String buildGetterMethodName(){ + String simpleFieldName = this.getFieldName(); + if(fieldName.contains(" ")){ + simpleFieldName = fieldName.split(" ")[1]; + } + String prefix = "get"; + //判断是否是boolean类型 + if(this.getFieldName().toLowerCase().contains("boolean")){ + prefix = "is"; + } + return prefix+simpleFieldName.substring(0,1).toUpperCase()+simpleFieldName.substring(1)+"()"; + } + + public void buildFieldDetail(){ + if(this.getFieldName().contains(" ")){ + String [] fieldArr = this.getFieldName().split(" "); + this.setFieldType(fieldArr[0]); + this.setFieldSimpleName(fieldArr[1]); + } + } + + @Override + public String toString() { + return "FieldBean{" + + "fieldName='" + fieldName + '\'' + + ", desc='" + desc + '\'' + + ", dbColumnName='" + dbColumnName + '\'' + + '}'; + } } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/plantuml/MethodBean.java b/codemaker-core/src/main/java/com/coderman/codemaker/bean/plantuml/MethodBean.java index 07163ffbe1fe8c9b929141ba458289c45e090169..c4dca630cb2b24f0f6e00465bb7671135705f227 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/bean/plantuml/MethodBean.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/bean/plantuml/MethodBean.java @@ -1,14 +1,13 @@ package com.coderman.codemaker.bean.plantuml; import com.coderman.codemaker.bean.invoke.InvokeRowBean; +import com.coderman.codemaker.enums.TemplateFileEnum; import com.coderman.codemaker.enums.VisibilityEnum; +import com.coderman.codemaker.utils.ResultDto; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; -import java.util.Objects; +import java.util.*; /** * Description: @@ -26,6 +25,11 @@ public class MethodBean { this.returnClass = returnClass; } + public MethodBean(String methodName,String returnClass, String desc){ + this.methodName = methodName; + this.returnClass = returnClass; + this.desc = desc; + } /** * 方法名称， * 包括参数，括号 @@ -96,11 +100,26 @@ public class MethodBean { */ private String [] paramArr; + + /** + * 对于mapper和controller需要增加参数注解的进行动态构建参数注解 + */ + private String [] paramAnnotationArr; + /** * 所属类名 */ private String className; + + public String[] getParamAnnotationArr() { + return paramAnnotationArr; + } + + public void setParamAnnotationArr(String[] paramAnnotationArr) { + this.paramAnnotationArr = paramAnnotationArr; + } + public List getInvokeRowBeanList() { return invokeRowBeanList; } @@ -262,7 +281,11 @@ public class MethodBean { if (!this.getMethodName().contains("()")){ String [] paramArr = this.getMethodName().replace(")","").split("\\(")[1].split(","); for (String param : paramArr){ - builder.append("\t * @param "+param.trim().split(" ")[1]+"\n"); + if(param.contains(" ")){ + builder.append("\t * @param "+param.trim().split(" ")[1]+"\n"); + }else { + builder.append("\t * @param "+getParamVar(param)+"\n"); + } } } builder.append("\t * @return "+this.getReturnClass()+"\n"); @@ -270,11 +293,34 @@ public class MethodBean { this.setDoc(builder.toString()); } + /** + * 通过变量类型获取变量对应的变量名 + * @param paramType + * @return + */ + public String getParamVar(String paramType){ + if(paramType.contains("List<")){ + String paramModel = paramType.trim().replace("List<","").replace(">",""); + return paramModel.trim().substring(0,1).toLowerCase()+paramModel.substring(1)+"List"; + } + if(paramType.contains("Set<")){ + String paramModel = paramType.trim().replace("List<","").replace(">",""); + return paramModel.trim().substring(0,1).toLowerCase()+paramModel.substring(1)+"Set"; + } + + return paramType.trim().substring(0,1).toLowerCase()+paramType.substring(1); + } /** * 从方法名称中解析到方法参数 */ public void buildParamArr(){ + if(this.getParamArr() != null){ + return; + } + if(!this.getMethodName().contains("(") && !this.getMethodName().contains(")")){ + return; + } if (!this.getMethodName().contains("()")){ String [] paramArr = this.getMethodName().replace(")","").split("\\(")[1].split(","); @@ -289,7 +335,7 @@ public class MethodBean { * @return */ public String buildReturnClassType(){ - if(this.getReturnClass().toLowerCase().equals("void")){ + if(this.getReturnClass().contains("void")){ return null; } return this.getReturnClass() @@ -337,10 +383,33 @@ public class MethodBean { newBean.setParamArr(this.getParamArr()); newBean.setStatic(this.isStatic()); newBean.setPathValue(this.getPathValue()); - newBean.setMethodName(this.getMethodName()); + newBean.setMethodName(refreshMethodName()); + return newBean; } + /** + * 刷新方法声明，注入方法参数注解，也可能是方法注解，后续可扩展 + * @return + */ + public String refreshMethodName(){ + if(this.getParamAnnotationArr() == null || this.getParamAnnotationArr().length == 0){ + return this.getMethodName(); + } + String preMethod = this.getMethodName().split("\\(")[0]; + StringBuilder builder = new StringBuilder(preMethod); + List paramList = new ArrayList<>(); + for (int i = 0;i < this.getParamArr().length;i++){ + String annotation = this.getParamAnnotationArr()[i]; + String param = this.getParamArr()[i]; + paramList.add(annotation + " " + param); + } + builder.append("("); + builder.append(StringUtils.join(paramList,", ")); + builder.append(")"); + + return builder.toString(); + } /** * 将方法中的参数信息去掉，仅仅获取方法名 @@ -375,8 +444,101 @@ public class MethodBean { * 初始化 */ public void initInvokeRowContentList(){ - this.setInvokeMethodList(new LinkedList<>()); - this.setInvokeRowBeanList(new ArrayList<>()); + if(CollectionUtils.isEmpty(invokeRowBeanList)){ + this.setInvokeRowBeanList(new ArrayList<>()); + } + if(CollectionUtils.isEmpty(invokeMethodList)){ + this.setInvokeMethodList(new LinkedList<>()); + } + } + + + /** + * 解析方法返回参数类型，是否包含vo,dto,bo + * @return + */ + public String getReturnClassTypeModel(){ + if(this.getReturnClass().contains("void")){ + return ""; + } + + if(this.getReturnClass().contains("<")){ + String [] returnClassArr = this.getReturnClass().split("<"); + String matchClassType = ""; + for (String classStr : returnClassArr){ + String classType = classStr.trim().replace(">",""); + if(TemplateFileEnum.isClassModel(classType)){ + matchClassType = classType; + } + } + return matchClassType; + } + return this.getReturnClass(); + } + + /** + * 解析方法返回参数类型，是否包含vo,dto,bo + * @return + */ + public String getReturnClassTypeNoWrapper(){ + if(this.getReturnClass().contains("void")){ + return ""; + } + + if(!this.wrapperResultDto() && !this.wrapperResultDataDto()){ + return this.getReturnClass(); + } + + if(this.getReturnClass().contains("<")){ + int index = this.getReturnClass().indexOf("<"); + return this.getReturnClass().substring(index+1,this.getReturnClass().length() - 1); + } + return this.getReturnClass(); + } + + + + /** + * 校验外部参数是否与方法参数匹配,这里只需要匹配一个即可 + * @param param + * @return + */ + public boolean paramMatchOne(String param){ + if(this.getParamArr() == null || this.getParamArr().length == 0){ + return false; + } + String tempParam = param; + if(tempParam.trim().contains(" ")){ + tempParam = tempParam.split(" ")[0]; + } + for (String paramInfo : this.getParamArr()){ + String paramType = paramInfo; + if(paramInfo.trim().contains(" ")){ + paramType = paramInfo.split(" ")[0]; + } + if(paramType.toLowerCase().endsWith(tempParam.toLowerCase())){ + return true; + } + } + return false; } + /** + * 判断方法是不是有包装类对象 + * @return + */ + public boolean wrapperResultDto(){ + + if (this.getReturnClass().contains("ResultDto")){ + return true; + } + return false; + } + + public boolean wrapperResultDataDto(){ + if(this.getReturnClass().contains("ResultDataDto")){ + return true; + } + return false; + } } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/plantuml/PlantUmlContextBean.java b/codemaker-core/src/main/java/com/coderman/codemaker/bean/plantuml/PlantUmlContextBean.java index 000afb761e73574a8939d98179181549d27e621d..5aaafad9b6dcd7e0db336ba3f2dd4b67a22722db 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/bean/plantuml/PlantUmlContextBean.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/bean/plantuml/PlantUmlContextBean.java @@ -112,7 +112,7 @@ public class PlantUmlContextBean { */ public boolean addInvokeMethod(InvokeContextBean invokeContextBean){ - String key = invokeContextBean.getInvokerClassBean().getClassName()+"."+invokeContextBean.getMethodBean().getMethodName(); + String key = invokeContextBean.getInvokerClassBean().getClassName()+"."+invokeContextBean.getInvokerMethodBean().getMethodName(); Set providerMethodSet = this.dynamicInvokeChainMap.get(key); if(providerMethodSet == null){ diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/config/AppServiceConfig.java b/codemaker-core/src/main/java/com/coderman/codemaker/config/AppServiceConfig.java index 82745f225f72aa126b06e92fa819bbe157436348..72787029aa9ca3351b5b8c61b8c350b102e187c9 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/config/AppServiceConfig.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/config/AppServiceConfig.java @@ -5,7 +5,9 @@ package com.coderman.codemaker.config; import com.coderman.codemaker.app.AppService; import com.coderman.codemaker.enums.ModuleEnum; import com.coderman.codemaker.exceptions.ConfigException; -import com.coderman.codemaker.service.IWriteFileService; +import com.coderman.codemaker.app.IWriteFileService; +import com.coderman.codemaker.service.adapter.IClazzAdapter; +import com.coderman.codemaker.utils.SpringContextHolder; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,6 +41,9 @@ public class AppServiceConfig { @Value(value = "${application.global.author}") private String author; + @Value(value = "${application.global.package.adapterbean}") + private String packageAdapterBean; + @Resource(name = "colaAppService") private AppService colaAppService; @@ -187,6 +192,21 @@ public class AppServiceConfig { return ""; } + /** + * 获取配置中的应用名称 + * @return + */ + public String getApplicationName() { + if (applicationType.equals(ModuleEnum.SPRING_BOOT_WEB.getAppName())) { + return projectTemplateSpringbootConfig.getApplicationName(); + } else if (applicationType.equals(ModuleEnum.DUBBO_API.getAppName())) { + return projectTemplateDubboConfig.getApplicationName(); + } else if (applicationType.equals(ModuleEnum.COLA_ADAPTER.getAppName())) { + return projectTemplateColaConfig.getApplicationName(); + } + return ""; + } + /** * 获取不同项目的核心模块，db-er图生成之后会在此模块存放 * @return @@ -201,4 +221,14 @@ public class AppServiceConfig { } return null; } + + + /** + * 获取定制化的packageAdapter适配器 + * @return + */ + public IClazzAdapter getPackageAdapterBean(){ + return SpringContextHolder.getBean(this.packageAdapterBean,IClazzAdapter.class); + } + } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/config/DefaultPackageConfig.java b/codemaker-core/src/main/java/com/coderman/codemaker/config/DefaultPackageConfig.java index addbdc0f392c02350bc52f83dd07e032156d7f97..39a5ccf549226f83b8a8214340eea72ee64027b0 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/config/DefaultPackageConfig.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/config/DefaultPackageConfig.java @@ -1,5 +1,7 @@ package com.coderman.codemaker.config; +import com.coderman.codemaker.service.adapter.PackgeConstants; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.util.HashMap; @@ -17,23 +19,23 @@ import java.util.Map; public class DefaultPackageConfig { private static Map defaultPackageMap = new HashMap<>(); + @Autowired + private AppServiceConfig appServiceConfig; + + /** - * 初始化默认可能需要导入的包 + * 根据不同公司不同开发部门的业务规范制定不同的引用包 + * */ - static { - defaultPackageMap.put("List","java.util.List"); - defaultPackageMap.put("Map","java.util.Map"); - defaultPackageMap.put("HashMap","java.util.HashMap"); - defaultPackageMap.put("BigDecimal","java.math.BigDecimal"); - defaultPackageMap.put("Date","java.util.Date"); - defaultPackageMap.put("ArrayList","java.util.ArrayList"); - defaultPackageMap.put("Set","java.util.Set"); - defaultPackageMap.put("HashSet","java.util.HashSet"); - defaultPackageMap.put("ResultDto","com.coderman.utils.response.ResultDto"); - defaultPackageMap.put("ResultDataDto","com.coderman.utils.response.ResultDataDto"); - + public synchronized void addAdapterPackages(){ + if(defaultPackageMap.isEmpty()){ + defaultPackageMap.putAll(PackgeConstants.getDefaultPackageMap()); + defaultPackageMap.putAll(appServiceConfig.getPackageAdapterBean().getClazzWrapper()); + } } + + /** * 探测需要导入的包 * @param className diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/config/ProjectTemplateColaConfig.java b/codemaker-core/src/main/java/com/coderman/codemaker/config/ProjectTemplateColaConfig.java index bf198ec543fe8eb87bf8f0fba92e4c871408e42d..bb4f82c11442fd9b883f1b856d8f9028c2b684fb 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/config/ProjectTemplateColaConfig.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/config/ProjectTemplateColaConfig.java @@ -26,7 +26,7 @@ public class ProjectTemplateColaConfig { private String dbName; /** - * 项目名称 + * 应用名称 */ @Value(value = "${cola.global.applicationName}") private String applicationName; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/config/ProjectTemplateDubboConfig.java b/codemaker-core/src/main/java/com/coderman/codemaker/config/ProjectTemplateDubboConfig.java index 54c9fb29c72d7e1521f310379680aab72c5a614f..346edad57b543441ecd1b47c23be5be5ea1227a1 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/config/ProjectTemplateDubboConfig.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/config/ProjectTemplateDubboConfig.java @@ -26,10 +26,11 @@ public class ProjectTemplateDubboConfig { private String dbName; /** - * 项目名称 + * 应用名称 */ - @Value(value = "${codemaker.pom.projectName}") - private String projectName; + @Value(value = "${dubbo.global.applicationName}") + private String applicationName; + /** * dubbo-common模块地址 @@ -72,12 +73,12 @@ public class ProjectTemplateDubboConfig { this.dbName = dbName; } - public String getProjectName() { - return projectName; + public String getApplicationName() { + return applicationName; } - public void setProjectName(String projectName) { - this.projectName = projectName; + public void setApplicationName(String applicationName) { + this.applicationName = applicationName; } public String getModuleCommonPath() { diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/config/ProjectTemplateSpringbootConfig.java b/codemaker-core/src/main/java/com/coderman/codemaker/config/ProjectTemplateSpringbootConfig.java index ba6d96e656bb73722c50c7d09757f2750699d6e4..104d9d9823e84a073971b65ad837a359c05e7302 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/config/ProjectTemplateSpringbootConfig.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/config/ProjectTemplateSpringbootConfig.java @@ -18,11 +18,11 @@ public class ProjectTemplateSpringbootConfig { - @Value(value = "${codemaker.global.dbName}") + @Value(value = "${springboot.global.dbName}") private String dbName; - @Value(value = "${codemaker.pom.projectName}") - private String projectName; + @Value(value = "${springboot.global.applicationName}") + private String applicationName; @Value(value = "${codemaker.pom.groupId}") private String groupId; @@ -66,12 +66,12 @@ public class ProjectTemplateSpringbootConfig { this.dbName = dbName; } - public String getProjectName() { - return projectName; + public String getApplicationName() { + return applicationName; } - public void setProjectName(String projectName) { - this.projectName = projectName; + public void setApplicationName(String applicationName) { + this.applicationName = applicationName; } public String getGroupId() { @@ -102,7 +102,7 @@ public class ProjectTemplateSpringbootConfig { public String toString() { return "ProjectTemplateSpringbootConfig{" + "dbName='" + dbName + '\'' + - ", projectName='" + projectName + '\'' + + ", applicationName='" + applicationName + '\'' + ", groupId='" + groupId + '\'' + ", artifactId='" + artifactId + '\'' + ", version='" + version + '\'' + diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/controller/CodeMakerController.java b/codemaker-core/src/main/java/com/coderman/codemaker/controller/CodeMakerController.java index 824b5be84b46b6fd05c3ea9a26bb91bc6e69cc70..93cc4b1ef93210cf7b5a2c98bb0d09b9d7c8c1b5 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/controller/CodeMakerController.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/controller/CodeMakerController.java @@ -3,12 +3,11 @@ package com.coderman.codemaker.controller; import com.alibaba.fastjson.JSON; import com.coderman.codemaker.bean.ColumnBean; import com.coderman.codemaker.bean.TableBean; -import com.coderman.codemaker.bean.plantuml.ClassBean; -import com.coderman.codemaker.bean.plantuml.InterfaceBean; -import com.coderman.codemaker.service.WriteAppModuleService; -import com.coderman.codemaker.service.WriteFileService; -import com.coderman.codemaker.service.registry.DynamicDDDVarRegistry; -import com.coderman.codemaker.service.registry.MapperXmlVarRegistry; +import com.coderman.codemaker.service.WriteCodeService; +import com.coderman.codemaker.service.WriteDynamicCodeService; +import com.coderman.codemaker.service.write.WriteSpringbootService; +import com.coderman.codemaker.service.registry.element.DynamicDDDVarRegistry; +import com.coderman.codemaker.service.registry.element.MapperXmlVarRegistry; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -35,11 +34,13 @@ public class CodeMakerController { @Autowired - private WriteFileService writeFileService; + private WriteSpringbootService writeFileService; @Autowired - private WriteAppModuleService writeFileServiceV2; + private WriteDynamicCodeService writeDynamicCodeService; + @Autowired + private WriteCodeService writeCodeService; /** * 生成所有表对应的项目代码--极简模式 * @return @@ -49,7 +50,7 @@ public class CodeMakerController { Map map = mapperXmlVarRegistry.getTemplateVar(); if(map.containsKey("dynamicddd")){ - writeFileServiceV2.writeAllWithDDD(map); + writeDynamicCodeService.writeAllWithDDD(map); }else { Map tableBeanMap = (Map)map.get("table"); Map> columnBeanListMap = (Map>)map.get("columns"); @@ -60,15 +61,17 @@ public class CodeMakerController { varMap.put("columns", columnBeanListMap.get(k)); varMap.put("package", map.get("package")); varMap.put("author", map.get("author")); - writeFileServiceV2.writeAll(v.getHumpClassName(),varMap,""); + varMap.put("packageInfrast", map.get("packageInfrast")); + varMap.put("packageDomain", map.get("packageDomain")); + + writeCodeService.writeAll(v.getHumpClassName(),varMap,""); }); //写公共服务类 - writeFileServiceV2.writeCommon(varMap,""); + writeCodeService.writeCommon(varMap,""); //渲染e-r图 - writeFileServiceV2.writeERPicture(tableBeanMap,columnBeanListMap); + writeCodeService.writeERPicture(tableBeanMap,columnBeanListMap); } - return "success"; } @@ -90,6 +93,9 @@ public class CodeMakerController { varMap.put("columns", columnBeanListMap.get(k)); varMap.put("package", map.get("package")); varMap.put("author", map.get("author")); + varMap.put("packageInfrast", map.get("packageInfrast")); + varMap.put("packageDomain", map.get("packageDomain")); + writeFileService.writeAll(v.getHumpClassName(),varMap,"/fast/"); }); //写公共服务类 @@ -127,7 +133,10 @@ public class CodeMakerController { varMap.put("columns", columnBeanListMap.get(k)); varMap.put("package", map.get("package")); varMap.put("author", map.get("author")); - writeFileServiceV2.writeAll(v.getHumpClassName(),varMap,""); + varMap.put("packageInfrast", map.get("packageInfrast")); + varMap.put("packageDomain", map.get("packageDomain")); + + writeCodeService.writeAll(v.getHumpClassName(),varMap,""); } }); @@ -158,7 +167,10 @@ public class CodeMakerController { varMap.put("columns", columnBeanListMap.get(k)); varMap.put("package", map.get("package")); varMap.put("author", map.get("author")); - writeFileServiceV2.writeAll(v.getHumpClassName(),varMap,"/fast/"); + varMap.put("packageInfrast", map.get("packageInfrast")); + varMap.put("packageDomain", map.get("packageDomain")); + + writeCodeService.writeAll(v.getHumpClassName(),varMap,"/fast/"); } }); @@ -169,7 +181,7 @@ public class CodeMakerController { @GetMapping("/makeddd") public String makeDynamicDDD(){ Map dynamicDDDMap = dynamicDDDVarRegistry.getRegistVarMap(); - writeFileServiceV2.writeDynamicDDD(dynamicDDDMap); + writeDynamicCodeService.writeDynamicDDD(dynamicDDDMap); return "success"; } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/controller/GeneratorController.java b/codemaker-core/src/main/java/com/coderman/codemaker/controller/GeneratorController.java index 659901de748c3ff3e6e8577ad2ecd01d18eaeb57..5d9ba0bbc3c2cd47417ea221915473d78328ccd1 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/controller/GeneratorController.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/controller/GeneratorController.java @@ -7,9 +7,10 @@ import com.coderman.codemaker.bean.plantuml.ClassBean; import com.coderman.codemaker.bean.plantuml.EnumBean; import com.coderman.codemaker.bean.plantuml.InterfaceBean; import com.coderman.codemaker.enums.TemplateFileEnum; -import com.coderman.codemaker.service.FreemarkerService; -import com.coderman.codemaker.service.WriteAppModuleService; -import com.coderman.codemaker.service.registry.*; +import com.coderman.codemaker.service.WriteCodeService; +import com.coderman.codemaker.service.registry.element.*; +import com.coderman.codemaker.service.template.FreemarkerService; +import com.coderman.codemaker.service.WriteDynamicCodeService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -50,12 +51,14 @@ public class GeneratorController { private TestVarRegistry testVarRegistry; @Autowired - private WriteAppModuleService writeFileService; + private WriteCodeService writeFileService; @Autowired private FreemarkerService freemarkerService; + @Autowired + private WriteDynamicCodeService writeDynamicCodeService; /** * 生成模块的entity类 @@ -73,6 +76,7 @@ public class GeneratorController { varMap.put("columns", columnBeanListMap.get(k)); varMap.put("package", map.get("package")); varMap.put("author", map.get("author")); + String templateContent = freemarkerService.parseTpl(TemplateFileEnum.ENTITY.getTempFileName(),varMap); writeFileService.writeEntity(templateContent,v.getHumpClassName()); }); @@ -112,7 +116,7 @@ public class GeneratorController { Map map = entityVarRegistry.getTemplateVar(); if(map.containsKey("dynamicddd")){ List classBeanList = (List)map.get("adaptervo"); - writeFileService.writeVO(classBeanList); + writeDynamicCodeService.writeVO(classBeanList); }else { Map tableBeanMap = (Map)map.get("table"); Map> columnBeanListMap = (Map>)map.get("columns"); @@ -211,7 +215,7 @@ public class GeneratorController { Map map = serviceImplVarRegistry.getTemplateVar(); if(map.containsKey("dynamicddd")){ List classBeanList = (List)map.get("controller"); - writeFileService.writeController(classBeanList); + writeDynamicCodeService.writeController(classBeanList); }else { Map tableBeanMap = (Map)map.get("table"); Map> columnBeanListMap = (Map>)map.get("columns"); @@ -265,10 +269,10 @@ public class GeneratorController { Map map = serviceVarRegistry.getTemplateVar(); if(map.containsKey("dynamicddd")){ List interfaceBeanList = (List)map.get("derivefacade"); - writeFileService.writeFacade(interfaceBeanList); + writeDynamicCodeService.writeFacade(interfaceBeanList); List classBeanList = (List)map.get("derivefacadeimpl"); - writeFileService.writeFacadeImpl(classBeanList); + writeDynamicCodeService.writeFacadeImpl(classBeanList); }else { Map tableBeanMap = (Map)map.get("table"); Map> columnBeanListMap = (Map>)map.get("columns"); @@ -299,7 +303,7 @@ public class GeneratorController { Map map = entityVarRegistry.getTemplateVar(); if(map.containsKey("dynamicddd")){ List classBeanList = (List)map.get("derivedto"); - writeFileService.writeDTO(classBeanList); + writeDynamicCodeService.writeDTO(classBeanList); }else { Map tableBeanMap = (Map)map.get("table"); Map> columnBeanListMap = (Map>)map.get("columns"); @@ -326,7 +330,7 @@ public class GeneratorController { Map map = entityVarRegistry.getTemplateVar(); if(map.containsKey("dynamicddd")){ List classBeanList = (List)map.get("domainbo"); - writeFileService.writeBO(classBeanList); + writeDynamicCodeService.writeBO(classBeanList); }else { Map tableBeanMap = (Map)map.get("table"); Map> columnBeanListMap = (Map>)map.get("columns"); @@ -359,8 +363,8 @@ public class GeneratorController { if(map.containsKey("dynamicddd")){ List valueObjectBeanList = (List)map.get("domainvalueobject"); List enumBeanList = (List)map.get("valueobjectenum"); - writeFileService.writeValueObject(valueObjectBeanList); - writeFileService.writeEnum(enumBeanList); + writeDynamicCodeService.writeValueObject(valueObjectBeanList); + writeDynamicCodeService.writeEnum(enumBeanList); }else { log.warn("valueobject class generation depends on plantuml..........!!!!!!!"); } @@ -377,7 +381,7 @@ public class GeneratorController { Map map = entityVarRegistry.getTemplateVar(); if(map.containsKey("dynamicddd")){ List classBeanList = (List)map.get("domainmsg"); - writeFileService.writeMsgBody(classBeanList); + writeDynamicCodeService.writeMsgBody(classBeanList); }else { log.warn("msgbody class generation depends on plantuml..........!!!!!!!"); } @@ -395,13 +399,13 @@ public class GeneratorController { List gatawayBeanList = (List)map.get("gataway"); List repositoryBeanList = (List)map.get("repository"); gatawayBeanList.addAll(repositoryBeanList); - writeFileService.writeDomainGataway(gatawayBeanList); + writeDynamicCodeService.writeDomainGataway(gatawayBeanList); List gatawayImplBeanList = (List)map.get("gatawayimpl"); - writeFileService.writeGatawayImpl(gatawayImplBeanList); + writeDynamicCodeService.writeGatawayImpl(gatawayImplBeanList); List repositoryImplBeanList = (List)map.get("repositoryimpl"); - writeFileService.writeRepositoryImpl(repositoryImplBeanList); + writeDynamicCodeService.writeRepositoryImpl(repositoryImplBeanList); }else { //gataway需要依赖plantUML类图标示，否则基于数据库表生成会显得不伦不类 log.warn("gataway class generation depends on plantuml..........!!!!!!!"); @@ -422,9 +426,9 @@ public class GeneratorController { List aclImplBeanList = (List)map.get("infrastaclimpl"); List aclParamBeanList = (List)map.get("infrastaclparam"); - writeFileService.writeAclInterface(aclBeanList); - writeFileService.writeAclInterfaceImpl(aclImplBeanList); - writeFileService.writeAclInterfaceParam(aclParamBeanList); + writeDynamicCodeService.writeAclInterface(aclBeanList); + writeDynamicCodeService.writeAclInterfaceImpl(aclImplBeanList); + writeDynamicCodeService.writeAclInterfaceParam(aclParamBeanList); }else { //gataway需要依赖plantUML类图标示，否则基于数据库表生成会显得不伦不类 log.warn("gataway class generation depends on plantuml..........!!!!!!!"); @@ -441,7 +445,7 @@ public class GeneratorController { Map map = entityVarRegistry.getTemplateVar(); if(map.containsKey("dynamicddd")){ List commandBeanList = (List)map.get("cmd"); - writeFileService.writeCommand(commandBeanList); + writeDynamicCodeService.writeCommand(commandBeanList); }else { //gataway需要依赖plantUML类图标示，否则基于数据库表生成会显得不伦不类 log.warn("gataway class generation depends on plantuml..........!!!!!!!"); @@ -459,8 +463,8 @@ public class GeneratorController { if(map.containsKey("dynamicddd")){ List exeBeanList = (List)map.get("exeClass"); List exeInterfaceBeanList = (List)map.get("exeInterface"); - writeFileService.writeAppExeImpl(exeBeanList); - writeFileService.writeAppExeInterface(exeInterfaceBeanList); + writeDynamicCodeService.writeAppExeImpl(exeBeanList); + writeDynamicCodeService.writeAppExeInterface(exeInterfaceBeanList); }else { //gataway需要依赖plantUML类图标示，否则基于数据库表生成会显得不伦不类 log.warn("gataway class generation depends on plantuml..........!!!!!!!"); @@ -478,7 +482,7 @@ public class GeneratorController { Map map = entityVarRegistry.getTemplateVar(); if(map.containsKey("dynamicddd")){ List factoryBeanList = (List)map.get("domainfactory"); - writeFileService.writeFactory(factoryBeanList); + writeDynamicCodeService.writeFactory(factoryBeanList); }else { //factory需要依赖plantUML类图标示，否则基于数据库表生成会显得不伦不类 log.warn("factory class generation depends on plantuml..........!!!!!!!"); @@ -496,7 +500,7 @@ public class GeneratorController { Map map = entityVarRegistry.getTemplateVar(); if(map.containsKey("dynamicddd")){ List dtoboconvertBeanList = (List)map.get("dtoboconvert"); - writeFileService.writeDTOBOConvert(dtoboconvertBeanList); + writeDynamicCodeService.writeDTOBOConvert(dtoboconvertBeanList); }else { //dtoboconvert需要依赖plantUML类图标示，否则基于数据库表生成会显得不伦不类 log.warn("dtoboconvert class generation depends on plantuml..........!!!!!!!"); @@ -513,7 +517,7 @@ public class GeneratorController { Map map = entityVarRegistry.getTemplateVar(); if(map.containsKey("dynamicddd")){ List voboconvertBeanList = (List)map.get("voboconvert"); - writeFileService.writeVOBOConvert(voboconvertBeanList); + writeDynamicCodeService.writeVOBOConvert(voboconvertBeanList); }else { //voboconvert需要依赖plantUML类图标示，否则基于数据库表生成会显得不伦不类 log.warn("voboconvert class generation depends on plantuml..........!!!!!!!"); @@ -529,7 +533,7 @@ public class GeneratorController { Map map = entityVarRegistry.getTemplateVar(); if(map.containsKey("dynamicddd")){ List doboconvertBeanList = (List)map.get("doboconvert"); - writeFileService.writeDOBOConvert(doboconvertBeanList); + writeDynamicCodeService.writeDOBOConvert(doboconvertBeanList); }else { log.warn("doboconvert class generation depends on plantuml..........!!!!!!!"); } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/controller/GeneratorFastController.java b/codemaker-core/src/main/java/com/coderman/codemaker/controller/GeneratorFastController.java index 953de5928b75ae46215f3fc88782e432bc19c8ed..2d9eacec8989f886d19c0fab5e9e82200e281fc7 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/controller/GeneratorFastController.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/controller/GeneratorFastController.java @@ -3,8 +3,8 @@ package com.coderman.codemaker.controller; import com.coderman.codemaker.bean.ColumnBean; import com.coderman.codemaker.bean.TableBean; import com.coderman.codemaker.enums.TemplateFileEnum; -import com.coderman.codemaker.service.WriteFileService; -import com.coderman.codemaker.service.registry.*; +import com.coderman.codemaker.service.write.WriteSpringbootService; +import com.coderman.codemaker.service.registry.element.*; import com.coderman.codemaker.utils.FreemarkerUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -45,7 +45,7 @@ public class GeneratorFastController { @Autowired - private WriteFileService writeFileService; + private WriteSpringbootService writeFileService; /** @@ -64,6 +64,7 @@ public class GeneratorFastController { varMap.put("columns", columnBeanListMap.get(k)); varMap.put("package", map.get("package")); varMap.put("author", map.get("author")); + String templateContent = FreemarkerUtils.parseTpl("/fast/"+ TemplateFileEnum.ENTITY.getTempFileName(),varMap); writeFileService.writeEntity(templateContent,v.getHumpClassName()); }); diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/enums/DomainElementEnum.java b/codemaker-core/src/main/java/com/coderman/codemaker/enums/DomainElementEnum.java index 2a8842c494d7b334e9ee2a00c5ba19a80a828267..248c841b91a4a29ca9ddc72c52b2374ec96600d1 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/enums/DomainElementEnum.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/enums/DomainElementEnum.java @@ -35,6 +35,10 @@ public enum DomainElementEnum { ADAPTER_IMPL("aclimpl","适配器防腐层实现"), ADAPTER_ACL_IMPL("adapterimpl,aclimpl","适配器防腐层实现"), + //这里的mapper只是为了辅助代码生成，严格来说不算领域元素 + DYNAMIC_MAPPER("mapper","动态mapper"), + + ; private String element; private String desc; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/enums/ModuleEnum.java b/codemaker-core/src/main/java/com/coderman/codemaker/enums/ModuleEnum.java index 0a4f8ddc45814d08d4c4636c9af5d5aac02e82f5..981bff3a9d0fd2b93a6abfce6cc8fe514938a1c8 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/enums/ModuleEnum.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/enums/ModuleEnum.java @@ -21,6 +21,9 @@ public enum ModuleEnum { Sets.newHashSet(TemplateFileEnum.APPLICATION.getTempFileName(), TemplateFileEnum.MAPPER_XML.getTempFileName(), TemplateFileEnum.MAPPER.getTempFileName(), + TemplateFileEnum.MAPPER_DDD.getTempFileName(), + TemplateFileEnum.MAPPER_XML_DDD.getTempFileName(), + TemplateFileEnum.CONTROLLER.getTempFileName(), TemplateFileEnum.CONTROLLER_DDD.getTempFileName(), TemplateFileEnum.SERVICE_IMPL.getTempFileName(), @@ -61,6 +64,9 @@ public enum ModuleEnum { TemplateFileEnum.MQ_PRODUCER.getTempFileName(), TemplateFileEnum.MQ_LISTENER.getTempFileName(), TemplateFileEnum.MQ_HANDLER.getTempFileName(), + TemplateFileEnum.MQ_HANDLER.getTempFileName(), + TemplateFileEnum.BASE_EVENT.getTempFileName(), + TemplateFileEnum.APP_EVENT_PUBLISHER.getTempFileName(), TemplateFileEnum.SPRING_APPLICATION_CONTEXT.getTempFileName())), /** @@ -79,6 +85,9 @@ public enum ModuleEnum { DUBBO_COMMON("dubbo","dubbo-common", Sets.newHashSet( TemplateFileEnum.MAPPER_XML.getTempFileName(), TemplateFileEnum.MAPPER.getTempFileName(), + TemplateFileEnum.MAPPER_DDD.getTempFileName(), + TemplateFileEnum.MAPPER_XML_DDD.getTempFileName(), + TemplateFileEnum.DATA_OBJECT.getTempFileName() )), /** @@ -117,6 +126,9 @@ public enum ModuleEnum { TemplateFileEnum.EVENT_BODY.getTempFileName(), TemplateFileEnum.ACL_PARAM.getTempFileName(), + TemplateFileEnum.BASE_EVENT.getTempFileName(), + TemplateFileEnum.APP_EVENT_PUBLISHER.getTempFileName(), + TemplateFileEnum.MQ_CONSUMER.getTempFileName(), TemplateFileEnum.MQ_PRODUCER.getTempFileName(), TemplateFileEnum.MQ_LISTENER.getTempFileName(), @@ -152,6 +164,7 @@ public enum ModuleEnum { TemplateFileEnum.VALUE_OBJECT.getTempFileName(), TemplateFileEnum.MESSAGE_BODY.getTempFileName(), TemplateFileEnum.EVENT_BODY.getTempFileName(), + TemplateFileEnum.BASE_EVENT.getTempFileName(), TemplateFileEnum.ENUM.getTempFileName() )), @@ -173,7 +186,10 @@ public enum ModuleEnum { TemplateFileEnum.GATAWAY_IMPL.getTempFileName(), TemplateFileEnum.REPOSITORY_IMPL.getTempFileName(), TemplateFileEnum.MAPPER_XML.getTempFileName(), + TemplateFileEnum.MAPPER_XML_DDD.getTempFileName(), + TemplateFileEnum.MAPPER.getTempFileName(), + TemplateFileEnum.MAPPER_DDD.getTempFileName(), TemplateFileEnum.DATA_OBJECT.getTempFileName(), TemplateFileEnum.DOBO_CONVERT.getTempFileName(), TemplateFileEnum.SERVICE_IMPL.getTempFileName(), @@ -202,6 +218,7 @@ public enum ModuleEnum { TemplateFileEnum.SPRING_APPLICATION_CONTEXT.getTempFileName(), TemplateFileEnum.DTOBO_CONVERT.getTempFileName(), TemplateFileEnum.FACADE_AOP.getTempFileName(), + TemplateFileEnum.APP_EVENT_PUBLISHER.getTempFileName(), TemplateFileEnum.MQ_LISTENER.getTempFileName() )), diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/enums/TemplateFileEnum.java b/codemaker-core/src/main/java/com/coderman/codemaker/enums/TemplateFileEnum.java index f73b378e66aa8bfcaa3394ce24a549e56f8ba5ad..558e7c28d39271f6955c7562f5ead1f37820c08a 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/enums/TemplateFileEnum.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/enums/TemplateFileEnum.java @@ -59,6 +59,10 @@ public enum TemplateFileEnum { MQ_HANDLER("mqhandler"), MQ_LISTENER("mqlistener"), MQ_PRODUCER("mqproducer"), + APP_EVENT_PUBLISHER("AppEventPublisher"), + BASE_EVENT("BaseEvent"), + MAPPER_DDD("mapperddd"), + MAPPER_XML_DDD("mapperxmlddd"), ; private String tempFileName; TemplateFileEnum(String tempFileName){ @@ -68,4 +72,19 @@ public enum TemplateFileEnum { public String getTempFileName() { return tempFileName; } + + + /** + * 判断类名是否是bo,vo,dto,entity + * @param className + * @return + */ + public static boolean isClassModel(String className){ + String classType = className.toLowerCase(); + return classType.endsWith(TemplateFileEnum.VO.getTempFileName()) + || classType.endsWith(TemplateFileEnum.BUSINESS_OBJECT.getTempFileName()) + || classType.endsWith(TemplateFileEnum.DTO.getTempFileName()) + || classType.endsWith(TemplateFileEnum.DATA_OBJECT.getTempFileName()) + || classType.endsWith(TemplateFileEnum.ENTITY.getTempFileName()); + } } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/enums/dynamic/MethodReturnClassTypeEnum.java b/codemaker-core/src/main/java/com/coderman/codemaker/enums/dynamic/MethodReturnClassTypeEnum.java new file mode 100644 index 0000000000000000000000000000000000000000..d361a056153db2e643afecc7efd02c4a255a376f --- /dev/null +++ b/codemaker-core/src/main/java/com/coderman/codemaker/enums/dynamic/MethodReturnClassTypeEnum.java @@ -0,0 +1,71 @@ +package com.coderman.codemaker.enums.dynamic; + +import com.coderman.codemaker.enums.TemplateFileEnum; + +/** + * Description:方法返回类型 + * date: 2021/10/29 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +public enum MethodReturnClassTypeEnum { + PAGE("page","page包装对象"), + LIST("list","list包装对象"), + SET("set","set集合对象"), + ONE("one","one单条对象"), + VOID("void","void空对象"), + OTHER("other","其他返回对象"), + ; + private String code; + private String desc; + MethodReturnClassTypeEnum(String code, String desc){ + this.code = code; + this.desc = desc; + } + + + public String getCode() { + return code; + } + + public String getDesc() { + return desc; + } + + /** + * 根据返回类型判断返回什么类型的对象 + * @param returnClassStr + * @return + */ + public static String getReturnType(String returnClassStr){ + + if(returnClassStr.contains(MethodReturnClassTypeEnum.VOID.getCode())){ + return MethodReturnClassTypeEnum.VOID.getCode(); + } + + if(returnClassStr.toLowerCase().contains(MethodReturnClassTypeEnum.PAGE.getCode())){ + return MethodReturnClassTypeEnum.PAGE.getCode(); + } + + if(returnClassStr.toLowerCase().contains(MethodReturnClassTypeEnum.LIST.getCode())){ + return MethodReturnClassTypeEnum.LIST.getCode(); + } + + + if(returnClassStr.toLowerCase().contains(MethodReturnClassTypeEnum.SET.getCode())){ + return MethodReturnClassTypeEnum.SET.getCode(); + } + + if(returnClassStr.toLowerCase().contains(TemplateFileEnum.VO.getTempFileName()) + || returnClassStr.toLowerCase().contains(TemplateFileEnum.DTO.getTempFileName())){ + return MethodReturnClassTypeEnum.VOID.getCode(); + + } + + return MethodReturnClassTypeEnum.OTHER.getCode(); + + } + +} diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/enums/dynamic/ReadWriteTypeEnum.java b/codemaker-core/src/main/java/com/coderman/codemaker/enums/dynamic/ReadWriteTypeEnum.java index 3c83396922fa5d18f26f508d37dc2a166527536f..1a2fe25801621f336b158213ab78d9a0e4551066 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/enums/dynamic/ReadWriteTypeEnum.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/enums/dynamic/ReadWriteTypeEnum.java @@ -3,6 +3,7 @@ package com.coderman.codemaker.enums.dynamic; import org.apache.commons.lang3.StringUtils; import org.mockito.internal.util.collections.Sets; +import java.util.Locale; import java.util.Set; import java.util.concurrent.atomic.AtomicReference; @@ -16,13 +17,25 @@ import java.util.concurrent.atomic.AtomicReference; */ public enum ReadWriteTypeEnum { READ("read","读场景"), - WRITE("write","写场景") + WRITE("write","写场景"), + INSERT("insert","插入"), + UPDATE("update","更新"), + DELETE("delete","删除"), ; private String code; private String desc; - private static Set readSet = Sets.newSet("search","get","find","select","load","read"); - private static Set writeSet = Sets.newSet("write","regist","update","create","save","insert","delete","init"); + //支持业务领域动词注册功能 + private static Set readSet = Sets.newSet("search","get","find","select","load","read","query","export"); + + private static Set writeSet = Sets.newSet("write","regist","update","create","save","insert","delete","init","import"); + + + private static Set insertSet = Sets.newSet("batchinsert","insertbatch","savebatch","save","batchsave"); + + private static Set updateSet = Sets.newSet("batchupdate","updatebatch","update"); + + private static Set deleteSet = Sets.newSet("deletebatch","batchdelete","update"); ReadWriteTypeEnum(String code, String desc){ this.code = code; @@ -47,7 +60,7 @@ public enum ReadWriteTypeEnum { public static String getCodeByMethod(String methodName){ AtomicReference code = new AtomicReference<>(""); readSet.stream().forEach(v->{ - if(methodName.startsWith(v)){ + if(methodName.toLowerCase().startsWith(v)){ code.set(ReadWriteTypeEnum.READ.getCode()); } }); @@ -55,11 +68,73 @@ public enum ReadWriteTypeEnum { return code.get(); } writeSet.stream().forEach(v->{ - if(methodName.startsWith(v)){ + if(methodName.toLowerCase().startsWith(v)){ code.set(ReadWriteTypeEnum.WRITE.getCode()); } }); return code.get(); } + + /** + * 判断是否是保存 + * @param methodName + * @return + */ + public static boolean isInsert(String methodName){ + AtomicReference insertTag = new AtomicReference<>(false); + insertSet.stream().forEach(v->{ + if(methodName.toLowerCase().startsWith(v)){ + insertTag.set(true); + } + }); + return insertTag.get(); + } + + /** + * 判断是否是更新 + * @param methodName + * @return + */ + public static boolean isUpdate(String methodName){ + AtomicReference insertTag = new AtomicReference<>(false); + updateSet.stream().forEach(v->{ + if(methodName.toLowerCase().startsWith(v)){ + insertTag.set(true); + } + }); + return insertTag.get(); + } + + /** + * 判断是否是删除 + * @param methodName + * @return + */ + public static boolean isDelete(String methodName){ + AtomicReference insertTag = new AtomicReference<>(false); + deleteSet.stream().forEach(v->{ + if(methodName.toLowerCase().startsWith(v)){ + insertTag.set(true); + } + }); + return insertTag.get(); + } + + /** + * 根据方法名推导出可能的属性 + * 先对 read场景推导 + * @return + */ + public static String getSomeFieldFromMethodName(String methodName){ + final String[] tempMethodName = {methodName}; + readSet.forEach(read->{ + tempMethodName[0] = tempMethodName[0].replace(read,""); + }); + String fieldName = tempMethodName[0].replace("By",""); + if(!StringUtils.isEmpty(fieldName)){ + return fieldName; + } + return null; + } } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/listener/RefrashConfigListener.java b/codemaker-core/src/main/java/com/coderman/codemaker/listener/RefrashConfigListener.java new file mode 100644 index 0000000000000000000000000000000000000000..56e41aea3db414a4b12b592f2a3a2ea8fcb6526a --- /dev/null +++ b/codemaker-core/src/main/java/com/coderman/codemaker/listener/RefrashConfigListener.java @@ -0,0 +1,42 @@ +package com.coderman.codemaker.listener; + +import com.coderman.codemaker.config.DefaultPackageConfig; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.context.event.ApplicationStartedEvent; +import org.springframework.context.ApplicationListener; +import org.springframework.core.annotation.Order; +import org.springframework.stereotype.Component; + + +/** + * Description:项目启动监听器，做数据初始化使用 + * date: 2020/9/29 10:21 上午 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +@Order(value = 1000) +@Component +public class RefrashConfigListener implements ApplicationListener { + private Logger logger = LoggerFactory.getLogger(RefrashConfigListener.class); + + @Autowired + private DefaultPackageConfig defaultPackageConfig; + + @Override + public void onApplicationEvent(ApplicationStartedEvent event) { + try { + logger.info("应用启动成功,准备刷新初始化适配依赖配置......................."); + defaultPackageConfig.addAdapterPackages(); + logger.info("应用启动成功,刷新初始化适配依赖配置完成......................."); + + } catch (Exception e) { + logger.error("刷新初始化适配依赖配置失败",e); + } + + + } +} diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/ImportPackageService.java b/codemaker-core/src/main/java/com/coderman/codemaker/service/ImportPackageService.java similarity index 81% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/ImportPackageService.java rename to codemaker-core/src/main/java/com/coderman/codemaker/service/ImportPackageService.java index 827ef3ea22a5208b28ad32fc91a1f93d19acc3cd..2c09c8b5b9a9180b7a59e17e09465452e35fcab6 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/ImportPackageService.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/service/ImportPackageService.java @@ -1,19 +1,19 @@ -package com.coderman.codemaker.app; +package com.coderman.codemaker.service; import com.coderman.codemaker.bean.plantuml.AbstractClassBean; -import com.coderman.codemaker.bean.plantuml.FieldBean; +import com.coderman.codemaker.bean.plantuml.ClassBean; +import com.coderman.codemaker.bean.plantuml.InterfaceBean; import com.coderman.codemaker.bean.plantuml.PlantUmlContextBean; import com.coderman.codemaker.config.AppServiceConfig; import com.coderman.codemaker.config.DefaultPackageConfig; +import com.coderman.codemaker.enums.TemplateFileEnum; import com.google.common.collect.Lists; -import com.google.common.collect.Sets; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.HashSet; -import java.util.List; import java.util.Set; /** @@ -46,12 +46,23 @@ public class ImportPackageService { //对方法进行探测 abstractClassBean.getMethodBeanList().forEach(methodBean -> { String returnClassName = methodBean.getReturnClass(); - - String defaultPackageName = defaultPackageConfig.getPackage(returnClassName); - if(!StringUtils.isEmpty(defaultPackageName)){ - importClassSet.add(defaultPackageName); + if(returnClassName.contains("<")){ + String [] arr = returnClassName.split("<"); + for (String importClassName : arr){ + String className = importClassName.replace(">","").trim(); + String defaultPackageName = defaultPackageConfig.getPackage(className); + if(!StringUtils.isEmpty(defaultPackageName)){ + importClassSet.add(defaultPackageName); + } + } + }else { + String defaultPackageName = defaultPackageConfig.getPackage(returnClassName); + if(!StringUtils.isEmpty(defaultPackageName)){ + importClassSet.add(defaultPackageName); + } } + String methodName = methodBean.getMethodName(); //对方法参数进行探测 @@ -330,6 +341,57 @@ public class ImportPackageService { } + /** + * 通过给定类判断类是否在默认配置里的类包 + * @param targetClass + * @return + */ + public String getMatchPackageDefault(String targetClass){ + return defaultPackageConfig.getPackage(targetClass); + } + + + /** + * 在动态调用中处理引用包 + * @param invokerClassBean + * @param plantUmlContextBean + * @param importClassName + */ + public void dealImportPackage(AbstractClassBean invokerClassBean, PlantUmlContextBean plantUmlContextBean, String importClassName){ + //处理bo 或者do + if(importClassName.trim().toLowerCase() + .endsWith(TemplateFileEnum.BUSINESS_OBJECT.getTempFileName()) + || importClassName.trim().toLowerCase() + .endsWith(TemplateFileEnum.DATA_OBJECT.getTempFileName())){ + ClassBean classBean = plantUmlContextBean.getClassBeanMap().get(importClassName); + if(classBean == null) { + return; + } + invokerClassBean.getDynamicImportPackageList().add(classBean.getPackageName()+"."+classBean.getClassName()); + } + + //处理vo 或者dto + if((importClassName.trim().toLowerCase().endsWith(TemplateFileEnum.DTO.getTempFileName()) + || importClassName.trim().toLowerCase().endsWith(TemplateFileEnum.VO.getTempFileName())) + && plantUmlContextBean.getDerivedPlantUmlContextBean() != null){ + ClassBean classBean = plantUmlContextBean.getDerivedPlantUmlContextBean().getClassBeanMap().get(importClassName); + if(classBean == null) { + return; + } + invokerClassBean.getDynamicImportPackageList().add(classBean.getPackageName()+"."+classBean.getClassName()); + } + + //处理convert + if(importClassName.trim().toLowerCase().endsWith(TemplateFileEnum.CONVERT.getTempFileName()) + && plantUmlContextBean.getDerivedPlantUmlContextBean() != null){ + InterfaceBean interfaceBean = plantUmlContextBean.getDerivedPlantUmlContextBean().getInterfaceBeanMap().get(importClassName); + if(interfaceBean == null) { + return; + } + invokerClassBean.getDynamicImportPackageList().add(interfaceBean.getPackageName()+"."+interfaceBean.getClassName()); + } + } + } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/ReadPlantUMLFileService.java b/codemaker-core/src/main/java/com/coderman/codemaker/service/ReadPlantUMLFileService.java deleted file mode 100644 index 188986c335051beb475123e92c134ca057a8b35d..0000000000000000000000000000000000000000 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/ReadPlantUMLFileService.java +++ /dev/null @@ -1,335 +0,0 @@ -package com.coderman.codemaker.service; - -import com.coderman.codemaker.bean.plantuml.*; -import com.coderman.codemaker.config.ProjectTemplateDynamicDDDConfig; -import com.coderman.codemaker.enums.ClassEnum; -import com.coderman.codemaker.enums.ClassRelationEnum; -import com.coderman.codemaker.enums.VisibilityEnum; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.io.FileUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.ResourceUtils; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * Description: 读文件服务 - * 读取plantUML类图 - * date: 2021/6/28 - * - * @author fanchunshuai - * @version 1.0.0 - * @since JDK 1.8 - * - */ -@Service -public class ReadPlantUMLFileService { - - @Autowired - private ProjectTemplateDynamicDDDConfig projectTemplateDynamicDDDConfig; - - /** - * 读取plantUMl文件 - * @return - */ - private List readPlantUMLContent(){ - try { - File file = ResourceUtils.getFile("classpath:ddd-plantuml/"+projectTemplateDynamicDDDConfig.getPlantumlFileName()); - return FileUtils.readLines(file,"UTF-8"); - } catch (IOException e) { - e.printStackTrace(); - } - return null; - } - - /** - * 解析plantUML文件内容 - * @return - */ - public PlantUmlContextBean getPlantUmlContextBean(){ - List contentList = readPlantUMLContent(); - List elementList = new ArrayList<>(); - PlantUmlContextBean plantUmlContextBean = new PlantUmlContextBean(); - - //对class,enum,interface进行解析 - for(String str : contentList){ - if(StringUtils.isEmpty(str) || str.contains("@startuml") || str.contains("package")){ - continue; - } - - if(str.trim().contains("{")){ - elementList.add(str.trim()); - continue; - } - if(str.trim().contains("}")){ - elementList.add(str.trim()); - parseClassElement(elementList,plantUmlContextBean); - elementList.clear(); - continue; - } - elementList.add(str.trim()); - } - - - - //对类与类的关系进行解析 - Map> relationListMap = new HashMap<>(); - for(String str : contentList){ - if(StringUtils.isEmpty(str) || str.contains("@startuml") - || str.contains("package") || str.trim().contains("{") || str.trim().contains("}")){ - continue; - } - - Map relationMap = ClassRelationEnum.parseRelation(str); - if(relationMap == null || relationMap.size()<2){ - continue; - } - List relationList = relationListMap.get(relationMap.get("class")); - if(CollectionUtils.isEmpty(relationList)){ - relationList = new ArrayList<>(); - } - relationList.add(relationMap.get("relation")); - relationListMap.put(relationMap.get("class").trim(),relationList); - } - - plantUmlContextBean.getClassBeanMap().forEach((className,classBean)->{ - List relationList = relationListMap.get(className); - if(CollectionUtils.isNotEmpty(relationList)){ - classBean.setRelationClassStr(StringUtils.join(relationList,",")); - } - }); - - return plantUmlContextBean; - } - - - /** - * 解析文件内容整体路由 - * @param elementList - * @param plantUmlContextBean - */ - private void parseClassElement(List elementList, PlantUmlContextBean plantUmlContextBean){ - String classType = getClassType(elementList.get(0)); - if(classType.equals(ClassEnum.CLASS.getClassType())){ - ClassBean classBean = buildClassBean(elementList); - plantUmlContextBean.addClassBean(classBean); - } - else if(classType.equals(ClassEnum.ENUM.getClassType())){ - EnumBean enumBean = builEnumBean(elementList); - plantUmlContextBean.addEnumBean(enumBean); - } - - else if(classType.equals(ClassEnum.INTERFACE.getClassType())){ - InterfaceBean interfaceBean = buildInterfaceBean(elementList); - plantUmlContextBean.addInterfaceBean(interfaceBean); - } - } - - - private String getClassType(String ele){ - return ele.split(" ")[0]; - } - - /** - * 解析class类型数据 - * @param elementList - * @return - */ - private ClassBean buildClassBean(List elementList ){ - - String[] array = elementList.get(0).trim().replace("{","").trim().split(" "); - - String classMetaInfoArr = array[1]; - List fieldBeanList = getFieldBeanList(elementList.subList(1,elementList.size())); - List methodBeanList = getMethodBeanList(elementList.subList(1,elementList.size())); - ClassBean classBean = new ClassBean(); - classBean.setFieldBeanList(fieldBeanList); - classBean.setMethodBeanList(methodBeanList); - classBean.setClassName(classMetaInfoArr.split("-")[1].replace("\"","")); - classBean.setClassDesc(classMetaInfoArr.split("-")[0].replace("\"","")); - return classBean; - } - - /** - * 解析接口类型数据 - * @param elementList - * @return - */ - private InterfaceBean buildInterfaceBean(List elementList ){ - - String[] array = elementList.get(0).trim().replace("{","").trim().split(" "); - - String classMetaInfoArr = array[1]; - List methodBeanList = getMethodBeanList(elementList.subList(1,elementList.size())); - InterfaceBean interfaceBean = new InterfaceBean(); - interfaceBean.setMethodBeanList(methodBeanList); - interfaceBean.setClassName(classMetaInfoArr.split("-")[1].replace("\"","")); - interfaceBean.setClassDesc(classMetaInfoArr.split("-")[0].replace("\"","")); - return interfaceBean; - } - - /** - * 解析enum类型数据 - * @param elementList - * @return - */ - private EnumBean builEnumBean(List elementList ){ - - String[] array = elementList.get(0).trim().replace("{","").trim().split(" "); - - String classMetaInfoArr = array[1]; - List fieldBeanList = getFieldBeanList(elementList.subList(1,elementList.size())); - EnumBean enumBean = new EnumBean(); - enumBean.setFieldBeanList(fieldBeanList); - enumBean.setClassName(classMetaInfoArr.split("-")[1].replace("\"","")); - enumBean.setClassDesc(classMetaInfoArr.split("-")[0].replace("\"","")); - dealEnumMethodBeanList(elementList,enumBean); - return enumBean; - } - - /** - * 获取类的属性列表 - * @param elementList - * @return - */ - private List getFieldBeanList(List elementList){ - List fieldBeanList = new ArrayList<>(); - - for (String fieldStr : elementList){ - if(fieldStr.contains("(") || fieldStr.contains(")")){ - continue; - } - if(!fieldStr.trim().contains(":")){ - continue; - } - //+主交易单类型:string tradeOrderType - String[] fieldArr = fieldStr.trim().split(":"); - FieldBean fieldBean = new FieldBean(); - fieldBean.setDesc(fieldArr[0]); - fieldBean.setVisibility(VisibilityEnum.getVisibilityStr(fieldArr[0])); - fieldBean.setFieldName(fieldArr[1]); - fieldBeanList.add(fieldBean); - } - return fieldBeanList; - } - - /** - * 获取类的方法列表 - * @param elementList - * @return - */ - private List getMethodBeanList(List elementList){ - List methodBeanList = new ArrayList<>(); - for (String fieldStr : elementList){ - - if(!fieldStr.contains("()") && !fieldStr.contains("(") && !fieldStr.contains(")")){ - continue; - } - MethodBean methodBean =new MethodBean(); - - //-创建变更日志: TradeOrderLogBO getTradeOrderLogBO() - if(fieldStr.contains(":")){ - String[] fieldArr = fieldStr.trim().split(":"); - methodBean.setVisibility(VisibilityEnum.getVisibilityStr(fieldArr[1])); - methodBean.setDesc(fieldArr[0]); - - String[] arr = fieldArr[1].trim().split(" "); - if(arr.length == 2){ - methodBean.setReturnClass(arr[0]); - methodBean.setMethodName(arr[1]); - }else{ - methodBean.setReturnClass(arr[0]); - methodBean.setMethodName(fieldArr[1].trim().replace(arr[0],"")); - } - }else { - String[] fieldArr = fieldStr.trim().split(" "); - //没有注释--->中文校验 - if(fieldArr.length ==2){ - methodBean.setVisibility(VisibilityEnum.getVisibilityStr(fieldStr.trim())); - methodBean.setReturnClass(fieldStr.trim().split(" ")[0]); - methodBean.setMethodName(fieldStr.trim().split(" ")[1]); - }else{ - methodBean.setDesc(fieldArr[0]); - methodBean.setVisibility(VisibilityEnum.getVisibilityStr(fieldStr.trim())); - methodBean.setReturnClass(fieldArr[1]); - StringBuilder builder = new StringBuilder(); - for (int i = 2;i elementList, EnumBean enumBean){ - List methodBeanList = new ArrayList<>(); - List enumValueList = new ArrayList<>(); - for (String fieldStr : elementList){ - if(!fieldStr.contains("()") && !fieldStr.contains("(") && !fieldStr.contains(")")){ - continue; - } - - //处理枚举值 - String valueCode = fieldStr.substring(0,fieldStr.indexOf("(")); - if(!StringUtils.isEmpty(valueCode) && !valueCode.contains(" ")){ - enumValueList.add(fieldStr); - continue; - } - - MethodBean methodBean =new MethodBean(); - - //-创建变更日志: TradeOrderLogBO getTradeOrderLogBO() - if(fieldStr.contains(":")){ - String[] fieldArr = fieldStr.trim().split(":"); - methodBean.setVisibility(VisibilityEnum.getVisibilityStr(fieldArr[0])); - methodBean.setDesc(fieldArr[0]); - methodBean.setReturnClass(fieldArr[1].trim().split(" ")[0]); - methodBean.setMethodName(fieldArr[1].trim().split(" ")[1]); - }else { - String[] fieldArr = fieldStr.trim().split(" "); - //没有注释--->中文校验 - if(fieldArr.length ==2){ - methodBean.setVisibility(VisibilityEnum.getVisibilityStr(fieldStr.trim())); - methodBean.setReturnClass(fieldStr.trim().split(" ")[0]); - methodBean.setMethodName(fieldStr.trim().split(" ")[1]); - }else{ - methodBean.setDesc(fieldArr[0]); - methodBean.setVisibility(VisibilityEnum.getVisibilityStr(fieldStr.trim())); - methodBean.setReturnClass(fieldArr[1]); - StringBuilder builder = new StringBuilder(); - for (int i = 2;i varMap, String fast) { + if (StringUtils.isEmpty(fast)) { + fast = "/" + appServiceConfig.getApplicationType() + "/"; + } + String entityContent = freemarkerService.parseTpl(fast + TemplateFileEnum.ENTITY.getTempFileName(), varMap); + this.writeEntity(entityContent, humpClassName); + + String serviceContent = freemarkerService.parseTpl(fast + TemplateFileEnum.SERVICE.getTempFileName(), varMap); + this.writeService(serviceContent, humpClassName); + + String serviceImplContent = freemarkerService.parseTpl(fast + TemplateFileEnum.SERVICE_IMPL.getTempFileName(), varMap); + this.writeServiceImpl(serviceImplContent, humpClassName); + + String mapperXmlContent = freemarkerService.parseTpl(fast + TemplateFileEnum.MAPPER_XML.getTempFileName(), varMap); + this.writeMapperXml(mapperXmlContent, humpClassName); + + String mapperContent = freemarkerService.parseTpl(fast + TemplateFileEnum.MAPPER.getTempFileName(), varMap); + this.writeMapper(mapperContent, humpClassName); + + String controllerContent = freemarkerService.parseTpl(fast + TemplateFileEnum.CONTROLLER.getTempFileName(), varMap); + this.writeController(controllerContent, humpClassName); + + String voContent = freemarkerService.parseTpl(fast + TemplateFileEnum.VO.getTempFileName(), varMap); + this.writeVO(voContent, humpClassName); + + String testContent = freemarkerService.parseTpl(fast + TemplateFileEnum.TEST.getTempFileName(), varMap); + this.writeTest(testContent, humpClassName); + + String boContent = freemarkerService.parseTpl(fast + TemplateFileEnum.BUSINESS_OBJECT.getTempFileName(), varMap); + this.writeBO(boContent, humpClassName); + + String dtoContent = freemarkerService.parseTpl(fast + TemplateFileEnum.DTO.getTempFileName(), varMap); + this.writeDTO(dtoContent, humpClassName); + + + String facadeContent = freemarkerService.parseTpl(fast + TemplateFileEnum.FACADE.getTempFileName(), varMap); + this.writeFacade(facadeContent, humpClassName); + + + String facadeImplContent = freemarkerService.parseTpl(fast + TemplateFileEnum.FACADE_IMPL.getTempFileName(), varMap); + this.writeFacadeImpl(facadeImplContent, humpClassName); + + String doContent = freemarkerService.parseTpl(fast + TemplateFileEnum.DATA_OBJECT.getTempFileName(), varMap); + this.writeDO(doContent, humpClassName); + } + + /** + * 写公共基础服务类 + * + * @param varMap + */ + public void writeCommon(Map varMap, String fast) { + + + String baseControllerContent = freemarkerService.parseTpl(fast + TemplateFileEnum.BASE_CONTROLLER.getTempFileName(), varMap); + this.writeBaseController(baseControllerContent); + + String SpringApplicationContextContent = freemarkerService.parseTpl(fast + TemplateFileEnum.SPRING_APPLICATION_CONTEXT.getTempFileName(), varMap); + this.writeSpringApplicationContext(SpringApplicationContextContent); + + String application = freemarkerService.parseTpl(fast + TemplateFileEnum.APPLICATION.getTempFileName(), varMap); + this.writeApplication(application); + + String facadeAop = freemarkerService.parseTpl(fast + TemplateFileEnum.FACADE_AOP.getTempFileName(), varMap); + this.writeFacadeAop(facadeAop); + + + } + + /** + * 整合e-r图生成工具 + * + * @param tableBeanMap + * @param columnBeanListMap + */ + public void writeERPicture(Map tableBeanMap, Map> columnBeanListMap) { + String filePath = appServiceConfig.getErPictureOutPath() + Constant.ER_PICTURE + "/" + appServiceConfig.getDbName() + ".puml"; + List tableBeanList = new ArrayList<>(); + tableBeanMap.forEach((k, v) -> { + com.coderman.codemaker.dbergenerate.bean.TableBean tableBean = new com.coderman.codemaker.dbergenerate.bean.TableBean(); + tableBean.setTableComment(v.getTableComment()); + tableBean.setTableName(v.getTableName()); + List columnBeanList = columnBeanListMap.get(k); + List columnBeanList1 = new ArrayList<>(); + columnBeanList.forEach(columnBean -> { + com.coderman.codemaker.dbergenerate.bean.ColumnBean columnBean1 = new com.coderman.codemaker.dbergenerate.bean.ColumnBean(); + columnBean1.setColumnComment(columnBean.getColumnComment()); + columnBean1.setColumnKey(columnBean.getColumnKey()); + columnBean1.setColumnName(columnBean.getColumnName()); + columnBean1.setTableName(columnBean.getTableName()); + columnBean1.setColumnType(columnBean.getColumnType()); + columnBean1.setDataType(columnBean.getDataType()); + columnBeanList1.add(columnBean1); + }); + tableBean.setColumnBeanList(columnBeanList1); + tableBeanList.add(tableBean); + }); + erPictureService.getErPicture(filePath, tableBeanList); + } +} diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/WriteAppModuleService.java b/codemaker-core/src/main/java/com/coderman/codemaker/service/WriteDynamicCodeService.java similarity index 59% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/WriteAppModuleService.java rename to codemaker-core/src/main/java/com/coderman/codemaker/service/WriteDynamicCodeService.java index 84de00e2240ecad9dc5574227332a18d575c86af..0212af338286c26e7450743fdc3dbb47448c91f2 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/WriteAppModuleService.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/service/WriteDynamicCodeService.java @@ -1,5 +1,6 @@ package com.coderman.codemaker.service; +import com.coderman.codemaker.app.IWriteFileService; import com.coderman.codemaker.bean.ColumnBean; import com.coderman.codemaker.bean.TableBean; import com.coderman.codemaker.bean.WriteContentBean; @@ -9,6 +10,8 @@ import com.coderman.codemaker.bean.plantuml.InterfaceBean; import com.coderman.codemaker.config.AppServiceConfig; import com.coderman.codemaker.enums.TemplateFileEnum; +import com.coderman.codemaker.service.dberpicture.DBErPictureService; +import com.coderman.codemaker.service.template.FreemarkerService; import com.coderman.codemaker.utils.Constant; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -31,7 +34,7 @@ import java.util.Map; */ @Component -public class WriteAppModuleService { +public class WriteDynamicCodeService { @Autowired private AppServiceConfig appServiceConfig; @@ -43,128 +46,10 @@ public class WriteAppModuleService { private FreemarkerService freemarkerService; @Autowired - private WriteDynamicDDDModuleService writeDynamicDDDModuleService; + private WriteDynamicDDDService writeDynamicDDDModuleService; - /** - * 写mapper xml文件 - * - * @param content - * @param humpClassName - */ - public void writeMapperXml(String content, String humpClassName) { - IWriteFileService writeFileService = appServiceConfig.getModuleWriteService(TemplateFileEnum.MAPPER_XML.getTempFileName()); - if (writeFileService == null) { - return; - } - - WriteContentBean writeContentBean = WriteContentBean.builder().content(content) - .templateName(TemplateFileEnum.MAPPER_XML.getTempFileName()) - .humpClassName(humpClassName).build(); - - writeFileService.writeContent(writeContentBean); - } - - /** - * 写entity文件 - * - * @param content - * @param humpClassName - */ - public void writeEntity(String content, String humpClassName) { - IWriteFileService writeFileService = appServiceConfig.getModuleWriteService(TemplateFileEnum.ENTITY.getTempFileName()); - if (writeFileService == null) { - return; - } - WriteContentBean writeContentBean = WriteContentBean.builder().content(content) - .templateName(TemplateFileEnum.ENTITY.getTempFileName()) - .humpClassName(humpClassName).build(); - - writeFileService.writeContent(writeContentBean); - } - - /** - * 写do文件 - * - * @param content - * @param humpClassName - */ - public void writeDO(String content, String humpClassName) { - IWriteFileService writeFileService = appServiceConfig.getModuleWriteService(TemplateFileEnum.DATA_OBJECT.getTempFileName()); - if (writeFileService == null) { - return; - } - WriteContentBean writeContentBean = WriteContentBean.builder().content(content) - .templateName(TemplateFileEnum.DATA_OBJECT.getTempFileName()) - .humpClassName(humpClassName).build(); - - writeFileService.writeContent(writeContentBean); - } - - - /** - * 写VO文件 - * - * @param content - * @param humpClassName - */ - public void writeVO(String content, String humpClassName) { - IWriteFileService writeFileService = appServiceConfig.getModuleWriteService(TemplateFileEnum.VO.getTempFileName()); - if (writeFileService == null) { - return; - } - WriteContentBean writeContentBean = WriteContentBean.builder().content(content) - .templateName(TemplateFileEnum.VO.getTempFileName()) - .humpClassName(humpClassName).build(); - - writeFileService.writeContent(writeContentBean); - } - - /** - * 写DTO文件 - * - * @param content - * @param humpClassName - */ - public void writeDTO(String content, String humpClassName) { - IWriteFileService writeFileService = appServiceConfig.getModuleWriteService(TemplateFileEnum.DTO.getTempFileName()); - if (writeFileService == null) { - return; - } - - WriteContentBean writeContentBean = WriteContentBean.builder().content(content) - .templateName(TemplateFileEnum.DTO.getTempFileName()) - .humpClassName(humpClassName).build(); - writeFileService.writeContent(writeContentBean); - } - - /** - * 写BO文件 - * - * @param content - * @param humpClassName - */ - public void writeBO(String content, String humpClassName) { - IWriteFileService writeFileService = appServiceConfig.getModuleWriteService(TemplateFileEnum.BUSINESS_OBJECT.getTempFileName()); - if (writeFileService == null) { - return; - } - WriteContentBean writeContentBean = WriteContentBean.builder().content(content) - .templateName(TemplateFileEnum.BUSINESS_OBJECT.getTempFileName()) - .humpClassName(humpClassName).build(); - writeFileService.writeContent(writeContentBean); - } - - /** - * 写BO文件 - * @param writeContentBean - */ - public void writeBO(WriteContentBean writeContentBean) { - IWriteFileService writeFileService = appServiceConfig.getModuleWriteService(TemplateFileEnum.BUSINESS_OBJECT.getTempFileName()); - if (writeFileService == null) { - return; - } - writeFileService.writeContent(writeContentBean); - } + @Autowired + private WriteCodeService writeCodeService; /** * 写BO文件 @@ -213,6 +98,32 @@ public class WriteAppModuleService { } writeDynamicDDDModuleService.writeGataWay(classBeanList,writeFileService,null); } + + + /** + * 写dynamicMapper文件 + * @param classBeanList + */ + public void writeDynamicMapper(List classBeanList) { + IWriteFileService writeFileService = appServiceConfig.getModuleWriteService(TemplateFileEnum.MAPPER_DDD.getTempFileName()); + if (writeFileService == null) { + return; + } + writeDynamicDDDModuleService.writeDynamicMapper(classBeanList,writeFileService,null); + } + + /** + * 写dynamicMapperxml文件 + * @param classBeanList + */ + public void writeDynamicMapperXml(List classBeanList) { + IWriteFileService writeFileService = appServiceConfig.getModuleWriteService(TemplateFileEnum.MAPPER_XML_DDD.getTempFileName()); + if (writeFileService == null) { + return; + } + writeDynamicDDDModuleService.writeDynamicMapperXml(classBeanList,writeFileService,null); + } + /** * 写domaingatawayimpl文件 * @param gatawayImplBeanList @@ -309,8 +220,6 @@ public class WriteAppModuleService { writeDynamicDDDModuleService.writeMqHandler(classBeanList,writeFileService,null); } - - /** * 写AppExeImpl文件 * @param classBeanList @@ -507,23 +416,6 @@ public class WriteAppModuleService { writeDynamicDDDModuleService.writeFacadeImpl(classBeanList,writeFileService); } - /** - * 写mapper class文件 - * - * @param content - * @param humpClassName - */ - public void writeMapper(String content, String humpClassName) { - IWriteFileService writeFileService = appServiceConfig.getModuleWriteService(TemplateFileEnum.MAPPER.getTempFileName()); - if (writeFileService == null) { - return; - } - WriteContentBean writeContentBean = WriteContentBean.builder().content(content) - .templateName(TemplateFileEnum.MAPPER.getTempFileName()) - .humpClassName(humpClassName).build(); - writeFileService.writeContent(writeContentBean); - } - /** * 写service文件 * @@ -541,215 +433,39 @@ public class WriteAppModuleService { writeFileService.writeContent(writeContentBean); } - - /** - * 写facade文件 - * - * @param content - * @param humpClassName - */ - public void writeFacade(String content, String humpClassName) { - IWriteFileService writeFileService = appServiceConfig.getModuleWriteService(TemplateFileEnum.FACADE.getTempFileName()); - if (writeFileService == null) { - return; - } - WriteContentBean writeContentBean = WriteContentBean.builder().content(content) - .templateName(TemplateFileEnum.FACADE.getTempFileName()) - .humpClassName(humpClassName).build(); - writeFileService.writeContent(writeContentBean); - } - - - /** - * 写facadeimpl文件 - * - * @param content - * @param humpClassName - */ - public void writeFacadeImpl(String content, String humpClassName) { - IWriteFileService writeFileService = appServiceConfig.getModuleWriteService(TemplateFileEnum.FACADE_IMPL.getTempFileName()); - if (writeFileService == null) { - return; - } - WriteContentBean writeContentBean = WriteContentBean.builder().content(content) - .templateName(TemplateFileEnum.FACADE_IMPL.getTempFileName()) - .humpClassName(humpClassName).build(); - writeFileService.writeContent(writeContentBean); - } - - - /** - * 写serviceImpl文件 - * - * @param content - * @param humpClassName - */ - public void writeServiceImpl(String content, String humpClassName) { - IWriteFileService writeFileService = appServiceConfig.getModuleWriteService(TemplateFileEnum.SERVICE_IMPL.getTempFileName()); - if (writeFileService == null) { - return; - } - WriteContentBean writeContentBean = WriteContentBean.builder().content(content) - .templateName(TemplateFileEnum.SERVICE_IMPL.getTempFileName()) - .humpClassName(humpClassName).build(); - writeFileService.writeContent(writeContentBean); - } - - - /** - * 写BaseController文件 - * - * @param content - */ - public void writeBaseController(String content) { - IWriteFileService writeFileService = appServiceConfig.getModuleWriteService(TemplateFileEnum.BASE_CONTROLLER.getTempFileName()); - if (writeFileService == null) { - return; - } - WriteContentBean writeContentBean = WriteContentBean.builder().content(content) - .templateName(TemplateFileEnum.BASE_CONTROLLER.getTempFileName()) - .humpClassName("").build(); - writeFileService.writeContent(writeContentBean); - } - /** * 写工具类文件 * * @param content */ - public void writeSpringApplicationContext(String content) { - IWriteFileService writeFileService = appServiceConfig.getModuleWriteService(TemplateFileEnum.SPRING_APPLICATION_CONTEXT.getTempFileName()); - if (writeFileService == null) { - return; - } - WriteContentBean writeContentBean = WriteContentBean.builder().content(content) - .templateName(TemplateFileEnum.SPRING_APPLICATION_CONTEXT.getTempFileName()) - .humpClassName("SpringApplicationContext.java").build(); - writeFileService.writeContent(writeContentBean); - } - - - /** - * 写测试文件 - * - * @param content - */ - public void writeTest(String content, String humpClassName) { - IWriteFileService writeFileService = appServiceConfig.getModuleWriteService(TemplateFileEnum.TEST.getTempFileName()); - if (writeFileService == null) { - return; - } - WriteContentBean writeContentBean = WriteContentBean.builder().content(content) - .templateName(TemplateFileEnum.TEST.getTempFileName()) - .humpClassName(humpClassName).build(); - writeFileService.writeContent(writeContentBean); - } - - /** - * 写应用启动类 - * - * @param content - */ - public void writeApplication(String content) { - IWriteFileService writeFileService = appServiceConfig.getModuleWriteService(TemplateFileEnum.APPLICATION.getTempFileName()); + public void writeAppEventPublisher(String content) { + IWriteFileService writeFileService = appServiceConfig.getModuleWriteService(TemplateFileEnum.APP_EVENT_PUBLISHER.getTempFileName()); if (writeFileService == null) { return; } WriteContentBean writeContentBean = WriteContentBean.builder().content(content) - .templateName(TemplateFileEnum.APPLICATION.getTempFileName()) - .humpClassName("Application.java").build(); - writeFileService.writeContent(writeContentBean); - } + .templateName(TemplateFileEnum.APP_EVENT_PUBLISHER.getTempFileName()) + .humpClassName("AppEventPublisher.java").build(); - - /** - * 写应用启动类 - * - * @param content - */ - public void writeFacadeAop(String content) { - IWriteFileService writeFileService = appServiceConfig.getModuleWriteService(TemplateFileEnum.APPLICATION.getTempFileName()); - if (writeFileService == null) { - return; - } - WriteContentBean writeContentBean = WriteContentBean.builder().content(content) - .templateName(TemplateFileEnum.FACADE_AOP.getTempFileName()) - .humpClassName("FacadeServiceAop.java").build(); writeFileService.writeContent(writeContentBean); } - /** - * 写controller文件 + * 写工具类文件 * * @param content - * @param humpClassName */ - public void writeController(String content, String humpClassName) { - IWriteFileService writeFileService = appServiceConfig.getModuleWriteService(TemplateFileEnum.CONTROLLER.getTempFileName()); + public void writeBaseEvent(String content) { + IWriteFileService writeFileService = appServiceConfig.getModuleWriteService(TemplateFileEnum.BASE_EVENT.getTempFileName()); if (writeFileService == null) { return; } WriteContentBean writeContentBean = WriteContentBean.builder().content(content) - .templateName(TemplateFileEnum.CONTROLLER.getTempFileName()) - .humpClassName(humpClassName).build(); + .templateName(TemplateFileEnum.BASE_EVENT.getTempFileName()) + .humpClassName("BaseEvent.java").build(); writeFileService.writeContent(writeContentBean); } - /** - * 一次性生成单表需要的所有模块代码 - * - * @param humpClassName - * @param varMap - */ - public void writeAll(String humpClassName, Map varMap, String fast) { - if (StringUtils.isEmpty(fast)) { - fast = "/" + appServiceConfig.getApplicationType() + "/"; - } - String entityContent = freemarkerService.parseTpl(fast + TemplateFileEnum.ENTITY.getTempFileName(), varMap); - this.writeEntity(entityContent, humpClassName); - - String serviceContent = freemarkerService.parseTpl(fast + TemplateFileEnum.SERVICE.getTempFileName(), varMap); - this.writeService(serviceContent, humpClassName); - - String serviceImplContent = freemarkerService.parseTpl(fast + TemplateFileEnum.SERVICE_IMPL.getTempFileName(), varMap); - this.writeServiceImpl(serviceImplContent, humpClassName); - - String mapperXmlContent = freemarkerService.parseTpl(fast + TemplateFileEnum.MAPPER_XML.getTempFileName(), varMap); - this.writeMapperXml(mapperXmlContent, humpClassName); - - String mapperContent = freemarkerService.parseTpl(fast + TemplateFileEnum.MAPPER.getTempFileName(), varMap); - this.writeMapper(mapperContent, humpClassName); - - String controllerContent = freemarkerService.parseTpl(fast + TemplateFileEnum.CONTROLLER.getTempFileName(), varMap); - this.writeController(controllerContent, humpClassName); - - String voContent = freemarkerService.parseTpl(fast + TemplateFileEnum.VO.getTempFileName(), varMap); - this.writeVO(voContent, humpClassName); - - String testContent = freemarkerService.parseTpl(fast + TemplateFileEnum.TEST.getTempFileName(), varMap); - this.writeTest(testContent, humpClassName); - - String boContent = freemarkerService.parseTpl(fast + TemplateFileEnum.BUSINESS_OBJECT.getTempFileName(), varMap); - this.writeBO(boContent, humpClassName); - - String dtoContent = freemarkerService.parseTpl(fast + TemplateFileEnum.DTO.getTempFileName(), varMap); - this.writeDTO(dtoContent, humpClassName); - - - String facadeContent = freemarkerService.parseTpl(fast + TemplateFileEnum.FACADE.getTempFileName(), varMap); - this.writeFacade(facadeContent, humpClassName); - - - String facadeImplContent = freemarkerService.parseTpl(fast + TemplateFileEnum.FACADE_IMPL.getTempFileName(), varMap); - this.writeFacadeImpl(facadeImplContent, humpClassName); - - String doContent = freemarkerService.parseTpl(fast + TemplateFileEnum.DATA_OBJECT.getTempFileName(), varMap); - this.writeDO(doContent, humpClassName); - - - } - /** * 一次性生成所有表的模块代码，同时解析plantUML的类图结合起来 * @param allMetaDataMap @@ -763,22 +479,15 @@ public class WriteAppModuleService { this.writeValueObject(valueObjectBeanList); this.writeEnum(enumBeanList); - - List apiEnumBeanList = (List)allMetaDataMap.get("apienum"); this.writeAPIEnum(apiEnumBeanList); - - - List msgClassBeanList = (List)allMetaDataMap.get("domainmsg"); this.writeMsgBody(msgClassBeanList); - List eventClassBeanList = (List)allMetaDataMap.get("domainevent"); this.writeDomainEvent(eventClassBeanList); - List gatawayBeanList = (List)allMetaDataMap.get("gataway"); List repositoryBeanList = (List)allMetaDataMap.get("repository"); gatawayBeanList.addAll(repositoryBeanList); @@ -790,8 +499,6 @@ public class WriteAppModuleService { List repositoryImplBeanList = (List)allMetaDataMap.get("repositoryimpl"); this.writeRepositoryImpl(repositoryImplBeanList); - - List aclBeanList = (List)allMetaDataMap.get("infrastacl"); List aclParamBeanList = (List)allMetaDataMap.get("infrastaclparam"); List aclImplBeanList = (List)allMetaDataMap.get("infrastaclimpl"); @@ -800,8 +507,6 @@ public class WriteAppModuleService { this.writeAclInterfaceParam(aclParamBeanList); this.writeAclInterfaceImpl(aclImplBeanList); - - List commandBeanList = (List)allMetaDataMap.get("cmd"); this.writeCommand(commandBeanList); @@ -810,7 +515,6 @@ public class WriteAppModuleService { this.writeAppExeImpl(exeBeanList); this.writeAppExeInterface(exeInterfaceBeanList); - List factoryBeanList = (List)allMetaDataMap.get("domainfactory"); this.writeFactory(factoryBeanList); @@ -826,11 +530,6 @@ public class WriteAppModuleService { List mqHandlerBeanList = (List)allMetaDataMap.get("mqhandler"); this.writeMqHandler(mqHandlerBeanList); - - - - - List voClassBeanList = (List)allMetaDataMap.get("adaptervo"); this.writeVO(voClassBeanList); @@ -856,31 +555,37 @@ public class WriteAppModuleService { List doboconvertBeanList = (List)allMetaDataMap.get("doboconvert"); this.writeDOBOConvert(doboconvertBeanList); + List dynamicMapperBeanList = (List)allMetaDataMap.get("dynamicmapper"); + this.writeDynamicMapper(dynamicMapperBeanList); + + List dynamicMapperXmlBeanList = (List)allMetaDataMap.get("dynamicmapperxml"); + this.writeDynamicMapperXml(dynamicMapperXmlBeanList); + Map tableBeanMap = (Map)allMetaDataMap.get("table"); Map> columnBeanListMap = (Map>)allMetaDataMap.get("columns"); Map varMap = new HashMap<>(); + + tableBeanMap.forEach((k,v)->{ varMap.put("table", v); varMap.put("columns", columnBeanListMap.get(k)); varMap.put("package", allMetaDataMap.get("package")); varMap.put("author", allMetaDataMap.get("author")); - String templateContent = freemarkerService.parseTpl(TemplateFileEnum.DATA_OBJECT.getTempFileName(),varMap); - this.writeDO(templateContent,v.getHumpClassName()); + varMap.put("packageInfrast", allMetaDataMap.get("packageInfrast")); + varMap.put("packageDomain", allMetaDataMap.get("packageDomain")); - templateContent = freemarkerService.parseTpl(TemplateFileEnum.MAPPER.getTempFileName(),varMap); - this.writeMapper(templateContent,v.getHumpClassName()); - - templateContent = freemarkerService.parseTpl(TemplateFileEnum.MAPPER_XML.getTempFileName(),varMap); - this.writeMapperXml(templateContent,v.getHumpClassName()); + String templateContent = freemarkerService.parseTpl(TemplateFileEnum.DATA_OBJECT.getTempFileName(),varMap); + writeCodeService.writeDO(templateContent,v.getHumpClassName()); templateContent = freemarkerService.parseTpl(TemplateFileEnum.TEST.getTempFileName(),varMap); - this.writeTest(templateContent,v.getHumpClassName()); + writeCodeService.writeTest(templateContent,v.getHumpClassName()); }); + //写公共服务类 this.writeCommon(varMap,""); //渲染e-r图 - this.writeERPicture(tableBeanMap,columnBeanListMap); + writeCodeService.writeERPicture(tableBeanMap,columnBeanListMap); } @@ -893,56 +598,34 @@ public class WriteAppModuleService { String baseControllerContent = freemarkerService.parseTpl(fast + TemplateFileEnum.BASE_CONTROLLER.getTempFileName(), varMap); - this.writeBaseController(baseControllerContent); + writeCodeService.writeBaseController(baseControllerContent); String SpringApplicationContextContent = freemarkerService.parseTpl(fast + TemplateFileEnum.SPRING_APPLICATION_CONTEXT.getTempFileName(), varMap); - this.writeSpringApplicationContext(SpringApplicationContextContent); + writeCodeService.writeSpringApplicationContext(SpringApplicationContextContent); String application = freemarkerService.parseTpl(fast + TemplateFileEnum.APPLICATION.getTempFileName(), varMap); - this.writeApplication(application); + writeCodeService.writeApplication(application); String facadeAop = freemarkerService.parseTpl(fast + TemplateFileEnum.FACADE_AOP.getTempFileName(), varMap); - this.writeFacadeAop(facadeAop); - } + writeCodeService.writeFacadeAop(facadeAop); - /** - * 整合e-r图生成工具 - * - * @param tableBeanMap - * @param columnBeanListMap - */ - public void writeERPicture(Map tableBeanMap, Map> columnBeanListMap) { - String filePath = appServiceConfig.getErPictureOutPath() + Constant.ER_PICTURE + "/" + appServiceConfig.getDbName() + ".puml"; - List tableBeanList = new ArrayList<>(); - tableBeanMap.forEach((k, v) -> { - com.coderman.codemaker.dbergenerate.bean.TableBean tableBean = new com.coderman.codemaker.dbergenerate.bean.TableBean(); - tableBean.setTableComment(v.getTableComment()); - tableBean.setTableName(v.getTableName()); - List columnBeanList = columnBeanListMap.get(k); - List columnBeanList1 = new ArrayList<>(); - columnBeanList.forEach(columnBean -> { - com.coderman.codemaker.dbergenerate.bean.ColumnBean columnBean1 = new com.coderman.codemaker.dbergenerate.bean.ColumnBean(); - columnBean1.setColumnComment(columnBean.getColumnComment()); - columnBean1.setColumnKey(columnBean.getColumnKey()); - columnBean1.setColumnName(columnBean.getColumnName()); - columnBean1.setTableName(columnBean.getTableName()); - columnBean1.setColumnType(columnBean.getColumnType()); - columnBean1.setDataType(columnBean.getDataType()); - columnBeanList1.add(columnBean1); - }); - tableBean.setColumnBeanList(columnBeanList1); - tableBeanList.add(tableBean); - }); - erPictureService.getErPicture(filePath, tableBeanList); + //动态ddd支持event模型 + if(varMap.containsKey("dynamicddd")){ + String appEventPublisherContent = freemarkerService.parseTpl(fast + TemplateFileEnum.APP_EVENT_PUBLISHER.getTempFileName(), varMap); + this.writeAppEventPublisher(appEventPublisherContent); + + String baseEventContent = freemarkerService.parseTpl(fast + TemplateFileEnum.BASE_EVENT.getTempFileName(), varMap); + this.writeBaseEvent(baseEventContent); + } } + /** * 写dynamicddd模块代码生成 * * @param dynamicDDDMap */ public void writeDynamicDDD(Map dynamicDDDMap) { - IWriteFileService writeFileService = appServiceConfig.getDynamicDDDWriteService(); if (writeFileService == null) { return; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/WriteDynamicDDDModuleService.java b/codemaker-core/src/main/java/com/coderman/codemaker/service/WriteDynamicDDDService.java similarity index 70% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/WriteDynamicDDDModuleService.java rename to codemaker-core/src/main/java/com/coderman/codemaker/service/WriteDynamicDDDService.java index 8a8cc0672b6c671e71ee7379aa1cc9635570d848..e78dfc6ec250fb249d57b8a6bac596e9f8eebf6e 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/WriteDynamicDDDModuleService.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/service/WriteDynamicDDDService.java @@ -1,10 +1,14 @@ package com.coderman.codemaker.service; +import com.coderman.codemaker.app.IWriteFileService; import com.coderman.codemaker.bean.WriteContentBean; import com.coderman.codemaker.bean.plantuml.ClassBean; import com.coderman.codemaker.bean.plantuml.EnumBean; import com.coderman.codemaker.bean.plantuml.InterfaceBean; +import com.coderman.codemaker.enums.DomainElementEnum; import com.coderman.codemaker.enums.TemplateFileEnum; +import com.coderman.codemaker.service.template.FreemarkerService; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -12,6 +16,7 @@ import org.springframework.stereotype.Service; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Optional; /** * Description: @@ -22,7 +27,7 @@ import java.util.Map; * @since JDK 1.8 */ @Service -public class WriteDynamicDDDModuleService { +public class WriteDynamicDDDService { @Autowired private FreemarkerService freemarkerService; @@ -31,12 +36,10 @@ public class WriteDynamicDDDModuleService { * @param dynamicDDDMap */ public void writeDynamicDDD(Map dynamicDDDMap, IWriteFileService writeFileService){ - //写bo List classBeanList = (List)dynamicDDDMap.get("domainbo"); writeBO(classBeanList,writeFileService,"ddd"); - //写valueobject List valueObjectBeanList = (List)dynamicDDDMap.get("domainvalueobject"); writeValueObject(valueObjectBeanList,writeFileService,"ddd"); @@ -68,7 +71,6 @@ public class WriteDynamicDDDModuleService { List infrastAclInterfaceList = (List)dynamicDDDMap.get("infrastacl"); writeAclInterface(infrastAclInterfaceList,writeFileService,"ddd"); - //写防腐层接口 List infrastAclInterfaceImplList = (List)dynamicDDDMap.get("infrastaclimpl"); writeAclInterfaceImpl(infrastAclInterfaceImplList,writeFileService,"ddd"); @@ -77,7 +79,6 @@ public class WriteDynamicDDDModuleService { List infrastAclParamClassList = (List)dynamicDDDMap.get("infrastaclparam"); writeACLParam(infrastAclParamClassList,writeFileService,"ddd"); - //写app层的命令服务 List appCommandClassList = (List)dynamicDDDMap.get("cmd"); writeAppCommand(appCommandClassList,writeFileService,"ddd"); @@ -89,10 +90,6 @@ public class WriteDynamicDDDModuleService { //写app.exeImpl List appExeClassImplList = (List)dynamicDDDMap.get("exeClass"); writeAppExeImpl(appExeClassImplList,writeFileService,"ddd"); - - - - } /** @@ -101,21 +98,15 @@ public class WriteDynamicDDDModuleService { * @param writeFileService */ public void writeBO(List classBeanList, IWriteFileService writeFileService,String dddTag){ - for (ClassBean classBean : classBeanList){ Map varMap = classBean.buildVarMap(); - String boContent; if (StringUtils.isNotEmpty(dddTag)){ boContent = freemarkerService.parseTplDynamicDDD(TemplateFileEnum.BUSINESS_OBJECT_DDD.getTempFileName(), varMap); }else { boContent = freemarkerService.parseTpl(TemplateFileEnum.BUSINESS_OBJECT_DDD.getTempFileName(), varMap); } - WriteContentBean writeContentBean = WriteContentBean.builder().content(boContent) - .templateName(TemplateFileEnum.BUSINESS_OBJECT_DDD.getTempFileName()) - .humpClassName(classBean.getClassName()) - .classPackageName(classBean.getPackageName()) - .build(); + WriteContentBean writeContentBean = classBean.buildWriteContentBean(boContent,TemplateFileEnum.BUSINESS_OBJECT_DDD); writeFileService.writeContent(writeContentBean); } } @@ -136,13 +127,7 @@ public class WriteDynamicDDDModuleService { }else { boContent = freemarkerService.parseTpl(TemplateFileEnum.MESSAGE_BODY.getTempFileName(), varMap); } - - - WriteContentBean writeContentBean = WriteContentBean.builder().content(boContent) - .templateName(TemplateFileEnum.MESSAGE_BODY.getTempFileName()) - .humpClassName(classBean.getClassName()) - .classPackageName(classBean.getPackageName()) - .build(); + WriteContentBean writeContentBean = classBean.buildWriteContentBean(boContent,TemplateFileEnum.MESSAGE_BODY); writeFileService.writeContent(writeContentBean); } } @@ -165,12 +150,7 @@ public class WriteDynamicDDDModuleService { }else { boContent = freemarkerService.parseTpl(TemplateFileEnum.EVENT_BODY.getTempFileName(), varMap); } - - WriteContentBean writeContentBean = WriteContentBean.builder().content(boContent) - .templateName(TemplateFileEnum.EVENT_BODY.getTempFileName()) - .humpClassName(classBean.getClassName()) - .classPackageName(classBean.getPackageName()) - .build(); + WriteContentBean writeContentBean = classBean.buildWriteContentBean(boContent,TemplateFileEnum.EVENT_BODY); writeFileService.writeContent(writeContentBean); } } @@ -182,16 +162,10 @@ public class WriteDynamicDDDModuleService { * @param writeFileService */ public void writeDTO(List classBeanList, IWriteFileService writeFileService){ - for (ClassBean classBean : classBeanList){ Map varMap = classBean.buildVarMap(); - String boContent = freemarkerService.parseTpl(TemplateFileEnum.DTO_DDD.getTempFileName(), varMap); - WriteContentBean writeContentBean = WriteContentBean.builder().content(boContent) - .templateName(TemplateFileEnum.DTO_DDD.getTempFileName()) - .humpClassName(classBean.getClassName()) - .classPackageName(classBean.getPackageName()) - .build(); + WriteContentBean writeContentBean = classBean.buildWriteContentBean(boContent,TemplateFileEnum.DTO_DDD); writeFileService.writeContent(writeContentBean); } } @@ -205,13 +179,8 @@ public class WriteDynamicDDDModuleService { for (ClassBean classBean : classBeanList){ Map varMap = classBean.buildVarMap(); - String boContent = freemarkerService.parseTpl(TemplateFileEnum.VO_DDD.getTempFileName(), varMap); - WriteContentBean writeContentBean = WriteContentBean.builder().content(boContent) - .templateName(TemplateFileEnum.VO_DDD.getTempFileName()) - .humpClassName(classBean.getClassName()) - .classPackageName(classBean.getPackageName()) - .build(); + WriteContentBean writeContentBean = classBean.buildWriteContentBean(boContent,TemplateFileEnum.VO_DDD); writeFileService.writeContent(writeContentBean); } } @@ -223,16 +192,10 @@ public class WriteDynamicDDDModuleService { * @param writeFileService */ public void writeController(List classBeanList, IWriteFileService writeFileService){ - for (ClassBean classBean : classBeanList){ Map varMap = classBean.buildVarMap(); - String boContent = freemarkerService.parseTpl(TemplateFileEnum.CONTROLLER_DDD.getTempFileName(), varMap); - WriteContentBean writeContentBean = WriteContentBean.builder().content(boContent) - .templateName(TemplateFileEnum.CONTROLLER_DDD.getTempFileName()) - .humpClassName(classBean.getClassName()) - .classPackageName(classBean.getPackageName()) - .build(); + WriteContentBean writeContentBean = classBean.buildWriteContentBean(boContent,TemplateFileEnum.CONTROLLER_DDD); writeFileService.writeContent(writeContentBean); } } @@ -244,16 +207,10 @@ public class WriteDynamicDDDModuleService { * @param writeFileService */ public void writeFacadeImpl(List classBeanList, IWriteFileService writeFileService){ - for (ClassBean classBean : classBeanList){ Map varMap = classBean.buildVarMap(); - String boContent = freemarkerService.parseTpl(TemplateFileEnum.FACADE_IMPL_DDD.getTempFileName(), varMap); - WriteContentBean writeContentBean = WriteContentBean.builder().content(boContent) - .templateName(TemplateFileEnum.FACADE_IMPL.getTempFileName()) - .humpClassName(classBean.getClassName()) - .classPackageName(classBean.getPackageName()) - .build(); + WriteContentBean writeContentBean = classBean.buildWriteContentBean(boContent,TemplateFileEnum.FACADE_IMPL); writeFileService.writeContent(writeContentBean); } } @@ -264,16 +221,10 @@ public class WriteDynamicDDDModuleService { * @param writeFileService */ public void writeFacade(List classBeanList, IWriteFileService writeFileService){ - for (InterfaceBean interfaceBean : classBeanList){ Map varMap = interfaceBean.buildVarMap(); - String boContent = freemarkerService.parseTpl(TemplateFileEnum.FACADE_DDD.getTempFileName(), varMap); - WriteContentBean writeContentBean = WriteContentBean.builder().content(boContent) - .templateName(TemplateFileEnum.FACADE.getTempFileName()) - .humpClassName(interfaceBean.getClassName()) - .classPackageName(interfaceBean.getPackageName()) - .build(); + WriteContentBean writeContentBean = interfaceBean.buildWriteContentBean(boContent,TemplateFileEnum.FACADE); writeFileService.writeContent(writeContentBean); } } @@ -285,22 +236,15 @@ public class WriteDynamicDDDModuleService { * @param writeFileService */ public void writeValueObject(List classBeanList, IWriteFileService writeFileService,String dddTag){ - for (ClassBean classBean : classBeanList){ Map varMap = classBean.buildVarMap(); - String boContent; if(StringUtils.isNotEmpty(dddTag)){ boContent = freemarkerService.parseTplDynamicDDD(TemplateFileEnum.VALUE_OBJECT.getTempFileName(), varMap); - }else { boContent = freemarkerService.parseTpl(TemplateFileEnum.VALUE_OBJECT.getTempFileName(), varMap); } - WriteContentBean writeContentBean = WriteContentBean.builder().content(boContent) - .templateName(TemplateFileEnum.VALUE_OBJECT.getTempFileName()) - .humpClassName(classBean.getClassName()) - .classPackageName(classBean.getPackageName()) - .build(); + WriteContentBean writeContentBean = classBean.buildWriteContentBean(boContent,TemplateFileEnum.VALUE_OBJECT); writeFileService.writeContent(writeContentBean); } } @@ -313,27 +257,18 @@ public class WriteDynamicDDDModuleService { private void writeInterfaceAndImpl(List repositoryInterfaceBeanList, IWriteFileService writeFileService,String dddTag){ for (InterfaceBean interfaceBean : repositoryInterfaceBeanList){ Map varMap = interfaceBean.buildVarMap(); - String interfaceContent; if (StringUtils.isNotEmpty(dddTag)){ interfaceContent = freemarkerService.parseTplDynamicDDD(TemplateFileEnum.GATAWAY.getTempFileName(), varMap); }else { interfaceContent = freemarkerService.parseTpl(TemplateFileEnum.GATAWAY.getTempFileName(), varMap); } - WriteContentBean writeContentBean = WriteContentBean.builder().content(interfaceContent) - .templateName(TemplateFileEnum.GATAWAY.getTempFileName()) - .humpClassName(interfaceBean.getClassName()) - .classPackageName(interfaceBean.getPackageName()) - .build(); + WriteContentBean writeContentBean = interfaceBean.buildWriteContentBean(interfaceContent,TemplateFileEnum.GATAWAY); writeFileService.writeContent(writeContentBean); //写接口实现 String interfaceImplContent = freemarkerService.parseTplDynamicDDD(TemplateFileEnum.GATAWAY_IMPL.getTempFileName(), varMap); - WriteContentBean writeContentBean2 = WriteContentBean.builder().content(interfaceImplContent) - .templateName(TemplateFileEnum.GATAWAY_IMPL.getTempFileName()) - .humpClassName(interfaceBean.getClassName()) - .classPackageName(interfaceBean.getPackageName()) - .build(); + WriteContentBean writeContentBean2 = interfaceBean.buildWriteContentBean(interfaceImplContent,TemplateFileEnum.GATAWAY_IMPL); writeFileService.writeContent(writeContentBean2); } } @@ -346,17 +281,49 @@ public class WriteDynamicDDDModuleService { public void writeGataWay(List gataWayBeanList, IWriteFileService writeFileService,String dddTag) { for (InterfaceBean interfaceBean : gataWayBeanList) { Map varMap = interfaceBean.buildVarMap(); - String interfaceContent = freemarkerService.parseTpl(TemplateFileEnum.GATAWAY.getTempFileName(), varMap); - WriteContentBean writeContentBean = WriteContentBean.builder().content(interfaceContent) - .templateName(TemplateFileEnum.GATAWAY.getTempFileName()) - .humpClassName(interfaceBean.getClassName()) - .classPackageName(interfaceBean.getPackageName()) - .build(); + WriteContentBean writeContentBean = interfaceBean.buildWriteContentBean(interfaceContent,TemplateFileEnum.GATAWAY); + writeFileService.writeContent(writeContentBean); + } + } + + /** + * 写dynamicmapper + * @param dynamicMapperBeanList + * @param writeFileService + */ + public void writeDynamicMapper(List dynamicMapperBeanList, IWriteFileService writeFileService,String dddTag) { + for (InterfaceBean interfaceBean : dynamicMapperBeanList) { + Map varMap = interfaceBean.buildVarMap(); + String interfaceContent = freemarkerService.parseTpl(TemplateFileEnum.MAPPER_DDD.getTempFileName(), varMap); + WriteContentBean writeContentBean = interfaceBean.buildWriteContentBean(interfaceContent,TemplateFileEnum.MAPPER_DDD); + writeFileService.writeContent(writeContentBean); + } + } + + + /** + * 写dynamicmapperxml + * @param dynamicMapperXmlBeanList + * @param writeFileService + */ + public void writeDynamicMapperXml(List dynamicMapperXmlBeanList, IWriteFileService writeFileService,String dddTag) { + for (ClassBean classBean : dynamicMapperXmlBeanList) { + Map varMap = classBean.buildVarMap(); + if(CollectionUtils.isNotEmpty(classBean.getImportClassList())){ + Optional doPackageName = classBean.getImportClassList().stream().filter(importClassName -> importClassName.toLowerCase().endsWith(TemplateFileEnum.DATA_OBJECT.getTempFileName())).findFirst(); + if(doPackageName.isPresent()){ + varMap.put("doPackageName",doPackageName.get()); + } + } + + String interfaceContent = freemarkerService.parseTpl(TemplateFileEnum.MAPPER_XML_DDD.getTempFileName(), varMap); + WriteContentBean writeContentBean = classBean.buildWriteContentBean(interfaceContent,TemplateFileEnum.MAPPER_XML_DDD); writeFileService.writeContent(writeContentBean); } } + /** * 写gataway实现 * @param gatawayImplInterfaceBeanList @@ -367,14 +334,8 @@ public class WriteDynamicDDDModuleService { Map varMap = classBean.buildVarMap(); //写接口实现 String interfaceImplContent = freemarkerService.parseTpl(TemplateFileEnum.GATAWAY_IMPL.getTempFileName(), varMap); - WriteContentBean writeContentBean2 = WriteContentBean.builder().content(interfaceImplContent) - .templateName(TemplateFileEnum.GATAWAY_IMPL.getTempFileName()) - .humpClassName(classBean.getClassName()) - .classPackageName(classBean.getPackageName()) - .build(); - - - writeFileService.writeContent(writeContentBean2); + WriteContentBean writeContentBean = classBean.buildWriteContentBean(interfaceImplContent,TemplateFileEnum.GATAWAY_IMPL); + writeFileService.writeContent(writeContentBean); } } @@ -388,13 +349,8 @@ public class WriteDynamicDDDModuleService { Map varMap = classBean.buildVarMap(); //写接口实现 String interfaceImplContent = freemarkerService.parseTpl(TemplateFileEnum.GATAWAY_IMPL.getTempFileName(), varMap); - WriteContentBean writeContentBean2 = WriteContentBean.builder().content(interfaceImplContent) - .templateName(TemplateFileEnum.REPOSITORY_IMPL.getTempFileName()) - .humpClassName(classBean.getClassName()) - .classPackageName(classBean.getPackageName()) - .build(); - - writeFileService.writeContent(writeContentBean2); + WriteContentBean writeContentBean = classBean.buildWriteContentBean(interfaceImplContent,TemplateFileEnum.REPOSITORY_IMPL); + writeFileService.writeContent(writeContentBean); } } @@ -414,11 +370,7 @@ public class WriteDynamicDDDModuleService { }else { enumContent = freemarkerService.parseTpl(TemplateFileEnum.ENUM.getTempFileName(), varMap); } - WriteContentBean writeContentBean = WriteContentBean.builder().content(enumContent) - .templateName(TemplateFileEnum.ENUM.getTempFileName()) - .humpClassName(enumBean.getClassName()) - .classPackageName(enumBean.getPackageName()) - .build(); + WriteContentBean writeContentBean = enumBean.buildWriteContentBean(enumContent,TemplateFileEnum.ENUM); writeFileService.writeContent(writeContentBean); } } @@ -438,12 +390,7 @@ public class WriteDynamicDDDModuleService { }else { boContent = freemarkerService.parseTpl(TemplateFileEnum.FACTORY.getTempFileName(), varMap); } - - WriteContentBean writeContentBean = WriteContentBean.builder().content(boContent) - .templateName(TemplateFileEnum.FACTORY.getTempFileName()) - .humpClassName(classBean.getClassName()) - .classPackageName(classBean.getPackageName()) - .build(); + WriteContentBean writeContentBean = classBean.buildWriteContentBean(boContent,TemplateFileEnum.FACTORY); writeFileService.writeContent(writeContentBean); } } @@ -458,19 +405,13 @@ public class WriteDynamicDDDModuleService { //写app.listener for (ClassBean classBean : appListenerBeanList){ Map varMap = classBean.buildVarMap(); - String boContent; if(StringUtils.isNotEmpty(dddTag)){ boContent = freemarkerService.parseTplDynamicDDD(TemplateFileEnum.MQ_LISTENER.getTempFileName(), varMap); }else { boContent = freemarkerService.parseTpl(TemplateFileEnum.MQ_LISTENER.getTempFileName(), varMap); } - - WriteContentBean writeContentBean = WriteContentBean.builder().content(boContent) - .templateName(TemplateFileEnum.MQ_LISTENER.getTempFileName()) - .humpClassName(classBean.getClassName()) - .classPackageName(classBean.getPackageName()) - .build(); + WriteContentBean writeContentBean = classBean.buildWriteContentBean(boContent,TemplateFileEnum.MQ_LISTENER); writeFileService.writeContent(writeContentBean); } } @@ -485,19 +426,13 @@ public class WriteDynamicDDDModuleService { //写infrast.mq.producer for (ClassBean classBean : appListenerBeanList){ Map varMap = classBean.buildVarMap(); - String boContent; if(StringUtils.isNotEmpty(dddTag)){ boContent = freemarkerService.parseTplDynamicDDD(TemplateFileEnum.MQ_PRODUCER.getTempFileName(), varMap); }else { boContent = freemarkerService.parseTpl(TemplateFileEnum.MQ_PRODUCER.getTempFileName(), varMap); } - - WriteContentBean writeContentBean = WriteContentBean.builder().content(boContent) - .templateName(TemplateFileEnum.MQ_PRODUCER.getTempFileName()) - .humpClassName(classBean.getClassName()) - .classPackageName(classBean.getPackageName()) - .build(); + WriteContentBean writeContentBean = classBean.buildWriteContentBean(boContent,TemplateFileEnum.MQ_PRODUCER); writeFileService.writeContent(writeContentBean); } } @@ -511,19 +446,13 @@ public class WriteDynamicDDDModuleService { //写infrast.mq.consumer for (ClassBean classBean : appListenerBeanList){ Map varMap = classBean.buildVarMap(); - String boContent; if(StringUtils.isNotEmpty(dddTag)){ boContent = freemarkerService.parseTplDynamicDDD(TemplateFileEnum.MQ_CONSUMER.getTempFileName(), varMap); }else { boContent = freemarkerService.parseTpl(TemplateFileEnum.MQ_CONSUMER.getTempFileName(), varMap); } - - WriteContentBean writeContentBean = WriteContentBean.builder().content(boContent) - .templateName(TemplateFileEnum.MQ_CONSUMER.getTempFileName()) - .humpClassName(classBean.getClassName()) - .classPackageName(classBean.getPackageName()) - .build(); + WriteContentBean writeContentBean = classBean.buildWriteContentBean(boContent,TemplateFileEnum.MQ_CONSUMER); writeFileService.writeContent(writeContentBean); } } @@ -543,12 +472,7 @@ public class WriteDynamicDDDModuleService { }else { boContent = freemarkerService.parseTpl(TemplateFileEnum.MQ_HANDLER.getTempFileName(), varMap); } - - WriteContentBean writeContentBean = WriteContentBean.builder().content(boContent) - .templateName(TemplateFileEnum.MQ_HANDLER.getTempFileName()) - .humpClassName(classBean.getClassName()) - .classPackageName(classBean.getPackageName()) - .build(); + WriteContentBean writeContentBean = classBean.buildWriteContentBean(boContent,TemplateFileEnum.MQ_HANDLER); writeFileService.writeContent(writeContentBean); } } @@ -569,12 +493,7 @@ public class WriteDynamicDDDModuleService { }else { interfaceContent = freemarkerService.parseTpl(TemplateFileEnum.ACL.getTempFileName(), varMap); } - - WriteContentBean writeContentBean = WriteContentBean.builder().content(interfaceContent) - .templateName(TemplateFileEnum.ACL.getTempFileName()) - .humpClassName(interfaceBean.getClassName()) - .classPackageName(interfaceBean.getPackageName()) - .build(); + WriteContentBean writeContentBean = interfaceBean.buildWriteContentBean(interfaceContent,TemplateFileEnum.ACL); writeFileService.writeContent(writeContentBean); } } @@ -594,13 +513,8 @@ public class WriteDynamicDDDModuleService { }else { interfaceImplContent = freemarkerService.parseTpl(TemplateFileEnum.GATAWAY_IMPL.getTempFileName(), varMap); } - WriteContentBean writeImplBean = WriteContentBean.builder() - .content(interfaceImplContent) - .templateName(TemplateFileEnum.ACL_IMPL.getTempFileName()) - .humpClassName(classBean.getClassName()) - .classPackageName(classBean.getPackageName()) - .build(); - writeFileService.writeContent(writeImplBean); + WriteContentBean writeContentBean = classBean.buildWriteContentBean(interfaceImplContent,TemplateFileEnum.ACL_IMPL); + writeFileService.writeContent(writeContentBean); } } @@ -621,12 +535,7 @@ public class WriteDynamicDDDModuleService { }else { boContent = freemarkerService.parseTpl(TemplateFileEnum.BUSINESS_OBJECT_DDD.getTempFileName(), varMap); } - WriteContentBean writeContentBean = WriteContentBean.builder() - .content(boContent) - .templateName(TemplateFileEnum.ACL_PARAM.getTempFileName()) - .humpClassName(classBean.getClassName()) - .classPackageName(classBean.getPackageName()) - .build(); + WriteContentBean writeContentBean = classBean.buildWriteContentBean(boContent,TemplateFileEnum.ACL_PARAM); writeFileService.writeContent(writeContentBean); } } @@ -638,7 +547,6 @@ public class WriteDynamicDDDModuleService { * @param writeFileService */ public void writeAppCommand(List classBeanList, IWriteFileService writeFileService,String dddTag){ - for (ClassBean classBean : classBeanList){ Map varMap = classBean.buildVarMap(); //使用BO的模板 @@ -648,13 +556,7 @@ public class WriteDynamicDDDModuleService { }else { boContent = freemarkerService.parseTpl(TemplateFileEnum.BUSINESS_OBJECT_DDD.getTempFileName(), varMap); } - - WriteContentBean writeContentBean = WriteContentBean.builder() - .content(boContent) - .templateName(TemplateFileEnum.CMD.getTempFileName()) - .humpClassName(classBean.getClassName()) - .classPackageName(classBean.getPackageName()) - .build(); + WriteContentBean writeContentBean = classBean.buildWriteContentBean(boContent,TemplateFileEnum.CMD); writeFileService.writeContent(writeContentBean); } } @@ -665,7 +567,6 @@ public class WriteDynamicDDDModuleService { * @param writeFileService */ public void writeAppExeImpl(List classBeanList, IWriteFileService writeFileService,String dddTag){ - for (ClassBean classBean : classBeanList){ Map varMap = classBean.buildVarMap(); String boContent; @@ -680,13 +581,7 @@ public class WriteDynamicDDDModuleService { boContent = freemarkerService.parseTpl(TemplateFileEnum.EXE_ABSTRACT.getTempFileName(), varMap); } } - - WriteContentBean writeContentBean = WriteContentBean.builder() - .content(boContent) - .templateName(TemplateFileEnum.EXE.getTempFileName()) - .humpClassName(classBean.getClassName()) - .classPackageName(classBean.getPackageName()) - .build(); + WriteContentBean writeContentBean = classBean.buildWriteContentBean(boContent,TemplateFileEnum.EXE); writeFileService.writeContent(writeContentBean); } } @@ -706,14 +601,8 @@ public class WriteDynamicDDDModuleService { }else { interfaceContent = freemarkerService.parseTpl(TemplateFileEnum.GATAWAY.getTempFileName(), varMap); } - - WriteContentBean writeContentBean = WriteContentBean.builder().content(interfaceContent) - .templateName(TemplateFileEnum.EXE.getTempFileName()) - .humpClassName(interfaceBean.getClassName()) - .classPackageName(interfaceBean.getPackageName()) - .build(); + WriteContentBean writeContentBean = interfaceBean.buildWriteContentBean(interfaceContent,TemplateFileEnum.EXE); writeFileService.writeContent(writeContentBean); - } } @@ -727,13 +616,8 @@ public class WriteDynamicDDDModuleService { for (InterfaceBean interfaceBean : interfaceBeanList){ Map varMap = interfaceBean.buildVarMap(); String interfaceContent = freemarkerService.parseTpl(TemplateFileEnum.CONVERT.getTempFileName(), varMap); - WriteContentBean writeContentBean = WriteContentBean.builder().content(interfaceContent) - .templateName(TemplateFileEnum.CONVERT.getTempFileName()) - .humpClassName(interfaceBean.getClassName()) - .classPackageName(interfaceBean.getPackageName()) - .build(); + WriteContentBean writeContentBean = interfaceBean.buildWriteContentBean(interfaceContent,TemplateFileEnum.CONVERT); writeFileService.writeContent(writeContentBean); - } } @@ -746,17 +630,11 @@ public class WriteDynamicDDDModuleService { for (InterfaceBean interfaceBean : interfaceBeanList){ Map varMap = interfaceBean.buildVarMap(); String interfaceContent = freemarkerService.parseTpl(TemplateFileEnum.CONVERT.getTempFileName(), varMap); - WriteContentBean writeContentBean = WriteContentBean.builder().content(interfaceContent) - .templateName(TemplateFileEnum.CONVERT.getTempFileName()) - .humpClassName(interfaceBean.getClassName()) - .classPackageName(interfaceBean.getPackageName()) - .build(); + WriteContentBean writeContentBean = interfaceBean.buildWriteContentBean(interfaceContent,TemplateFileEnum.CONVERT); writeFileService.writeContent(writeContentBean); - } } - /** * 写dobo-convert 接口 * @param interfaceBeanList @@ -766,14 +644,8 @@ public class WriteDynamicDDDModuleService { for (InterfaceBean interfaceBean : interfaceBeanList){ Map varMap = interfaceBean.buildVarMap(); String interfaceContent = freemarkerService.parseTpl(TemplateFileEnum.CONVERT.getTempFileName(), varMap); - WriteContentBean writeContentBean = WriteContentBean.builder().content(interfaceContent) - .templateName(TemplateFileEnum.CONVERT.getTempFileName()) - .humpClassName(interfaceBean.getClassName()) - .classPackageName(interfaceBean.getPackageName()) - .build(); + WriteContentBean writeContentBean = interfaceBean.buildWriteContentBean(interfaceContent,TemplateFileEnum.CONVERT); writeFileService.writeContent(writeContentBean); - } } - } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/adapter/DefaultClazzWrapperImpl.java b/codemaker-core/src/main/java/com/coderman/codemaker/service/adapter/DefaultClazzWrapperImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..3d53d9ba2b51a2b531661a398527e79b143d6e8a --- /dev/null +++ b/codemaker-core/src/main/java/com/coderman/codemaker/service/adapter/DefaultClazzWrapperImpl.java @@ -0,0 +1,33 @@ +package com.coderman.codemaker.service.adapter; + +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.Map; + +/** + * Description:codeMaker的默认实现 + * date: 2021/10/26 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +@Service(value = "defaultClazzWrapperImpl") +public class DefaultClazzWrapperImpl implements IClazzAdapter{ + + @Override + public Map getClazzWrapper() { + return getMethodReturnClass(); + } + + private Map getMethodReturnClass(){ + Map methodReturnClassMap = new HashMap<>(); + methodReturnClassMap.put("ResultDto","com.coderman.utils.response.ResultDto"); + methodReturnClassMap.put("ResultDataDto","com.coderman.utils.response.ResultDataDto"); + methodReturnClassMap.put("PageDTO","com.coderman.utils.response.PageDTO"); + methodReturnClassMap.put("PageVO","com.coderman.utils.response.PageVO"); + return methodReturnClassMap; + } + +} diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/adapter/IClazzAdapter.java b/codemaker-core/src/main/java/com/coderman/codemaker/service/adapter/IClazzAdapter.java new file mode 100644 index 0000000000000000000000000000000000000000..73e6460cefcb21b5012fb1691658a4e03f138a9e --- /dev/null +++ b/codemaker-core/src/main/java/com/coderman/codemaker/service/adapter/IClazzAdapter.java @@ -0,0 +1,21 @@ +package com.coderman.codemaker.service.adapter; + +import java.util.Map; + +/** + * Description:类适配层 + * 解除对coderman-utils工具包的强依赖关系 + * date: 2021/10/26 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +public interface IClazzAdapter { + /** + * 提供对facade,controller的方法内容返回包装类的相关信息 + * 如resultDataDto,ResultDto,PageVO,PageDTO等 + * @return + */ + Map getClazzWrapper(); +} diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/adapter/PackgeConstants.java b/codemaker-core/src/main/java/com/coderman/codemaker/service/adapter/PackgeConstants.java new file mode 100644 index 0000000000000000000000000000000000000000..3e8432486529abcab16d0371537967697356c381 --- /dev/null +++ b/codemaker-core/src/main/java/com/coderman/codemaker/service/adapter/PackgeConstants.java @@ -0,0 +1,34 @@ +package com.coderman.codemaker.service.adapter; + + +import java.util.HashMap; +import java.util.Map; + +/** + * Description: + * date: 2021/10/26 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +public class PackgeConstants { + private static Map defaultPackageMap = new HashMap<>(); + /** + * 初始化默认可能需要导入的包 + */ + static { + defaultPackageMap.put("List","java.util.List"); + defaultPackageMap.put("Map","java.util.Map"); + defaultPackageMap.put("HashMap","java.util.HashMap"); + defaultPackageMap.put("BigDecimal","java.math.BigDecimal"); + defaultPackageMap.put("Date","java.util.Date"); + defaultPackageMap.put("ArrayList","java.util.ArrayList"); + defaultPackageMap.put("Set","java.util.Set"); + defaultPackageMap.put("HashSet","java.util.HashSet"); + } + + public static Map getDefaultPackageMap(){ + return defaultPackageMap; + } +} diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/DBErPictureService.java b/codemaker-core/src/main/java/com/coderman/codemaker/service/dberpicture/DBErPictureService.java similarity index 89% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/DBErPictureService.java rename to codemaker-core/src/main/java/com/coderman/codemaker/service/dberpicture/DBErPictureService.java index 222df01b2b0a177126459178fe2753f6fbed3f8f..ed7ea44d4c035f5714784a17bfafebe0be677a39 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/DBErPictureService.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/service/dberpicture/DBErPictureService.java @@ -1,4 +1,4 @@ -package com.coderman.codemaker.service; +package com.coderman.codemaker.service.dberpicture; import com.coderman.codemaker.dbergenerate.bean.TableBean; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/DBErPictureServiceImpl.java b/codemaker-core/src/main/java/com/coderman/codemaker/service/dberpicture/DBErPictureServiceImpl.java similarity index 93% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/DBErPictureServiceImpl.java rename to codemaker-core/src/main/java/com/coderman/codemaker/service/dberpicture/DBErPictureServiceImpl.java index bfb84f632f109da4b47a101c405aaf4d811feb51..6ab3f48bd02cc1e561a15b061e4600c0556361bc 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/DBErPictureServiceImpl.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/service/dberpicture/DBErPictureServiceImpl.java @@ -1,4 +1,4 @@ -package com.coderman.codemaker.service; +package com.coderman.codemaker.service.dberpicture; import com.coderman.codemaker.dbergenerate.bean.TableBean; import com.coderman.codemaker.dbergenerate.service.ErPictureService; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/ConvertInvokeHandler.java b/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/ConvertInvokeHandler.java deleted file mode 100644 index de8a7423fd22c03653a7d4bb855997fa5240b6a1..0000000000000000000000000000000000000000 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/ConvertInvokeHandler.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.coderman.codemaker.service.invoker; - -import com.coderman.codemaker.bean.plantuml.ClassBean; -import com.coderman.codemaker.bean.plantuml.InterfaceBean; -import com.coderman.codemaker.bean.invoke.InvokeContextBean; -import com.coderman.codemaker.bean.plantuml.MethodBean; -import com.coderman.codemaker.enums.dynamic.ReadWriteTypeEnum; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.stream.Collectors; - -/** - * Description: - * date: 2021/10/21 - * - * @author fanchunshuai - * @version 1.0.0 - * @since JDK 1.8 - */ -@Service -public class ConvertInvokeHandler { - - /** - * 获取bovoconvert 接口类 - * @param invokeBean - * @return - */ - public InterfaceBean getBOVOConvert(InvokeContextBean invokeBean){ - String returnClassType = invokeBean.getMethodBean().buildReturnClassType(); - ClassBean classBean = invokeBean.getPlantUmlContextBean().getClassBeanMap().get(returnClassType); - if(classBean == null){ - classBean = invokeBean.getPlantUmlContextBean().getDerivedPlantUmlContextBean().getClassBeanMap().get(returnClassType); - } - if(classBean == null){ - return null; - } - return invokeBean.getPlantUmlContextBean().getDerivedPlantUmlContextBean() - .getInterfaceBeanMap() - .get(classBean.getBovoConvertInterface()); - } - - /** - * 从转换接口中过滤符合转换条件参数的转换方法 - * @param convertInterfaceBean - * @param invokeBean - * @param methodTag - * @return - */ - public MethodBean getConvertMethod(InterfaceBean convertInterfaceBean, InvokeContextBean invokeBean,String methodTag){ - List methodBeanList = convertInterfaceBean.getMethodBeanList().stream().filter(methodBean -> methodBean.getMethodName().toLowerCase().startsWith(methodTag)).collect(Collectors.toList()); - if(invokeBean.getMethodRWType().equals(ReadWriteTypeEnum.READ.getCode()) && CollectionUtils.isNotEmpty(methodBeanList)){ - return methodBeanList.get(0); - } - String [] invokerParamArr = invokeBean.getMethodBean().getParamArr(); - - for (MethodBean methodBean : methodBeanList){ - String [] providerConvertParamArr = methodBean.getParamArr(); - for (int i = 0;i < providerConvertParamArr.length;i ++ ){ - for (int j = 0;j< invokerParamArr.length;j ++){ - String providerConvertParamType = providerConvertParamArr[i].trim().split(" ")[0]; - String invokerParamType = invokerParamArr[j].trim().split(" ")[0]; - if(invokerParamType.equals(providerConvertParamType)){ - return methodBean; - } - } - } - } - return null; - } - - - /** - * 从转换接口中过滤符合转换条件参数的转换方法 - * @param convertInterfaceBean - * @param invokerMethodBean - * @param methodTag - * @return - */ - public MethodBean getBO2VOConvertMethod(InterfaceBean convertInterfaceBean, MethodBean invokerMethodBean,String methodTag){ - List methodBeanList = convertInterfaceBean.getMethodBeanList().stream().filter(methodBean -> methodBean.getMethodName().toLowerCase().startsWith(methodTag)).collect(Collectors.toList()); - if(CollectionUtils.isNotEmpty(methodBeanList)){ - return methodBeanList.get(0); - } - return null; - } - /** - * 从调用方的方法名称中扣出BO类 className - * 并且找到bodoConvert类 - * @param invokeBean - * @return - */ - public InterfaceBean getBODOConvertInterfaceBean(InvokeContextBean invokeBean){ - String paramContent = invokeBean.getMethodBean().getMethodName().split("\\(")[1].replace(")",""); - String [] paramArr = paramContent.split(","); - for (String param : paramArr){ - String [] arr = param.trim().split(" "); - if(!arr[0].toLowerCase().endsWith("bo")){ - continue; - } - ClassBean boClassBeanElement = invokeBean.getPlantUmlContextBean().getClassBeanMap().get(arr[0]); - if(StringUtils.isEmpty(boClassBeanElement.getBodoConvertInterface())){ - continue; - } - return invokeBean.getPlantUmlContextBean().getDerivedPlantUmlContextBean().getInterfaceBeanMap().get(boClassBeanElement.getBodoConvertInterface()); - } - return null; - } - - -} diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/ConvertInvokeService.java b/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/ConvertInvokeService.java new file mode 100644 index 0000000000000000000000000000000000000000..df36e86278438c6c08a1be66ed279cb1edd39e16 --- /dev/null +++ b/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/ConvertInvokeService.java @@ -0,0 +1,329 @@ +package com.coderman.codemaker.service.invoker; + +import com.coderman.codemaker.bean.invoke.InvokeRowBean; +import com.coderman.codemaker.bean.plantuml.ClassBean; +import com.coderman.codemaker.bean.plantuml.InterfaceBean; +import com.coderman.codemaker.bean.invoke.InvokeContextBean; +import com.coderman.codemaker.bean.plantuml.MethodBean; +import com.coderman.codemaker.enums.TemplateFileEnum; +import com.coderman.codemaker.enums.dynamic.MethodReturnClassTypeEnum; +import com.coderman.codemaker.enums.dynamic.ReadWriteTypeEnum; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.concurrent.atomic.AtomicReference; +import java.util.stream.Collectors; + +/** + * Description:bo,vo,dto之间的转换调用处理器 + * date: 2021/10/21 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +@Service +public class ConvertInvokeService { + + /** + * 获取bovoconvert 接口类 + * @param invokeBean + * @return + */ + public InterfaceBean getBOVOConvert(InvokeContextBean invokeBean){ + //根据调用方的返回值进行查找---适用于读场景和写场景返回具体vo,dto的情况 + String returnClassStr = invokeBean.getInvokerMethodBean().getReturnClass(); + String [] returnClassArr = returnClassStr.split("<"); + ClassBean classBean = null; + for (String returnClass : returnClassArr){ + String classStr = returnClass.replace(">",""); + classBean = invokeBean.getPlantUmlContextBean().getClassBeanMap().get(classStr); + if(classBean == null){ + classBean = invokeBean.getPlantUmlContextBean().getDerivedPlantUmlContextBean().getClassBeanMap().get(classStr); + } + if(classBean != null){ + break; + } + } + + //根据调用方的参数进行查找---适用于写场景的入参是具体vo,dto的情况,还有读场景是具体查询xxvo,xxdto的情况 + if(classBean == null){ + String [] paramArr = invokeBean.getInvokerMethodBean().getParamArr(); + if(paramArr == null || paramArr.length == 0){ + return null; + } + for (String param : paramArr){ + String classStr = param; + if(classStr.contains(" ")){ + classStr = classStr.split(" ")[0]; + } + if(classStr.contains("<")){ + classStr = classStr.split("<")[1].replace(">",""); + } + classBean = invokeBean.getPlantUmlContextBean().getClassBeanMap().get(classStr); + if(classBean == null){ + classBean = invokeBean.getPlantUmlContextBean().getDerivedPlantUmlContextBean().getClassBeanMap().get(classStr); + } + } + } + + if(classBean == null){ + return null; + } + + return invokeBean.getPlantUmlContextBean().getDerivedPlantUmlContextBean() + .getInterfaceBeanMap() + .get(classBean.getBovoConvertInterface()); + } + + /** + * 从转换接口中过滤符合转换条件参数的转换方法 + * @param convertInterfaceBean + * @param invokeBean + * @return + */ + public MethodBean getDTO2BOConvertMethod(InterfaceBean convertInterfaceBean, InvokeContextBean invokeBean){ + //写场景根据调用方的方法参数寻找合适的转换方法 + String [] paramArr = invokeBean.getInvokerMethodBean().getParamArr(); + + AtomicReference methodBean = new AtomicReference<>(); + + convertInterfaceBean.getMethodBeanList().stream().forEach(convertMethod -> { + for (String param : paramArr){ + if(convertMethod.paramMatchOne(param)){ + methodBean.set(convertMethod); + } + } + }); + return methodBean.get(); + } + + + /** + * 从转换接口中过滤符合转换条件参数的转换方法 + * @param convertInterfaceBean + * @param invokeBean + * @return + */ + public MethodBean getConvertMethod(InterfaceBean convertInterfaceBean, InvokeContextBean invokeBean){ + //读场景根据调用方的返回值寻找合适的转换方法 + String returnClass = invokeBean.getInvokerMethodBean().getReturnClass(); + boolean isList = false; + if(returnClass.toLowerCase().contains("page") || returnClass.toLowerCase().contains("list")){ + isList = true; + } + + String returnClassModelType = invokeBean.getInvokerMethodBean().getReturnClassTypeModel(); + AtomicReference methodBean = new AtomicReference<>(); + boolean finalIsList = isList; + convertInterfaceBean.getMethodBeanList().stream().forEach(convertMethod -> { + if(finalIsList && convertMethod.getReturnClass().trim().toLowerCase().contains("list") && convertMethod.getReturnClass().trim().toLowerCase().contains(returnClassModelType.toLowerCase())) { + methodBean.set(convertMethod); + } + if(!finalIsList && convertMethod.getReturnClass().toLowerCase().equals(returnClassModelType.toLowerCase())) { + methodBean.set(convertMethod); + } + }); + + return methodBean.get(); + } + + + + /** + * 从转换接口中过滤符合转换条件参数的转换方法 + * @param convertInterfaceBean + * @param invokerMethodBean + * @return + */ + public MethodBean getVO2BOConvertMethod(InterfaceBean convertInterfaceBean, MethodBean invokerMethodBean){ + //写场景根据调用方的方法参数寻找合适的转换方法 + String [] paramArr = invokerMethodBean.getParamArr(); + + AtomicReference methodBean = new AtomicReference<>(); + + convertInterfaceBean.getMethodBeanList().stream().forEach(convertMethod -> { + for (String param : paramArr){ + if(convertMethod.paramMatchOne(param)){ + methodBean.set(convertMethod); + } + } + }); + return methodBean.get(); + } + + /** + * 从转换接口中过滤符合转换条件参数的转换方法 + * bo->vo + * 主要用于读场景进行转换 + * @param convertInterfaceBean + * @param invokerMethodBean + * @return + */ + public MethodBean getBO2VOConvertMethod(InterfaceBean convertInterfaceBean, MethodBean invokerMethodBean){ + //读场景根据调用方的返回值寻找合适的转换方法 + String returnClass = invokerMethodBean.getReturnClass(); + boolean isList = false; + if(returnClass.toLowerCase().contains("page") || returnClass.toLowerCase().contains("list")){ + isList = true; + } + + String returnClassModelType = invokerMethodBean.getReturnClassTypeModel(); + AtomicReference methodBean = new AtomicReference<>(); + boolean finalIsList = isList; + convertInterfaceBean.getMethodBeanList().stream().forEach(convertMethod -> { + if(finalIsList && convertMethod.getReturnClass().trim().toLowerCase().contains("list") && convertMethod.getReturnClass().trim().toLowerCase().contains(returnClassModelType.toLowerCase())) { + methodBean.set(convertMethod); + } + if(!finalIsList && convertMethod.getReturnClass().toLowerCase().equals(returnClassModelType.toLowerCase())) { + methodBean.set(convertMethod); + } + }); + + return methodBean.get(); + } + + /** + * 从调用方的方法名称中扣出BO类 className + * 并且找到bodoConvert类 + * @param invokeBean + * @return + */ + public InterfaceBean getBODOConvertInterfaceBean(InvokeContextBean invokeBean){ + String paramContent = invokeBean.getInvokerMethodBean().getMethodName().split("\\(")[1].replace(")",""); + String [] paramArr = paramContent.split(","); + InterfaceBean interfaceBean = null; + for (String param : paramArr){ + String [] arr = param.trim().split(" "); + if(!arr[0].toLowerCase().endsWith("bo")){ + continue; + } + ClassBean boClassBeanElement = invokeBean.getPlantUmlContextBean().getClassBeanMap().get(arr[0]); + if(StringUtils.isEmpty(boClassBeanElement.getBodoConvertInterface())){ + continue; + } + interfaceBean = invokeBean.getPlantUmlContextBean().getDerivedPlantUmlContextBean().getInterfaceBeanMap().get(boClassBeanElement.getBodoConvertInterface()); + } + if(interfaceBean != null){ + return interfaceBean; + } + + String classModel = invokeBean.getInvokerMethodBean().getReturnClassTypeModel(); + if(classModel.toLowerCase().endsWith(TemplateFileEnum.BUSINESS_OBJECT.getTempFileName())){ + ClassBean boClassBeanElement = invokeBean.getPlantUmlContextBean().getClassBeanMap().get(classModel); + interfaceBean = invokeBean.getPlantUmlContextBean().getDerivedPlantUmlContextBean().getInterfaceBeanMap().get(boClassBeanElement.getBodoConvertInterface()); + } + return interfaceBean; + } + + /** + * 构建变量名 + * @param returnClassName + * @return + */ + public String buildReturnVar(String returnClassName){ + if(returnClassName.contains("<")){ + if(returnClassName.toLowerCase().contains("list")){ + //List> + String [] classArr = returnClassName.split("<"); + String modelClass = ""; + for (String str : classArr){ + String className = str.replace(">",""); + if(className.toLowerCase().endsWith("bo") || className.toLowerCase().endsWith("dto") || className.toLowerCase().endsWith("vo") || className.toLowerCase().endsWith("do")){ + modelClass = className; + break; + } + } + + if(StringUtils.isEmpty(modelClass)){ + return "list"; + } + + String returnVar = modelClass+"List"; + return returnVar.substring(0,1).toLowerCase() + returnVar.substring(1); + } + } + return returnClassName.substring(0,1).toLowerCase() + returnClassName.substring(1); + } + + + /** + * 构建参数转换调用内容 + * @param invokeBean + * @param convertMethod + * @param convertInterfaceName + * @return + */ + public InvokeRowBean buildInvokeConvertRow(InvokeContextBean invokeBean,MethodBean convertMethod,String convertInterfaceName){ + String [] paramArr = invokeBean.getInvokerMethodBean().getParamArr(); + String convertParamType = convertMethod.getParamArr()[0]; + if(convertParamType.contains(" ")){ + convertParamType = convertParamType.split(" ")[0]; + } + String convertParamStr = "null"; + for (String param : paramArr){ + String paramType = param; + String paramVar = param; + if(paramType.contains(" ")){ + paramType = paramType.split(" ")[0]; + paramVar = paramVar.split(" ")[1]; + }else { + paramVar = paramVar.substring(0,1).toUpperCase()+paramVar.substring(1); + } + + if(paramType.trim().equals(convertParamType.trim())){ + convertParamStr = paramVar; + } + } + + /** + * 如果调用方的方法参数无法当转换类接口方法的方法参数 + * 则尝试从调用行内容找到合适的方法参数 + */ + if(convertParamStr.equals("null")){ + List invokeRowBeanList = invokeBean.getInvokerMethodBean().getInvokeRowBeanList(); + if(CollectionUtils.isNotEmpty(invokeRowBeanList)){ + for (InvokeRowBean invokeRowBean : invokeRowBeanList){ + String convertParamClass = convertParamType.trim().split(" ")[0]; + if(! convertParamClass.equals(invokeRowBean.getReturnClassName())){ + continue; + } + convertParamStr = invokeRowBean.getReturnClassValue(); + } + } + } + + + String returnClassName = convertMethod.getReturnClass(); + + InvokeRowBean invokeRowBean = new InvokeRowBean(); + invokeRowBean.setProviderClassName(convertInterfaceName); + invokeRowBean.setProviderClassNameVar(convertInterfaceName+".INSTANCE"); + invokeRowBean.setProviderMethodName(convertMethod.getSimplMethodName()); + invokeRowBean.setReturnClassName(returnClassName); + invokeRowBean.setReturnClassValue(this.buildReturnVar(returnClassName)); + invokeRowBean.setProviderMethodParamTypeArr(convertMethod.getParamArr()); + invokeRowBean.setProviderMethodParamValueArr(new String[]{convertParamStr}); + return invokeRowBean; + } + + + /** + * 通过返回值找对应的转换方法 + * @param interfaceBean + * @param returnClassName + * @return + */ + public MethodBean getDOBOConvertMethod( InterfaceBean interfaceBean,String returnClassName){ + for(MethodBean methodBean : interfaceBean.getMethodBeanList()){ + for (String paramStr : methodBean.getParamArr()){ + if(paramStr.startsWith(returnClassName)){ + return methodBean; + } + } + } + return null; + } +} diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/InvokeElementRegistService.java b/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/InvokeElementRegistService.java new file mode 100644 index 0000000000000000000000000000000000000000..462b81d8ee659a727373b8b3265f898a6c600082 --- /dev/null +++ b/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/InvokeElementRegistService.java @@ -0,0 +1,98 @@ +package com.coderman.codemaker.service.invoker; + +import com.coderman.codemaker.bean.plantuml.ClassBean; +import com.coderman.codemaker.bean.plantuml.MethodBean; +import com.coderman.codemaker.bean.plantuml.PlantUmlContextBean; +import com.coderman.codemaker.config.AppServiceConfig; +import org.assertj.core.util.Lists; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.lang.reflect.Method; + +/** + * Description:预先读取plantUML调用时序图文档，以及补充其他内置的工具类 + * 如BaseEvent,AppEventPublisher类等 + * date: 2021/10/25 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +@Service +public class InvokeElementRegistService { + + @Autowired + private AppServiceConfig appServiceConfig; + + /** + * 注册内置的工具类对象或者辅助对象 + * @param plantUmlContextBean + */ + public void registDefaultClass(PlantUmlContextBean plantUmlContextBean){ + registBaseEvent(plantUmlContextBean); + registAppEventPublisher(plantUmlContextBean); + registPageBO(plantUmlContextBean); + } + + /** + * 注册事件基类 + * @param plantUmlContextBean + */ + private void registBaseEvent(PlantUmlContextBean plantUmlContextBean){ + ClassBean classBean = new ClassBean(); + classBean.setClassDesc("事件基类"); + classBean.setClassName("BaseEvent"); + classBean.setDerived(false); + classBean.setPackageName(appServiceConfig.getPackage()+".domain.event"); + classBean.setPlantUMLPackage("domain.event"); + classBean.setMethodBeanList(Lists.newArrayList()); + plantUmlContextBean.addClassBean(classBean); + } + + /** + * 注册事件发布器 + * @param plantUmlContextBean + */ + private void registAppEventPublisher(PlantUmlContextBean plantUmlContextBean){ + ClassBean classBean = new ClassBean(); + classBean.setClassDesc("事件发布器"); + classBean.setClassName("AppEventPublisher"); + classBean.setDerived(false); + classBean.setPackageName(appServiceConfig.getPackage()+".utils"); + classBean.setPlantUMLPackage("utils"); + MethodBean methodBean = new MethodBean(); + methodBean.setReturnBody("void"); + methodBean.setMethodName("publish(T t)"); + methodBean.setStatic(false); + methodBean.setVisibility("public"); + methodBean.setDesc("发布事件入口"); + methodBean.setClassName("AppEventPublisher"); + classBean.setMethodBeanList(Lists.newArrayList(methodBean)); + + plantUmlContextBean.addClassBean(classBean); + + } + + /** + * 注册bo类对象 + * @param plantUmlContextBean + */ + public void registPageBO(PlantUmlContextBean plantUmlContextBean){ + ClassBean classBean = new ClassBean(); + classBean.setClassDesc("分页bo对象"); + classBean.setClassName("PageBO"); + classBean.setDerived(false); + classBean.setPackageName("com.coderman.utils.commonbo"); + + + + + + + plantUmlContextBean.addClassBean(classBean); + } + + + +} diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/DynamicInvokeHandler.java b/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/InvokeSequenceService.java similarity index 77% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/DynamicInvokeHandler.java rename to codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/InvokeSequenceService.java index 96c3253efc5f394bbaa27cb256beef7bed55f584..d9c673ca6d28460f5552e57cd5b8ecd37fd96b3c 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/DynamicInvokeHandler.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/InvokeSequenceService.java @@ -1,7 +1,7 @@ -package com.coderman.codemaker.app.dynamicddd; +package com.coderman.codemaker.service.invoker; import com.coderman.codemaker.bean.plantuml.PlantUmlContextBean; -import com.coderman.codemaker.service.ReadInvokePlantUMLFileService; +import com.coderman.codemaker.service.plantuml.ReadInvokeSequencePlantDocService; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -15,10 +15,10 @@ import org.springframework.stereotype.Service; * @since JDK 1.8 */ @Service -public class DynamicInvokeHandler { +public class InvokeSequenceService { @Autowired - private ReadInvokePlantUMLFileService readInvokePlantUMLFileService; + private ReadInvokeSequencePlantDocService readInvokePlantUMLFileService; /** * 进行动态调用的入口 @@ -32,6 +32,4 @@ public class DynamicInvokeHandler { } } - - } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/MethodFactoryService.java b/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/MethodFactoryService.java new file mode 100644 index 0000000000000000000000000000000000000000..cad4c2cb05c9942518c22c284f88bf4d67b8d17a --- /dev/null +++ b/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/MethodFactoryService.java @@ -0,0 +1,283 @@ +package com.coderman.codemaker.service.invoker; + +import com.coderman.codemaker.bean.plantuml.*; +import com.coderman.codemaker.enums.TemplateFileEnum; +import com.coderman.codemaker.enums.dynamic.ReadWriteTypeEnum; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.assertj.core.util.Lists; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Locale; +import java.util.Optional; + +/** + * Description: 针对动态调用时序中出现而领域文档没有出现的方法进行智能识别和构建 + * date: 2021/10/30 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +@Service +public class MethodFactoryService { + + /** + * 动态构建调用时序中的方法 + * + * @param abstractClassBean + * @param methodStr + * @return + */ + public MethodBean buildDynamicMethod(PlantUmlContextBean plantUmlContextBean, AbstractClassBean abstractClassBean, String methodStr) { + Optional methodBeanOptional = abstractClassBean.getMatchMethodBean(methodStr); + if (methodBeanOptional.isPresent()) { + methodBeanOptional.get().initInvokeRowContentList(); + return methodBeanOptional.get(); + } + MethodBean methodBean = new MethodBean(); + methodBean.setDesc(""); + + if (!methodStr.contains("(")) { + methodBean.setMethodName(methodStr + "()"); + }else { + //如果方法带参数并且参数只有类型没有对应参数变量名，则重新构建方法名称 + String methodName = reBuildMethodName(methodStr,methodBean); + methodBean.setMethodName(methodName); + methodBean.buildParamArr(); + } + + methodBean.setReturnClass("void"); + methodBean.setVisibility("public"); + methodBean.initInvokeRowContentList(); + String returnClassTypeName = "void"; + String wrType = ReadWriteTypeEnum.getCodeByMethod(methodStr.trim()); + + + //对mapper接口方法进行构建--特殊处理 + if (abstractClassBean.getClassName().toLowerCase().endsWith(TemplateFileEnum.MAPPER.getTempFileName())) { + String returnClassTypeDO = abstractClassBean.getClassName().replace("Mapper", "") + "DO"; + if (wrType.equals(ReadWriteTypeEnum.READ.getCode())) { + if (methodStr.toLowerCase().contains("one")) { + returnClassTypeName = returnClassTypeDO; + } else { + returnClassTypeName = "List<" + returnClassTypeDO + ">"; + } + } + + if (wrType.equals(ReadWriteTypeEnum.WRITE.getCode())) { + if (methodStr.toLowerCase().contains("save")) { + returnClassTypeName = "long"; + } else { + returnClassTypeName = "int"; + } + } + methodBean.setReturnClass(returnClassTypeName); + methodBean.setDesc("查询"); + abstractClassBean.getMethodBeanList().add(methodBean); + return methodBean; + } + //如果方法没带参数则智能推导 + if (!methodStr.contains("(")) { + FieldBean fieldBean = buildParamArrFromName(plantUmlContextBean, abstractClassBean,methodStr,wrType); + if(fieldBean != null){ + String [] paramArr = new String[]{fieldBean.getFieldName()}; + String paramStr = StringUtils.join(paramArr,", "); + methodBean.setMethodName(methodStr + "("+paramStr+")"); + methodBean.buildParamArr(); + methodBean.setDesc("根据"+fieldBean.getDesc()+"查询"); + } + } + + //构建返回值 + String returnClass = buildReturnClassFromName(plantUmlContextBean,abstractClassBean,methodStr,wrType); + methodBean.setReturnClass(returnClass); + methodBean.buildDoc(); + abstractClassBean.getMethodBeanList().add(methodBean); + return methodBean; + } + + + /** + * 根据方法名动态推导出方法参数 + * @param plantUmlContextBean + * @param abstractClassBean + * @param methodName + * @param rwType + * @return + */ + public FieldBean buildParamArrFromName(PlantUmlContextBean plantUmlContextBean, AbstractClassBean abstractClassBean, String methodName, String rwType) { + //说明是一个不带参数的方法 + if (methodName.contains("(")) { + return null; + } + //先支持单参数推导---读场景推导 + if (rwType.equals(ReadWriteTypeEnum.READ.getCode())) { + String fieldName = ReadWriteTypeEnum.getSomeFieldFromMethodName(methodName); + return getMatchModelField(plantUmlContextBean,abstractClassBean.getMethodBeanList(),fieldName); + } + return null; + } + + /** + * 根据当前提供的class找到其他方法返回值和方法参数对应的BO,DTO,VO,DO类 + * 然后从model中找到对应的参数属性 + * @return + */ + private FieldBean getMatchModelField(PlantUmlContextBean plantUmlContextBean, List methodBeanList, String fieldName) { + + ClassBean classBeanModel = getMatchClassModel(plantUmlContextBean, methodBeanList); + if(classBeanModel == null){ + return null; + } + Optional fieldBeanOptional = classBeanModel.getFieldBeanList().stream().filter(fieldBean -> fieldBean.getFieldName().toLowerCase().contains(fieldName.toLowerCase())).findFirst(); + if(fieldBeanOptional.isPresent()){ + return fieldBeanOptional.get(); + } + return null; + + } + + + /** + * 从方法中找到一个bo或者do类 + * @param plantUmlContextBean + * @param methodBeanList + * @return + */ + private ClassBean getMatchClassModel(PlantUmlContextBean plantUmlContextBean, List methodBeanList){ + if (CollectionUtils.isEmpty(methodBeanList)) { + return null; + } + for (MethodBean methodBean : methodBeanList) { + String paramModel = getParamModelFromParam(methodBean.getParamArr()); + if (StringUtils.isEmpty(paramModel)) { + paramModel = getParamModelFromReturn(methodBean.getReturnClassTypeModel()); + } + if (StringUtils.isEmpty(paramModel)) { + continue; + } + ClassBean classBeanModel = plantUmlContextBean.getClassBeanMap().get(paramModel); + if(classBeanModel == null){ + continue; + } + return classBeanModel; + } + return null; + } + + + + /** + * 从参数中找到classModel模型 + * + * @param paramArr + * @return + */ + private String getParamModelFromParam(String[] paramArr) { + if (paramArr == null || paramArr.length > 0) { + return null; + } + for (int i = 0; i < paramArr.length; i++) { + String param = paramArr[i]; + if (param.contains(" ")) { + param = param.split(" ")[0]; + } + if (param.contains("<")) { + param = param + .replace("<", "") + .replace(">", "") + .replace("List", "") + .replace("Map", "") + .replace("Set", ""); + + } + //主要针对bo,do的缺失方法参数进行推导 + if (param.toLowerCase().endsWith("bo") || param.toLowerCase().endsWith("do")) { + return param; + } + } + return null; + } + + + /** + * 从方法返回值中找到classModel模型 + * + * @param returnClass + * @return + */ + private String getParamModelFromReturn(String returnClass) { + if (returnClass.contains("void")) { + return null; + } + if (returnClass.contains("<")) { + returnClass = returnClass + .replace("<", "") + .replace(">", "") + .replace("List", "") + .replace("Map", "") + .replace("Set", ""); + } + //主要针对bo,do的缺失方法参数进行推导 + if (returnClass.toLowerCase().endsWith("bo") || returnClass.toLowerCase().endsWith("do")) { + return returnClass; + } + return null; + } + + + /** + * 通过方法名推导方法的返回值 + * @param plantUmlContextBean + * @param abstractClassBean + * @param methodName + * @param rwType + * @return + */ + private String buildReturnClassFromName(PlantUmlContextBean plantUmlContextBean, AbstractClassBean abstractClassBean, String methodName, String rwType) { + //先支持读场景的方法返回值推导 + if (rwType.equals(ReadWriteTypeEnum.READ.getCode())) { + ClassBean classModelBean = getMatchClassModel(plantUmlContextBean,abstractClassBean.getMethodBeanList()); + if(classModelBean == null){ + return "void"; + } + if(methodName.toLowerCase().contains("One")){ + return classModelBean.getClassName(); + } + if(methodName.toLowerCase().contains("Set")){ + return "Set<" + classModelBean.getClassName() + ">"; + } + if(methodName.toLowerCase().contains("Map")){ + return "Map"; + } + return "List<"+classModelBean.getClassName()+">"; + } + return "void"; + } + + /** + * 重新构建方法名 + * @param methodStr + * @param methodBean + * @return + */ + private String reBuildMethodName(String methodStr,MethodBean methodBean){ + String [] methodArr = methodStr.split("\\("); + String paramBody = methodArr[1].replace(")","").trim(); + String simpleMethodName = methodArr[0]; + + List paramList = Lists.newArrayList(); + String [] paramArr = paramBody.split(","); + for (String param : paramArr){ + if(!param.trim().contains(" ")){ + String paramVar = methodBean.getParamVar(param); + paramList.add(param +" "+ paramVar); + }else { + paramList.add(param); + } + } + return simpleMethodName+"("+StringUtils.join(paramList,",")+")"; + } +} diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/MethodInvokeHandler.java b/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/MethodInvokeService.java similarity index 67% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/MethodInvokeHandler.java rename to codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/MethodInvokeService.java index e68f4c9ad359c1126b53a28128607d189a6a3b81..c3f9524dcf15e6cab0f9752e124b875b3b9c5a77 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/MethodInvokeHandler.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/MethodInvokeService.java @@ -1,19 +1,20 @@ package com.coderman.codemaker.service.invoker; import com.coderman.codemaker.bean.invoke.InvokeContextBean; +import com.coderman.codemaker.bean.invoke.InvokeRowBean; import com.coderman.codemaker.bean.plantuml.*; -import com.coderman.codemaker.enums.TemplateFileEnum; import com.coderman.codemaker.enums.VisibilityEnum; import com.coderman.codemaker.enums.dynamic.InvokeLayerTypeEnum; import com.coderman.codemaker.enums.dynamic.InvokeSceneTypeEnum; +import com.coderman.codemaker.service.ImportPackageService; import org.apache.commons.lang3.StringUtils; import org.assertj.core.util.Lists; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; + import java.util.Optional; /** @@ -25,7 +26,7 @@ import java.util.Optional; * @since JDK 1.8 */ @Service -public class MethodInvokeHandler { +public class MethodInvokeService { @Resource(name = "appRpcInvokeHandler") private InvokeHandler appRpcInvokeHandler; @@ -39,21 +40,31 @@ public class MethodInvokeHandler { @Resource(name = "infrastInvokeHandler") private InvokeHandler infrastInvokeHandler; + + @Autowired + private ImportPackageService importPackageService; + + @Autowired + private ConvertInvokeService convertInvokeService; + + @Autowired + private ReturnBodyFactoryService returnBodyFactoryService; + /** * 处理方法调用内容 * @param invokeBean */ public void dealInvokeContent(InvokeContextBean invokeBean){ - if(!invokeBean.getMethodBean().getMethodName().toLowerCase().startsWith(invokeBean.getInvokerMethod())){ + if(!invokeBean.getInvokerMethodBean().getMethodName().toLowerCase().startsWith(invokeBean.getInvokerMethod().toLowerCase())){ return; } String providerClassMethod = getProviderClassMethod(invokeBean); - String returnStr = invokeBean.getProviderClassMethodReturn(); - String invokeRowReturn = buildReturnBody(returnStr,invokeBean.getProviderClassMethod()); + String returnStr = invokeBean.getProviderClassMethod().getReturnClass(); + String invokeRowReturn = buildReturnBody(returnStr,invokeBean.getInvokerMethodBean()); if (StringUtils.isNotEmpty(invokeRowReturn)) { - invokeRowReturn = invokeRowReturn + invokeBean.getMethodBean().getInvokeMethodList().size()+" = "; + invokeRowReturn = invokeRowReturn + " = "; } String providerClassVar = invokeBean.getProviderClassName().substring(0,1).toLowerCase()+invokeBean.getProviderClassName().substring(1); @@ -61,7 +72,8 @@ public class MethodInvokeHandler { invokeBean.buildCurrentInvokeRow(invokeRowContent); //注册调用层,根据调用层间关系判断是否需要增加do,bo,vo之间的转换接口 registConvertLayer(invokeBean); - + //动态构建调用方的方法返回值 + returnBodyFactoryService.refreshReturnBody(invokeBean); } @@ -71,10 +83,13 @@ public class MethodInvokeHandler { * @return */ private String getProviderClassMethod(InvokeContextBean invokeBean){ - String providerClassMethod = invokeBean.getProviderClassMethod(); + String providerClassMethod = invokeBean.getProviderClassMethod().getMethodName(); + if(!providerClassMethod.contains("(")){ + providerClassMethod = providerClassMethod+"()"; + } String methodName = providerClassMethod.substring(0,providerClassMethod.indexOf("(")); String params = providerClassMethod.substring(providerClassMethod.indexOf("(")+1).replace(")",""); - providerClassMethod = methodName+"("+getProviderClassMethodParamStr(invokeBean.getMethodBean(), params)+")"; + providerClassMethod = methodName+"("+getProviderClassMethodParamStr(invokeBean.getInvokerMethodBean(), params)+")"; return providerClassMethod; } @@ -88,7 +103,6 @@ public class MethodInvokeHandler { if(StringUtils.isEmpty(providerMethodParams)){ return ""; } - //如果调用内容为空，则校验接口参数调用者与被调用者是否存在一致，存在则保持一致 if(CollectionUtils.isEmpty(invokeMethod.getInvokeMethodList())){ if(invokeMethod.getMethodName().contains("()")){ @@ -98,8 +112,17 @@ public class MethodInvokeHandler { String [] providerMethodParamArr = providerMethodParams.split(","); StringBuilder paramBuilder = new StringBuilder(); for (int i = 0;i < providerMethodParamArr.length;i++){ - String providerParamType = providerMethodParamArr[i].trim().split(" ")[0]; - String providerParamVar = providerMethodParamArr[i].trim().split(" ")[1]; + String providerParamType = ""; + String providerParamVar = ""; + if(providerMethodParamArr[i].contains(" ")){ + providerParamType = providerMethodParamArr[i].trim().split(" ")[0]; + providerParamVar = providerMethodParamArr[i].trim().split(" ")[1]; + }else { + providerParamType = providerMethodParamArr[i]; + providerParamVar = invokeMethod.getParamVar(providerParamType); + } + + boolean find = false; for (int j = 0;j < invokerMethodParamArr.length;j++){ String invokerParamType = invokerMethodParamArr[j].trim().split(" ")[0]; @@ -148,73 +171,71 @@ public class MethodInvokeHandler { return paramBuilder.substring(0,paramBuilder.length() - 2); } + /** * 构建调用方法返回体 * @param returnStr + * @param invokeMethodBean * @return */ - private String buildReturnBody(String returnStr,String methodName){ + private String buildReturnBody(String returnStr,MethodBean invokeMethodBean){ String invokeRowReturn = ""; if(returnStr.contains("void")){ return invokeRowReturn; } - if(returnStr.toLowerCase().contains("integer")){ + if(returnStr.toLowerCase().contains("Integer") && !returnStr.contains("<")){ invokeRowReturn = "Integer integerVar"; - return invokeRowReturn; + //return invokeRowReturn; } - if(returnStr.toLowerCase().contains("int")){ + else if(returnStr.toLowerCase().contains("int")){ invokeRowReturn = "int intVar"; - return invokeRowReturn; + //return invokeRowReturn; } - if(returnStr.toLowerCase().contains("short")){ + else if(returnStr.toLowerCase().contains("short")){ invokeRowReturn = "short shortVar"; - return invokeRowReturn; + //return invokeRowReturn; } - if(returnStr.toLowerCase().contains("String")){ + else if(returnStr.toLowerCase().contains("String") && !returnStr.contains("<")){ invokeRowReturn = "String strVar"; - return invokeRowReturn; + //return invokeRowReturn; } - - if(returnStr.toLowerCase().contains("boolean")){ + else if(returnStr.toLowerCase().contains("boolean") && !returnStr.contains("<")){ invokeRowReturn = "boolean booleanVar"; - return invokeRowReturn; + //return invokeRowReturn; } - if(returnStr.contains("Long")){ + else if(returnStr.contains("Long") && !returnStr.contains("<")){ invokeRowReturn = "Long longVar"; - return invokeRowReturn; + //return invokeRowReturn; } - if(returnStr.contains("long")){ + else if(returnStr.contains("long")){ invokeRowReturn = "long longVar"; - return invokeRowReturn; + //return invokeRowReturn; } - if(!returnStr.contains("void")){ + else if(!returnStr.contains("void") && !returnStr.contains("<")){ String returnVar = returnStr.substring(0,1).toLowerCase()+returnStr.substring(1); - if(methodName.startsWith("get")){ - returnVar = returnVar+"Get"; - } - if(methodName.startsWith("search")){ - returnVar = returnVar+"Search"; - } - if(methodName.startsWith("find")){ - returnVar = returnVar+"Find"; - } - if(methodName.startsWith("load")){ - returnVar = returnVar+"Load"; - } invokeRowReturn = returnStr + " " + returnVar; } + else if(returnStr.trim().toLowerCase().contains("<")){ + invokeRowReturn = returnStr + " " +convertInvokeService.buildReturnVar(returnStr); + } + + String finalInvokeRowReturn = invokeRowReturn; + Optional optional = invokeMethodBean.getInvokeRowBeanList().stream().filter(invokeRowBean -> finalInvokeRowReturn.endsWith(invokeRowBean.getReturnClassValue())).findFirst(); + if(optional.isPresent()){ + return invokeRowReturn + invokeMethodBean.getInvokeRowBeanList().size(); + } return invokeRowReturn; } @@ -237,9 +258,6 @@ public class MethodInvokeHandler { return; } invokerClassBean.getFieldBeanList().add(fieldBean); - if(org.apache.commons.collections4.CollectionUtils.isEmpty(invokerClassBean.getDynamicImportPackageList())){ - invokerClassBean.setDynamicImportPackageList(Lists.newArrayList()); - } invokerClassBean.getDynamicImportPackageList().add(providerClassBean.getPackageName()+"."+targetClassName); } @@ -250,50 +268,30 @@ public class MethodInvokeHandler { * @param importClassName */ public void registImportPackageByClass(AbstractClassBean invokerClassBean, PlantUmlContextBean plantUmlContextBean, String importClassName){ - importClassName = importClassName.trim(); - //处理bo 或者do - if(importClassName.trim().toLowerCase() - .endsWith(TemplateFileEnum.BUSINESS_OBJECT.getTempFileName()) - || importClassName.trim().toLowerCase() - .endsWith(TemplateFileEnum.DATA_OBJECT.getTempFileName())){ - ClassBean classBean = plantUmlContextBean.getClassBeanMap().get(importClassName); - if(classBean == null) { - return; - } - if(CollectionUtils.isEmpty(invokerClassBean.getDynamicImportPackageList())){ - invokerClassBean.setDynamicImportPackageList(Lists.newArrayList()); - } - invokerClassBean.getDynamicImportPackageList().add(classBean.getPackageName()+"."+classBean.getClassName()); + if(StringUtils.isEmpty(importClassName) || importClassName.contains("void")){ + return; } - - //处理vo 或者dto - if((importClassName.trim().toLowerCase().endsWith(TemplateFileEnum.DTO.getTempFileName()) - || importClassName.trim().toLowerCase().endsWith(TemplateFileEnum.VO.getTempFileName())) - && plantUmlContextBean.getDerivedPlantUmlContextBean() != null){ - ClassBean classBean = plantUmlContextBean.getDerivedPlantUmlContextBean().getClassBeanMap().get(importClassName); - if(classBean == null) { - return; - } - if(CollectionUtils.isEmpty(invokerClassBean.getDynamicImportPackageList())){ - invokerClassBean.setDynamicImportPackageList(Lists.newArrayList()); - } - invokerClassBean.getDynamicImportPackageList().add(classBean.getPackageName()+"."+classBean.getClassName()); + if(CollectionUtils.isEmpty(invokerClassBean.getDynamicImportPackageList())){ + invokerClassBean.setDynamicImportPackageList(Lists.newArrayList()); } - - //处理convert - if(importClassName.trim().toLowerCase().endsWith(TemplateFileEnum.CONVERT.getTempFileName()) - && plantUmlContextBean.getDerivedPlantUmlContextBean() != null){ - InterfaceBean interfaceBean = plantUmlContextBean.getDerivedPlantUmlContextBean().getInterfaceBeanMap().get(importClassName); - if(interfaceBean == null) { - return; - } - if(CollectionUtils.isEmpty(invokerClassBean.getDynamicImportPackageList())){ - invokerClassBean.setDynamicImportPackageList(Lists.newArrayList()); + importClassName = importClassName.trim(); + if(importClassName.contains("<")){ + String [] arr = importClassName.split("<"); + for (String content : arr){ + String tempContent = content.replace(">","").trim(); + String packageName = importPackageService.getMatchPackageDefault(tempContent); + + if(StringUtils.isEmpty(packageName)){ + importPackageService.dealImportPackage(invokerClassBean,plantUmlContextBean,tempContent); + continue; + } + invokerClassBean.getDynamicImportPackageList().add(packageName); } - invokerClassBean.getDynamicImportPackageList().add(interfaceBean.getPackageName()+"."+interfaceBean.getClassName()); + return; } + importPackageService.dealImportPackage(invokerClassBean,plantUmlContextBean,importClassName); } /** diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/ProviderInvokeHandler.java b/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/ProviderInvokeHandler.java index 3de88a5e0e04b86c6782abf1b3d6da1fbcc79a1f..1bce56966232121112746c68f7eea48f6eed32e5 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/ProviderInvokeHandler.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/ProviderInvokeHandler.java @@ -13,11 +13,5 @@ import org.springframework.stereotype.Service; */ @Service public class ProviderInvokeHandler { - public String buildProviderMethod(String providerContent, PlantUmlContextBean plantUmlContextBean){ - String className = providerContent.trim().split("\\.")[0]; - String method = providerContent.trim().split("\\.")[1]; - return null; - } - } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/ReturnBodyFactoryService.java b/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/ReturnBodyFactoryService.java new file mode 100644 index 0000000000000000000000000000000000000000..1ce5d1ddfb1171912ac09db290f6ce519e970c31 --- /dev/null +++ b/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/ReturnBodyFactoryService.java @@ -0,0 +1,67 @@ +package com.coderman.codemaker.service.invoker; + +import com.coderman.codemaker.bean.invoke.InvokeContextBean; +import com.coderman.codemaker.bean.invoke.InvokeRowBean; +import com.coderman.codemaker.bean.plantuml.MethodBean; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Description:根据方法调用内容动态智能构建方法返回值 + * date: 2021/11/1 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +@Service +public class ReturnBodyFactoryService { + + + /** + * 更新调用方的方法返回值 + * @param invokeBean + */ + public void refreshReturnBody(InvokeContextBean invokeBean){ + List invokeRowBeanList = invokeBean.getInvokerMethodBean().getInvokeRowBeanList(); + String returnClassType = invokeBean.getInvokerMethodBean().getReturnClassTypeNoWrapper(); + + MethodBean invokerMethodBean = invokeBean.getInvokerMethodBean(); + String returnClassValue = ""; + for (InvokeRowBean invokeRowBean : invokeRowBeanList) { + String invokeReturnClassName = invokeRowBean.getReturnClassName(); + if (returnClassType.equals(invokeReturnClassName)) { + returnClassValue = invokeRowBean.getReturnClassValue(); + break; + } + } + if(StringUtils.isEmpty(returnClassValue)){ + return; + } + + if(invokeBean.getInvokerMethodBean().wrapperResultDataDto()){ + returnClassValue = "return ResultDataDto.success("+returnClassValue+");"; + } + + else if(invokeBean.getInvokerMethodBean().wrapperResultDto()){ + returnClassValue = "return ResultDto.success();"; + }else { + returnClassValue = "return "+returnClassValue+";"; + } + + if(StringUtils.isEmpty(returnClassValue)){ + return; + } + String finalReturnClassValue = returnClassValue; + invokeBean.getInvokerClassBean().getMethodBeanList() + .stream() + .forEach(methodBean -> { + if(methodBean.getReturnClass().equals(invokerMethodBean.getReturnClass()) && methodBean.getMethodName().equals(invokerMethodBean.getMethodName())){ + methodBean.setReturnBody(finalReturnClassValue); + } + }); + } + +} diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/AppHttpInvokeHandler.java b/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/AppHttpInvokeHandler.java similarity index 33% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/AppHttpInvokeHandler.java rename to codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/AppHttpInvokeHandler.java index 1e22fe31b30f87a55c41a52471c8d954715883c1..72d24acd3f6b81c95b8f6f9b0680c331916ceb82 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/AppHttpInvokeHandler.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/AppHttpInvokeHandler.java @@ -1,11 +1,14 @@ -package com.coderman.codemaker.service.invoker; +package com.coderman.codemaker.service.invoker.handler; import com.coderman.codemaker.bean.invoke.InvokeContextBean; +import com.coderman.codemaker.bean.invoke.InvokeRowBean; import com.coderman.codemaker.bean.plantuml.ClassBean; import com.coderman.codemaker.bean.plantuml.InterfaceBean; import com.coderman.codemaker.bean.plantuml.MethodBean; -import com.coderman.codemaker.enums.dynamic.InvokeLayerTypeEnum; import com.coderman.codemaker.enums.dynamic.ReadWriteTypeEnum; +import com.coderman.codemaker.service.invoker.ConvertInvokeService; +import com.coderman.codemaker.service.invoker.InvokeHandler; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -24,60 +27,45 @@ import java.util.Optional; @Service(value = "appHttpInvokeHandler") public class AppHttpInvokeHandler implements InvokeHandler { @Autowired - private ConvertInvokeHandler convertInvokeHandler; + private ConvertInvokeService convertInvokeService; @Override public void dealInvoke(InvokeContextBean invokeBean) { //写场景,对调用方的方法参数vo->bo if(invokeBean.getMethodRWType().equals(ReadWriteTypeEnum.WRITE.getCode())){ - - InterfaceBean bovoConvertInterfaceBean = convertInvokeHandler.getBOVOConvert(invokeBean); + InterfaceBean bovoConvertInterfaceBean = convertInvokeService.getBOVOConvert(invokeBean); if(bovoConvertInterfaceBean == null){ - invokeBean.getMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(),invokeBean.getCurrentInvokeRowBean()); - + invokeBean.getInvokerMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(),invokeBean.getCurrentInvokeRowBean()); return; } - MethodBean convertMethod = convertInvokeHandler.getBO2VOConvertMethod(bovoConvertInterfaceBean,invokeBean.getMethodBean(),"vo2bo("); - if(convertMethod == null){ - invokeBean.getMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(),invokeBean.getCurrentInvokeRowBean()); - - return; - } - - String [] paramArr = invokeBean.getMethodBean().getParamArr(); - String convertParamType = convertMethod.getParamArr()[0]; - String convertParamStr = "null"; - for (String param : paramArr){ - String paramClassType = param.trim().split(" ")[0]; - String convertClassType = convertParamType.trim().split(" ")[0]; - if(paramClassType.equals(convertClassType)){ - convertParamStr = param.trim().split(" ")[1]; - } - } - String returnClassName = convertMethod.getReturnClass(); - String invokeRow = returnClassName +" " - + returnClassName.substring(0,1).toLowerCase() - + returnClassName.substring(1) - + " = " + bovoConvertInterfaceBean.getClassName() + ".INSTANCE."+convertMethod.getSimplMethodName()+"("+convertParamStr+")"; - Optional oldRow = invokeBean.getMethodBean().getInvokeMethodList().stream().filter(str->str.equals(invokeRow)).findFirst(); - if(oldRow.isPresent()){ - invokeBean.getMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(),invokeBean.getCurrentInvokeRowBean()); - return; - } - invokeBean.getMethodBean().getInvokeMethodList().add(invokeRow); - invokeBean.getMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(),invokeBean.getCurrentInvokeRowBean()); + MethodBean convertMethod = convertInvokeService.getVO2BOConvertMethod(bovoConvertInterfaceBean,invokeBean.getInvokerMethodBean()); + if(convertMethod == null){ + invokeBean.getInvokerMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(),invokeBean.getCurrentInvokeRowBean()); + return; + } + + InvokeRowBean convertInvokeRowBean = convertInvokeService.buildInvokeConvertRow(invokeBean,convertMethod, bovoConvertInterfaceBean.getClassName()); + String convertInvokeRow = convertInvokeRowBean.buildInvokeContent(); + String finalConvertInvokeRow = convertInvokeRow; + Optional oldRow = invokeBean.getInvokerMethodBean().getInvokeMethodList().stream().filter(str->str.equals(finalConvertInvokeRow)).findFirst(); + if(oldRow.isPresent()){ + invokeBean.getInvokerMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(),invokeBean.getCurrentInvokeRowBean()); + return; + } + + invokeBean.getInvokerMethodBean().addInvokeRowContent(convertInvokeRow,convertInvokeRowBean); + String currentInvokeRowContent = invokeBean.getCurrentInvokeRowBean().refreshInvokeContent(convertInvokeRowBean, invokeBean.getPlantUmlContextBean()); + invokeBean.getInvokerMethodBean().addInvokeRowContent(currentInvokeRowContent,invokeBean.getCurrentInvokeRowBean()); //需要引用convert接口的时候注册引用包 if(CollectionUtils.isEmpty(invokeBean.getInvokerClassBean().getDynamicImportPackageList())){ invokeBean.getInvokerClassBean().setDynamicImportPackageList(new ArrayList<>()); } - - - ClassBean returnClassBean = invokeBean.getPlantUmlContextBean().getClassBeanMap().get(returnClassName); + ClassBean returnClassBean = invokeBean.getPlantUmlContextBean().getClassBeanMap().get(convertMethod.getReturnClass()); if(returnClassBean == null){ - returnClassBean = invokeBean.getPlantUmlContextBean().getDerivedPlantUmlContextBean().getClassBeanMap().get(returnClassName); + returnClassBean = invokeBean.getPlantUmlContextBean().getDerivedPlantUmlContextBean().getClassBeanMap().get(convertMethod.getReturnClass()); } if(returnClassBean != null){ invokeBean.getInvokerClassBean().getDynamicImportPackageList().add(returnClassBean.getPackageName()+"."+returnClassBean.getClassName()); @@ -86,47 +74,32 @@ public class AppHttpInvokeHandler implements InvokeHandler { } //读场景,对被调用方的返回值bo->vo - else if(invokeBean.getMethodRWType().equals(ReadWriteTypeEnum.READ.getCode())){ - InterfaceBean bodtoConvertInterfaceBean = convertInvokeHandler.getBOVOConvert(invokeBean); - if(bodtoConvertInterfaceBean == null){ - invokeBean.getMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(),invokeBean.getCurrentInvokeRowBean()); + if(invokeBean.getMethodRWType().equals(ReadWriteTypeEnum.READ.getCode())){ + invokeBean.getInvokerMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(),invokeBean.getCurrentInvokeRowBean()); + + InterfaceBean bovoConvertInterfaceBean = convertInvokeService.getBOVOConvert(invokeBean); + if(bovoConvertInterfaceBean == null){ return; } - MethodBean convertMethod = convertInvokeHandler.getBO2VOConvertMethod(bodtoConvertInterfaceBean,invokeBean.getMethodBean(),"bo2vo("); + + MethodBean convertMethod = convertInvokeService.getBO2VOConvertMethod(bovoConvertInterfaceBean,invokeBean.getInvokerMethodBean()); if(convertMethod == null){ - invokeBean.getMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(),invokeBean.getCurrentInvokeRowBean()); return; } - String [] paramArr = invokeBean.getMethodBean().getParamArr(); - String convertParamType = convertMethod.getParamArr()[0]; - String convertParamStr = "null"; - for (String param : paramArr){ - if(param.startsWith(convertParamType)){ - convertParamStr = param.trim().split(" ")[1]; - } - } - String returnClassName = convertMethod.getReturnClass(); - String invokeRow = returnClassName +" " - + returnClassName.substring(0,1).toLowerCase() - + returnClassName.substring(1) - + " = " + bodtoConvertInterfaceBean.getClassName() + ".INSTANCE."+convertMethod.getSimplMethodName()+"("+convertParamStr+")"; - Optional oldRow = invokeBean.getMethodBean().getInvokeMethodList().stream().filter(str->str.equals(invokeRow)).findFirst(); + InvokeRowBean invokeRowBean = convertInvokeService.buildInvokeConvertRow(invokeBean,convertMethod, bovoConvertInterfaceBean.getClassName()); + String invokeRow = invokeRowBean.buildInvokeContent(); + Optional oldRow = invokeBean.getInvokerMethodBean().getInvokeMethodList().stream().filter(str->str.equals(invokeRow)).findFirst(); if(oldRow.isPresent()){ - invokeBean.getMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(),invokeBean.getCurrentInvokeRowBean()); return; } - invokeBean.getMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(),invokeBean.getCurrentInvokeRowBean()); - invokeBean.getMethodBean().getInvokeMethodList().add(invokeRow); + invokeBean.getInvokerMethodBean().addInvokeRowContent(invokeRow,invokeRowBean); //需要引用convert接口的时候注册引用包 - if(CollectionUtils.isEmpty(invokeBean.getInvokerClassBean().getDynamicImportPackageList())){ - invokeBean.getInvokerClassBean().setDynamicImportPackageList(new ArrayList<>()); - } - invokeBean.getInvokerClassBean().getDynamicImportPackageList().add(bodtoConvertInterfaceBean.getPackageName()+"."+bodtoConvertInterfaceBean.getClassName()); - } - else { - invokeBean.getMethodBean().getInvokeMethodList().add(invokeBean.getCurrentInvokeRowContent()); + invokeBean.getInvokerClassBean().getDynamicImportPackageList().add(bovoConvertInterfaceBean.getPackageName()+"."+bovoConvertInterfaceBean.getClassName()); } - + else { + invokeBean.getInvokerMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(),invokeBean.getCurrentInvokeRowBean()); + } } + } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/AppRpcInvokeHandler.java b/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/AppRpcInvokeHandler.java similarity index 37% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/AppRpcInvokeHandler.java rename to codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/AppRpcInvokeHandler.java index b52df7ce496e8508411d2897b959eb13677d11ff..07b1d592688bd2fe4f701736bc8b39b25a2023cf 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/AppRpcInvokeHandler.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/AppRpcInvokeHandler.java @@ -1,16 +1,17 @@ -package com.coderman.codemaker.service.invoker; +package com.coderman.codemaker.service.invoker.handler; import com.coderman.codemaker.bean.invoke.InvokeContextBean; +import com.coderman.codemaker.bean.invoke.InvokeRowBean; import com.coderman.codemaker.bean.plantuml.InterfaceBean; import com.coderman.codemaker.bean.plantuml.MethodBean; import com.coderman.codemaker.enums.dynamic.ReadWriteTypeEnum; -import org.assertj.core.util.Lists; +import com.coderman.codemaker.service.invoker.ConvertInvokeService; +import com.coderman.codemaker.service.invoker.InvokeHandler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.util.ArrayList; -import java.util.List; import java.util.Optional; /** @@ -22,9 +23,9 @@ import java.util.Optional; * @since JDK 1.8 */ @Service(value = "appRpcInvokeHandler") -public class AppRpcInvokeHandler implements InvokeHandler{ +public class AppRpcInvokeHandler implements InvokeHandler { @Autowired - private ConvertInvokeHandler convertInvokeHandler; + private ConvertInvokeService convertInvokeService; @Override public void dealInvoke(InvokeContextBean invokeBean) { @@ -32,90 +33,64 @@ public class AppRpcInvokeHandler implements InvokeHandler{ if(invokeBean.getMethodRWType().equals(ReadWriteTypeEnum.WRITE.getCode())){ InterfaceBean bodtoConvertInterfaceBean = invokeBean.getPlantUmlContextBean().getDerivedPlantUmlContextBean().getInterfaceBeanMap().get(invokeBean.getInvokerClassBean().getBodtoConvertInterface()); if(bodtoConvertInterfaceBean == null){ - invokeBean.getMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(),invokeBean.getCurrentInvokeRowBean()); + invokeBean.getInvokerMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(),invokeBean.getCurrentInvokeRowBean()); return; } - MethodBean convertMethod = convertInvokeHandler.getConvertMethod(bodtoConvertInterfaceBean,invokeBean,"dto2bo("); + MethodBean convertMethod = convertInvokeService.getDTO2BOConvertMethod(bodtoConvertInterfaceBean,invokeBean); + if(convertMethod == null){ - invokeBean.getMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(),invokeBean.getCurrentInvokeRowBean()); + invokeBean.getInvokerMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(),invokeBean.getCurrentInvokeRowBean()); return; } - - String [] paramArr = invokeBean.getMethodBean().getParamArr(); - String convertParamType = convertMethod.getParamArr()[0]; - String convertParamStr = "null"; - for (String param : paramArr){ - if(param.startsWith(convertParamType)){ - convertParamStr = param.trim().split(" ")[1]; - } - } - - String returnClassName = convertMethod.getReturnClass(); - String invokeRow = returnClassName +" " - + returnClassName.substring(0,1).toLowerCase() - + returnClassName.substring(1) - + " = " + bodtoConvertInterfaceBean.getClassName() + ".INSTANCE.dto2bo("+convertParamStr+")"; - Optional oldRow = invokeBean.getMethodBean().getInvokeMethodList().stream().filter(str->str.equals(invokeRow)).findFirst(); + InvokeRowBean convertInvokeRowBean = convertInvokeService.buildInvokeConvertRow(invokeBean,convertMethod, bodtoConvertInterfaceBean.getClassName()); + String convertInvokeRow = convertInvokeRowBean.buildInvokeContent(); + String finalConvertInvokeRow = convertInvokeRow; + Optional oldRow = invokeBean.getInvokerMethodBean().getInvokeMethodList().stream().filter(str->str.equals(finalConvertInvokeRow)).findFirst(); if(oldRow.isPresent()){ - invokeBean.getMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(),invokeBean.getCurrentInvokeRowBean()); + invokeBean.getInvokerMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(),invokeBean.getCurrentInvokeRowBean()); return; } - invokeBean.getMethodBean().getInvokeMethodList().add(invokeRow); - invokeBean.getMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(),invokeBean.getCurrentInvokeRowBean()); + + invokeBean.getInvokerMethodBean().addInvokeRowContent(convertInvokeRow,convertInvokeRowBean); + String currentInvokeRowContent = invokeBean.getCurrentInvokeRowBean().refreshInvokeContent(convertInvokeRowBean,invokeBean.getPlantUmlContextBean()); + invokeBean.getInvokerMethodBean().addInvokeRowContent(currentInvokeRowContent,invokeBean.getCurrentInvokeRowBean()); //需要引用convert接口的时候注册引用包 - if(CollectionUtils.isEmpty(invokeBean.getInvokerClassBean().getDynamicImportPackageList())){ - invokeBean.getInvokerClassBean().setDynamicImportPackageList(new ArrayList<>()); - } invokeBean.getInvokerClassBean().getDynamicImportPackageList().add(bodtoConvertInterfaceBean.getPackageName()+"."+bodtoConvertInterfaceBean.getClassName()); } //读场景,对可能的被调用方的方法返回值进行bo->dto else if(invokeBean.getMethodRWType().equals(ReadWriteTypeEnum.READ.getCode())){ InterfaceBean bodtoConvertInterfaceBean = invokeBean.getPlantUmlContextBean().getDerivedPlantUmlContextBean().getInterfaceBeanMap().get(invokeBean.getInvokerClassBean().getBodtoConvertInterface()); + invokeBean.getInvokerMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(),invokeBean.getCurrentInvokeRowBean()); if(bodtoConvertInterfaceBean == null){ - invokeBean.getMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(),invokeBean.getCurrentInvokeRowBean()); return; } - - MethodBean convertMethod = convertInvokeHandler.getConvertMethod(bodtoConvertInterfaceBean,invokeBean,"bo2dto("); + MethodBean convertMethod = convertInvokeService.getConvertMethod(bodtoConvertInterfaceBean,invokeBean); if(convertMethod == null){ - invokeBean.getMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(),invokeBean.getCurrentInvokeRowBean()); return; } - String [] paramArr = invokeBean.getMethodBean().getParamArr(); - String convertParamType = convertMethod.getParamArr()[0]; - String convertParamStr = "null"; - for (String param : paramArr){ - if(param.startsWith(convertParamType)){ - convertParamStr = param.trim().split(" ")[1]; - } - } + InvokeRowBean convertRowBean = convertInvokeService.buildInvokeConvertRow(invokeBean,convertMethod, bodtoConvertInterfaceBean.getClassName()); + String convertInvokeRow = convertRowBean.buildInvokeContent(); + Optional oldConvertInvokeRow = invokeBean.getInvokerMethodBean().getInvokeMethodList().stream().filter(str->str.equals(convertInvokeRow)).findFirst(); - String returnClassName = convertMethod.getReturnClass(); - String invokeRow = returnClassName +" " - + returnClassName.substring(0,1).toLowerCase() - + returnClassName.substring(1) - + " = " + bodtoConvertInterfaceBean.getClassName() + ".INSTANCE.bo2dto("+convertParamStr+")"; - Optional oldRow = invokeBean.getMethodBean().getInvokeMethodList().stream().filter(str->str.equals(invokeRow)).findFirst(); - if(oldRow.isPresent()){ - invokeBean.getMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(),invokeBean.getCurrentInvokeRowBean()); + if(oldConvertInvokeRow.isPresent()){ return; } - invokeBean.getMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(),invokeBean.getCurrentInvokeRowBean()); - invokeBean.getMethodBean().getInvokeMethodList().add(invokeRow); - + invokeBean.getInvokerMethodBean().addInvokeRowContent(convertInvokeRow,convertRowBean); //需要引用convert接口的时候注册引用包 - if(CollectionUtils.isEmpty(invokeBean.getInvokerClassBean().getDynamicImportPackageList())){ - invokeBean.getInvokerClassBean().setDynamicImportPackageList(new ArrayList<>()); - } invokeBean.getInvokerClassBean().getDynamicImportPackageList().add(bodtoConvertInterfaceBean.getPackageName()+"."+bodtoConvertInterfaceBean.getClassName()); } else { - invokeBean.getMethodBean().getInvokeMethodList().add(invokeBean.getCurrentInvokeRowContent()); + invokeBean.getInvokerMethodBean().getInvokeMethodList().add(invokeBean.getCurrentInvokeRowContent()); } + + + + + } } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/DomainInvokeHandler.java b/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/DomainInvokeHandler.java similarity index 37% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/DomainInvokeHandler.java rename to codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/DomainInvokeHandler.java index 14348ca8004e82d6534573091bbb35b97617f5ad..32879f90c0a2717b8ee4ef7d86fbfdd61c8477f5 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/DomainInvokeHandler.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/DomainInvokeHandler.java @@ -1,19 +1,20 @@ -package com.coderman.codemaker.service.invoker; +package com.coderman.codemaker.service.invoker.handler; import com.coderman.codemaker.bean.invoke.InvokeContextBean; +import com.coderman.codemaker.bean.invoke.InvokeRowBean; import com.coderman.codemaker.bean.plantuml.ClassBean; import com.coderman.codemaker.bean.plantuml.InterfaceBean; import com.coderman.codemaker.bean.plantuml.MethodBean; import com.coderman.codemaker.enums.dynamic.InvokeSceneTypeEnum; import com.coderman.codemaker.enums.dynamic.ReadWriteTypeEnum; +import com.coderman.codemaker.service.invoker.ConvertInvokeService; +import com.coderman.codemaker.service.invoker.InvokeHandler; import org.apache.commons.lang3.StringUtils; -import org.assertj.core.util.Lists; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.util.ArrayList; -import java.util.List; import java.util.Optional; /** @@ -25,10 +26,12 @@ import java.util.Optional; * @since JDK 1.8 */ @Service(value = "domainInvokeHandler") -public class DomainInvokeHandler implements InvokeHandler{ +public class DomainInvokeHandler implements InvokeHandler { @Autowired - private ConvertInvokeHandler convertInvokeHandler; + private ConvertInvokeService convertInvokeService; + @Autowired + private DynamicConvertHandler dynamicConvertHandler; @Override public void dealInvoke(InvokeContextBean invokeBean) { @@ -39,53 +42,39 @@ public class DomainInvokeHandler implements InvokeHandler{ */ if(invokeBean.getInvokeSceneType() .equals(InvokeSceneTypeEnum.DOMAIN_TO_INFRAST.getCode()) && StringUtils.isEmpty(invokeBean.getMethodRWType())){ - String rwType = ReadWriteTypeEnum.getCodeByMethod(invokeBean.getProviderClassMethod()); + String rwType = ReadWriteTypeEnum.getCodeByMethod(invokeBean.getProviderClassMethod().getSimplMethodName()); invokeBean.setMethodRWType(rwType); } //写场景 if(invokeBean.getMethodRWType().equals(ReadWriteTypeEnum.WRITE.getCode())){ - InterfaceBean doboConvertInterfaceBean = convertInvokeHandler.getBODOConvertInterfaceBean(invokeBean); + InterfaceBean doboConvertInterfaceBean = convertInvokeService.getBODOConvertInterfaceBean(invokeBean); if(doboConvertInterfaceBean == null){ - invokeBean.getMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(),invokeBean.getCurrentInvokeRowBean()); + invokeBean.getInvokerMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(),invokeBean.getCurrentInvokeRowBean()); return; } Optional convertMethod = doboConvertInterfaceBean.getMethodBeanList().stream().filter(methodBean -> methodBean.getMethodName().startsWith("bo2do(")).findFirst(); if(!convertMethod.isPresent()){ - invokeBean.getMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(),invokeBean.getCurrentInvokeRowBean()); - + invokeBean.getInvokerMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(),invokeBean.getCurrentInvokeRowBean()); return; } - String paramContent = invokeBean.getMethodBean().getMethodName().split("\\(")[1].replace(")",""); - String [] paramArr = paramContent.split(","); - String convertParam = convertMethod.get().getMethodName().split("\\(")[1].replace(")","").trim(); - String convertClassName = convertParam.split(" ")[0]; - String convertParamStr = "null"; - for (String param : paramArr){ - if(param.startsWith(convertClassName)){ - convertParamStr = param.trim().split(" ")[1]; - } - } - String returnClassName = convertMethod.get().getReturnClass(); - String invokeRow = returnClassName +" " - + returnClassName.substring(0,1).toLowerCase() - + returnClassName.substring(1) - + " = " + doboConvertInterfaceBean.getClassName() + ".INSTANCE.bo2do("+convertParamStr+")"; - Optional oldRow = invokeBean.getMethodBean().getInvokeMethodList().stream().filter(str->str.equals(invokeRow)).findFirst(); + InvokeRowBean invokeRowBean = convertInvokeService.buildInvokeConvertRow(invokeBean,convertMethod.get(), doboConvertInterfaceBean.getClassName()); + String invokeRow = invokeRowBean.buildInvokeContent(); + String finalInvokeRow = invokeRow; + Optional oldRow = invokeBean.getInvokerMethodBean().getInvokeMethodList().stream().filter(str->str.equals(finalInvokeRow)).findFirst(); if(oldRow.isPresent()){ - invokeBean.getMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(),invokeBean.getCurrentInvokeRowBean()); + invokeBean.getInvokerMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(),invokeBean.getCurrentInvokeRowBean()); return; } - invokeBean.getMethodBean().getInvokeMethodList().add(invokeRow); - invokeBean.getMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(),invokeBean.getCurrentInvokeRowBean()); + invokeBean.getInvokerMethodBean().getInvokeMethodList().add(invokeRow); + invokeRow = invokeBean.getCurrentInvokeRowBean().refreshInvokeContent(invokeRowBean, invokeBean.getPlantUmlContextBean()); + invokeBean.getInvokerMethodBean().addInvokeRowContent(invokeRow,invokeBean.getCurrentInvokeRowBean()); - if(CollectionUtils.isEmpty(invokeBean.getInvokerClassBean().getDynamicImportPackageList())){ - invokeBean.getInvokerClassBean().setDynamicImportPackageList(new ArrayList<>()); - } + //需要引用convert接口的时候注册引用包 invokeBean.getInvokerClassBean().getDynamicImportPackageList().add(doboConvertInterfaceBean.getPackageName()+"."+doboConvertInterfaceBean.getClassName()); String providerMethodReturnClassName = convertMethod.get().getReturnClass(); @@ -99,66 +88,36 @@ public class DomainInvokeHandler implements InvokeHandler{ invokeBean.getInvokerClassBean().getDynamicImportPackageList().add(returnClassBean.getPackageName()+"."+returnClassBean.getClassName()); } - //读场景 else if(invokeBean.getMethodRWType().equals(ReadWriteTypeEnum.READ.getCode())){ - InterfaceBean doboConvertInterfaceBean = convertInvokeHandler.getBODOConvertInterfaceBean(invokeBean); - if(doboConvertInterfaceBean == null){ - invokeBean.getMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(),invokeBean.getCurrentInvokeRowBean()); - - return; - } - - Optional convertMethod = doboConvertInterfaceBean.getMethodBeanList().stream().filter(methodBean -> methodBean.getMethodName().startsWith("bo2do(")).findFirst(); - if(!convertMethod.isPresent()){ - invokeBean.getMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(),invokeBean.getCurrentInvokeRowBean()); + invokeBean.getInvokerMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(),invokeBean.getCurrentInvokeRowBean()); + InterfaceBean doboConvertInterfaceBean = convertInvokeService.getBODOConvertInterfaceBean(invokeBean); + invokeBean.getInvokerMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(),invokeBean.getCurrentInvokeRowBean()); + if(doboConvertInterfaceBean == null){ return; } - - String paramContent = invokeBean.getMethodBean().getMethodName().split("\\(")[1].replace(")",""); - String [] paramArr = paramContent.split(","); - String convertParam = convertMethod.get().getMethodName().split("\\(")[1].replace(")","").trim(); - String convertClassName = convertParam.split(" ")[0]; - String convertParamStr = "null"; - for (String param : paramArr){ - if(param.startsWith(convertClassName)){ - convertParamStr = param.trim().split(" ")[1]; - } - } - - String returnClassName = convertMethod.get().getReturnClass(); - String invokeRow = returnClassName +" " - + returnClassName.substring(0,1).toLowerCase() - + returnClassName.substring(1) - + " = " + doboConvertInterfaceBean.getClassName() + ".INSTANCE.bo2do("+convertParamStr+")"; - Optional oldRow = invokeBean.getMethodBean().getInvokeMethodList().stream().filter(str->str.equals(invokeRow)).findFirst(); - if(oldRow.isPresent()){ - invokeBean.getMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(),invokeBean.getCurrentInvokeRowBean()); - + MethodBean convertMethod = convertInvokeService.getConvertMethod(doboConvertInterfaceBean,invokeBean); + if(convertMethod == null){ return; } - invokeBean.getMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(),invokeBean.getCurrentInvokeRowBean()); - invokeBean.getMethodBean().getInvokeMethodList().add(invokeRow); - - if(CollectionUtils.isEmpty(invokeBean.getInvokerClassBean().getDynamicImportPackageList())){ - invokeBean.getInvokerClassBean().setDynamicImportPackageList(new ArrayList<>()); - } - invokeBean.getInvokerClassBean().getDynamicImportPackageList().add(doboConvertInterfaceBean.getPackageName()+"."+doboConvertInterfaceBean.getClassName()); - - String providerMethodReturnClassName = convertMethod.get().getReturnClass(); - ClassBean returnClassBean = invokeBean.getPlantUmlContextBean().getClassBeanMap().get(providerMethodReturnClassName); - if(returnClassBean == null){ - returnClassBean = invokeBean.getPlantUmlContextBean().getDerivedPlantUmlContextBean().getClassBeanMap().get(providerMethodReturnClassName); - } - if(returnClassBean == null){ - return; + InvokeRowBean convertRowBean = convertInvokeService.buildInvokeConvertRow(invokeBean,convertMethod, doboConvertInterfaceBean.getClassName()); + String convertRow = convertRowBean.buildInvokeContent(); + Optional oldConvertRow = invokeBean.getInvokerMethodBean().getInvokeMethodList().stream().filter(str->str.equals(convertRow)).findFirst(); + + if(!oldConvertRow.isPresent()){ + invokeBean.getInvokerMethodBean().addInvokeRowContent(convertRow,convertRowBean); + //需要引用convert接口的时候注册引用包 + invokeBean.getInvokerClassBean().getDynamicImportPackageList().add(doboConvertInterfaceBean.getPackageName()+"."+doboConvertInterfaceBean.getClassName()); } - invokeBean.getInvokerClassBean().getDynamicImportPackageList().add(returnClassBean.getPackageName()+"."+returnClassBean.getClassName()); } else { - invokeBean.getMethodBean().getInvokeMethodList().add(invokeBean.getCurrentInvokeRowContent()); + invokeBean.getInvokerMethodBean().getInvokeMethodList().add(invokeBean.getCurrentInvokeRowContent()); } + //对当前调用行背后的相关变量做潜在的对象类型转换，进一步降低书写对象转换的频率 + dynamicConvertHandler.dealInvoke(invokeBean); } + + } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/DynamicConvertHandler.java b/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/DynamicConvertHandler.java new file mode 100644 index 0000000000000000000000000000000000000000..36a9b66add991893ae83ce6e377e1f4034905cef --- /dev/null +++ b/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/DynamicConvertHandler.java @@ -0,0 +1,116 @@ +package com.coderman.codemaker.service.invoker.handler; + +import com.alibaba.fastjson.JSON; +import com.coderman.codemaker.bean.invoke.InvokeContextBean; +import com.coderman.codemaker.bean.invoke.InvokeRowBean; +import com.coderman.codemaker.bean.plantuml.ClassBean; +import com.coderman.codemaker.bean.plantuml.InterfaceBean; +import com.coderman.codemaker.bean.plantuml.MethodBean; +import com.coderman.codemaker.bean.plantuml.PlantUmlContextBean; +import com.coderman.codemaker.enums.TemplateFileEnum; +import com.coderman.codemaker.enums.dynamic.ReadWriteTypeEnum; +import com.coderman.codemaker.service.invoker.ConvertInvokeService; +import com.coderman.codemaker.service.invoker.InvokeHandler; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + * Description: + * 1.在一个对象关联多个对象进行写的时候给多个对象进行dto->bo的转换，或者bo->do的转换 + * 2.在一个对象关联多个对象进行读的时候，比如调用方service要调用多个mapper进行组装的时候，进行 + * do->bo，bo->dto,bo->vo的转换 + * + * date: 2021/11/5 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +@Service +@Slf4j +public class DynamicConvertHandler implements InvokeHandler { + + @Autowired + private ConvertInvokeService convertInvokeService; + + @Override + public void dealInvoke(InvokeContextBean invokeBean) { + List invokeRowBeanList = invokeBean.getInvokerMethodBean().getInvokeRowBeanList(); + InvokeRowBean invokeRowBean = invokeRowBeanList.get(invokeRowBeanList.size()-1); + + if(!providerIsReadMapper(invokeBean) || invokeRowBean.getProviderClassName().toLowerCase().endsWith(TemplateFileEnum.CONVERT.getTempFileName())){ + return; + } + InvokeRowBean lastInvokeRow = invokeRowBeanList.get(invokeRowBeanList.size()-1); + String returnClassName = lastInvokeRow.getReturnClassName(); + String classDOPreFix = getHumpClassDOName(returnClassName); + if(StringUtils.isEmpty(classDOPreFix)){ + return; + } + InterfaceBean convertInterfaceBean = getBODOConvertInterfaceBean(classDOPreFix,invokeBean.getPlantUmlContextBean()); + if(convertInterfaceBean == null){ + return; + } + + MethodBean convertMethod = convertInvokeService.getDOBOConvertMethod(convertInterfaceBean,lastInvokeRow.getReturnClassName()); + log.info("methodBean = "+ JSON.toJSONString(convertMethod)); + + InvokeRowBean convertRowBean = convertInvokeService.buildInvokeConvertRow(invokeBean,convertMethod, convertInterfaceBean.getClassName()); + String convertRow = convertRowBean.buildInvokeContent(); + + invokeBean.getInvokerMethodBean().addInvokeRowContent(convertRow,convertRowBean); + //需要引用convert接口的时候注册引用包 + invokeBean.getInvokerClassBean().getDynamicImportPackageList().add(convertInterfaceBean.getPackageName()+"."+convertInterfaceBean.getClassName()); + } + + /** + * 判断被调用方是否是mapper的读方法 + * @param invokeBean + * @return + */ + private Boolean providerIsReadMapper(InvokeContextBean invokeBean){ + String providerClassName = invokeBean.getProviderClassName(); + return providerClassName.toLowerCase().endsWith(TemplateFileEnum.MAPPER.getTempFileName()) && invokeBean.getMethodRWType().equals(ReadWriteTypeEnum.READ.getCode()); + } + + /** + * 通过mapper接口的返回值获取DO类名前缀 + * @param returnClassName + * @return + */ + private String getHumpClassDOName(String returnClassName){ + return returnClassName.replace("List","") + .replace("<","") + .replace(">","") + .replace("Set","") + .replace("DO",""); + + } + + /** + * 根据BO类上的表信息等获取转换bodo转换类 + * @param classDOPreFix + * @param plantUmlContextBean + * @return + */ + private InterfaceBean getBODOConvertInterfaceBean(String classDOPreFix, PlantUmlContextBean plantUmlContextBean){ + String convertInterfacName = ""; + for (Map.Entry entry : plantUmlContextBean.getClassBeanMap().entrySet()){ + if(entry.getValue().getTableBean() != null && entry.getValue().getTableBean().getHumpClassName().equals(classDOPreFix)){ + convertInterfacName = entry.getValue().getBodoConvertInterface(); + break; + } + } + + if(StringUtils.isNotEmpty(convertInterfacName)){ + return plantUmlContextBean.getDerivedPlantUmlContextBean().getInterfaceBeanMap().get(convertInterfacName); + } + return null; + } + +} diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/InfrastInvokeHandler.java b/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/InfrastInvokeHandler.java similarity index 55% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/InfrastInvokeHandler.java rename to codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/InfrastInvokeHandler.java index a2f50412208e3bf26d0bf13b81ab4d9a90ab83de..c207294ce977060036a9de3610df135c1f1ece97 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/InfrastInvokeHandler.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/InfrastInvokeHandler.java @@ -1,6 +1,7 @@ -package com.coderman.codemaker.service.invoker; +package com.coderman.codemaker.service.invoker.handler; import com.coderman.codemaker.bean.invoke.InvokeContextBean; +import com.coderman.codemaker.service.invoker.InvokeHandler; import org.springframework.stereotype.Service; /** @@ -12,9 +13,9 @@ import org.springframework.stereotype.Service; * @since JDK 1.8 */ @Service(value = "infrastInvokeHandler") -public class InfrastInvokeHandler implements InvokeHandler{ +public class InfrastInvokeHandler implements InvokeHandler { @Override public void dealInvoke(InvokeContextBean invokeBean) { - invokeBean.getMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(),invokeBean.getCurrentInvokeRowBean()); + invokeBean.getInvokerMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(),invokeBean.getCurrentInvokeRowBean()); } } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/plantuml/PlantUMLService.java b/codemaker-core/src/main/java/com/coderman/codemaker/service/plantuml/PlantUMLService.java deleted file mode 100644 index 4f2606b6bda64722c627ba02d058d4f7abe28704..0000000000000000000000000000000000000000 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/plantuml/PlantUMLService.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.coderman.codemaker.service.plantuml; - -import com.coderman.codemaker.bean.plantuml.ClassBean; -import com.coderman.codemaker.bean.plantuml.EnumBean; -import com.coderman.codemaker.bean.plantuml.InterfaceBean; -import com.coderman.codemaker.bean.plantuml.PackageBean; - -import java.util.List; - -/** - * Description: - * date: 2021/7/2 - * - * @author fanchunshuai - * @version 1.0.0 - * @since JDK 1.8 - */ -public interface PlantUMLService { - /** - * 读取plantUML中的class信息 - * @param packageName 可选值，如果不为空则基于包模式解析，否则基于类模式 - * @return - */ - List readClassBeanList(String packageName); - - /** - * 读取plantUML中的enum信息 - * @param packageName 可选值，如果不为空则基于包模式解析，否则基于枚举模式 - * @return - */ - List readEnumBeanList(String packageName); - - /** - * 读取plantUMl中的interface信息 - * @param packageName 可选值，如果不为空则基于包模式解析，否则基于包模式 - * @return - */ - List readInterfaceBeanList(String packageName); - - /** - * 获取plantuml中的所有包列表 - * @return - */ - List getPackageList(); - - /** - * 通过package模式读取解析plantuml内容 - * @return - */ - List readPacakge(); - -} diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/plantuml/PlantUMLServiceImpl.java b/codemaker-core/src/main/java/com/coderman/codemaker/service/plantuml/PlantUMLServiceImpl.java deleted file mode 100644 index a077e16bf921e2d03f7b4331d8b8778ce99b82fc..0000000000000000000000000000000000000000 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/plantuml/PlantUMLServiceImpl.java +++ /dev/null @@ -1,380 +0,0 @@ -package com.coderman.codemaker.service.plantuml; - -import com.coderman.codemaker.bean.plantuml.*; -import com.coderman.codemaker.config.ProjectTemplateDynamicDDDConfig; -import com.coderman.codemaker.enums.ClassEnum; -import com.coderman.codemaker.enums.ClassRelationEnum; -import com.coderman.codemaker.enums.VisibilityEnum; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.io.FileUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.ResourceUtils; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * Description: - * date: 2021/7/2 - * - * @author fanchunshuai - * @version 1.0.0 - * @since JDK 1.8 - */ -@Service -public class PlantUMLServiceImpl implements PlantUMLService { - - @Autowired - private ProjectTemplateDynamicDDDConfig projectTemplateDynamicDDDConfig; - - private List contentList; - - - private PlantUmlContextBean plantUmlContextBean; - - public List getContentList() { - return contentList; - } - - public void setContentList(List contentList) { - this.contentList = contentList; - } - - @Override - public List readClassBeanList(String packageName) { - return null; - } - - @Override - public List readEnumBeanList(String packageName) { - return null; - } - - @Override - public List readInterfaceBeanList(String packageName) { - return null; - } - - @Override - public List getPackageList() { - return null; - } - - @Override - public List readPacakge() { - return null; - } - - /** - * 读取plantUMl文件 - * @return - */ - private List readPlantUMLContent(){ - try { - File file = ResourceUtils.getFile("classpath:ddd-plantuml/"+projectTemplateDynamicDDDConfig.getPlantumlFileName()); - return FileUtils.readLines(file,"UTF-8"); - } catch (IOException e) { - e.printStackTrace(); - } - return null; - } - - - /** - * 解析plantUML文件内容 - * @return - */ - private void getPlantUmlContextBean(){ - List contentList = readPlantUMLContent(); - List elementList = new ArrayList<>(); - PlantUmlContextBean plantUmlContextBean = new PlantUmlContextBean(); - - String currentPackage= ""; - //对class,enum,interface进行解析 - for(String str : contentList){ - if(StringUtils.isEmpty(str) || str.contains("@startuml") || str.contains("package")){ - continue; - } - - if(str.contains("package")){ - currentPackage = str.trim().replace("package","").replace("{","").trim(); - continue; - } - - if(str.trim().contains("{")){ - elementList.add(str.trim()); - continue; - } - if(str.trim().contains("}")){ - elementList.add(str.trim()); - parseClassElement(elementList,plantUmlContextBean,currentPackage); - elementList.clear(); - continue; - } - elementList.add(str.trim()); - } - - //对类与类的关系进行解析 - Map> relationListMap = new HashMap<>(); - for(String str : contentList){ - if(StringUtils.isEmpty(str) || str.contains("@startuml") - || str.contains("package") || str.trim().contains("{") || str.trim().contains("}")){ - continue; - } - - Map relationMap = ClassRelationEnum.parseRelation(str); - if(relationMap == null || relationMap.size()<2){ - continue; - } - List relationList = relationListMap.get(relationMap.get("class")); - if(CollectionUtils.isEmpty(relationList)){ - relationList = new ArrayList<>(); - } - relationList.add(relationMap.get("relation")); - relationListMap.put(relationMap.get("class").trim(),relationList); - } - - plantUmlContextBean.getClassBeanMap().forEach((className,classBean)->{ - List relationList = relationListMap.get(className); - if(CollectionUtils.isNotEmpty(relationList)){ - classBean.setRelationClassStr(StringUtils.join(relationList,",")); - } - }); - - this.plantUmlContextBean = plantUmlContextBean; - } - - - /** - * 解析文件内容整体路由 - * @param elementList - * @param plantUmlContextBean - */ - private void parseClassElement(List elementList, PlantUmlContextBean plantUmlContextBean, String currentPackage){ - String classType = getClassType(elementList.get(0)); - if(classType.equals(ClassEnum.CLASS.getClassType())){ - ClassBean classBean = buildClassBean(elementList); - classBean.setPlantUMLPackage(currentPackage); - plantUmlContextBean.addClassBean(classBean); - } - else if(classType.equals(ClassEnum.ENUM.getClassType())){ - EnumBean enumBean = builEnumBean(elementList); - enumBean.setPlantUMLPackage(currentPackage); - plantUmlContextBean.addEnumBean(enumBean); - } - else if(classType.equals(ClassEnum.INTERFACE.getClassType())){ - InterfaceBean interfaceBean = buildInterfaceBean(elementList); - interfaceBean.setPlantUMLPackage(currentPackage); - plantUmlContextBean.addInterfaceBean(interfaceBean); - } - - - } - - - private String getClassType(String ele){ - return ele.split(" ")[0]; - } - - /** - * 解析class类型数据 - * @param elementList - * @return - */ - private ClassBean buildClassBean(List elementList ){ - - String[] array = elementList.get(0).trim().replace("{","").trim().split(" "); - - String classMetaInfoArr = array[1]; - List fieldBeanList = getFieldBeanList(elementList.subList(1,elementList.size())); - List methodBeanList = getMethodBeanList(elementList.subList(1,elementList.size())); - ClassBean classBean = new ClassBean(); - classBean.setFieldBeanList(fieldBeanList); - classBean.setMethodBeanList(methodBeanList); - classBean.setClassName(classMetaInfoArr.split("-")[1].replace("\"","")); - classBean.setClassDesc(classMetaInfoArr.split("-")[0].replace("\"","")); - return classBean; - } - - /** - * 解析接口类型数据 - * @param elementList - * @return - */ - private InterfaceBean buildInterfaceBean(List elementList ){ - - String[] array = elementList.get(0).trim().replace("{","").trim().split(" "); - - String classMetaInfoArr = array[1]; - List methodBeanList = getMethodBeanList(elementList.subList(1,elementList.size())); - InterfaceBean interfaceBean = new InterfaceBean(); - interfaceBean.setMethodBeanList(methodBeanList); - interfaceBean.setClassName(classMetaInfoArr.split("-")[1].replace("\"","")); - interfaceBean.setClassDesc(classMetaInfoArr.split("-")[0].replace("\"","")); - return interfaceBean; - } - - /** - * 解析enum类型数据 - * @param elementList - * @return - */ - private EnumBean builEnumBean(List elementList ){ - - String[] array = elementList.get(0).trim().replace("{","").trim().split(" "); - - String classMetaInfoArr = array[1]; - List fieldBeanList = getFieldBeanList(elementList.subList(1,elementList.size())); - EnumBean enumBean = new EnumBean(); - enumBean.setFieldBeanList(fieldBeanList); - enumBean.setClassName(classMetaInfoArr.split("-")[1].replace("\"","")); - enumBean.setClassDesc(classMetaInfoArr.split("-")[0].replace("\"","")); - dealEnumMethodBeanList(elementList,enumBean); - return enumBean; - } - - /** - * 获取类的属性列表 - * @param elementList - * @return - */ - private List getFieldBeanList(List elementList){ - List fieldBeanList = new ArrayList<>(); - - for (String fieldStr : elementList){ - if(fieldStr.contains("(") || fieldStr.contains(")")){ - continue; - } - if(!fieldStr.trim().contains(":")){ - continue; - } - //+主交易单类型:string tradeOrderType - String[] fieldArr = fieldStr.trim().split(":"); - FieldBean fieldBean = new FieldBean(); - fieldBean.setDesc(fieldArr[0]); - fieldBean.setVisibility(VisibilityEnum.getVisibilityStr(fieldArr[0])); - fieldBean.setFieldName(fieldArr[1]); - fieldBeanList.add(fieldBean); - } - return fieldBeanList; - } - - /** - * 获取类的方法列表 - * @param elementList - * @return - */ - private List getMethodBeanList(List elementList){ - List methodBeanList = new ArrayList<>(); - for (String fieldStr : elementList){ - - if(!fieldStr.contains("()") && !fieldStr.contains("(") && !fieldStr.contains(")")){ - continue; - } - MethodBean methodBean =new MethodBean(); - - //-创建变更日志: TradeOrderLogBO getTradeOrderLogBO() - if(fieldStr.contains(":")){ - String[] fieldArr = fieldStr.trim().split(":"); - methodBean.setVisibility(VisibilityEnum.getVisibilityStr(fieldArr[1])); - methodBean.setDesc(fieldArr[0]); - - String[] arr = fieldArr[1].trim().split(" "); - if(arr.length == 2){ - methodBean.setReturnClass(arr[0]); - methodBean.setMethodName(arr[1]); - }else{ - methodBean.setReturnClass(arr[0]); - methodBean.setMethodName(fieldArr[1].trim().replace(arr[0],"")); - } - }else { - String[] fieldArr = fieldStr.trim().split(" "); - //没有注释--->中文校验 - if(fieldArr.length ==2){ - methodBean.setVisibility(VisibilityEnum.getVisibilityStr(fieldStr.trim())); - methodBean.setReturnClass(fieldStr.trim().split(" ")[0]); - methodBean.setMethodName(fieldStr.trim().split(" ")[1]); - }else{ - methodBean.setDesc(fieldArr[0]); - methodBean.setVisibility(VisibilityEnum.getVisibilityStr(fieldStr.trim())); - methodBean.setReturnClass(fieldArr[1]); - StringBuilder builder = new StringBuilder(); - for (int i = 2;i elementList, EnumBean enumBean){ - List methodBeanList = new ArrayList<>(); - List enumValueList = new ArrayList<>(); - for (String fieldStr : elementList){ - if(!fieldStr.contains("()") && !fieldStr.contains("(") && !fieldStr.contains(")")){ - continue; - } - - //处理枚举值 - String valueCode = fieldStr.substring(0,fieldStr.indexOf("(")); - if(!StringUtils.isEmpty(valueCode) && !valueCode.contains(" ")){ - enumValueList.add(fieldStr); - continue; - } - - MethodBean methodBean =new MethodBean(); - - //-创建变更日志: TradeOrderLogBO getTradeOrderLogBO() - if(fieldStr.contains(":")){ - String[] fieldArr = fieldStr.trim().split(":"); - methodBean.setVisibility(VisibilityEnum.getVisibilityStr(fieldArr[0])); - methodBean.setDesc(fieldArr[0]); - methodBean.setReturnClass(fieldArr[1].trim().split(" ")[0]); - methodBean.setMethodName(fieldArr[1].trim().split(" ")[1]); - }else { - String[] fieldArr = fieldStr.trim().split(" "); - //没有注释--->中文校验 - if(fieldArr.length ==2){ - methodBean.setVisibility(VisibilityEnum.getVisibilityStr(fieldStr.trim())); - methodBean.setReturnClass(fieldStr.trim().split(" ")[0]); - methodBean.setMethodName(fieldStr.trim().split(" ")[1]); - }else{ - methodBean.setDesc(fieldArr[0]); - methodBean.setVisibility(VisibilityEnum.getVisibilityStr(fieldStr.trim())); - methodBean.setReturnClass(fieldArr[1]); - StringBuilder builder = new StringBuilder(); - for (int i = 2;i readPlantUMLContent(String plantUMLFileName){ - if(StringUtils.isEmpty(plantUMLFileName)){ - log.error("plantUMLFileName is empty,can't read content----------------!!!!!!!!!!"); - return null; - } - try { - File file = ResourceUtils.getFile("classpath:ddd-plantuml/"+plantUMLFileName); - return FileUtils.readLines(file,"UTF-8"); - } catch (IOException e) { - e.printStackTrace(); - } - return null; - } + + @Autowired + private ReadPlantUMLDocService readPlantUMLDocService; /** @@ -60,7 +48,7 @@ public class ReadPlantUMLFileServiceV2 { * @return */ public PlantUmlContextBean getPlantUmlContextBean(String plantUMLFileName){ - List contentList = readPlantUMLContent(plantUMLFileName); + List contentList = readPlantUMLDocService.readDomainPlantDoc(plantUMLFileName); if(CollectionUtils.isEmpty(contentList)){ return null; } @@ -70,26 +58,27 @@ public class ReadPlantUMLFileServiceV2 { String currentPackage= ""; //对class,enum,interface进行解析 for(String str : contentList){ - if(StringUtils.isEmpty(str) || str.contains("@startuml")){ + String content = str.trim(); + if(StringUtils.isEmpty(content) || content.contains("@startuml") || content.startsWith(GlobalConstant.PLANT_DOC_IGNORE)){ continue; } - if(str.contains("package")){ - currentPackage = str.trim().replace("package","").replace("{","").trim(); + if(content.contains("package")){ + currentPackage = content.replace("package","").replace("{","").trim(); continue; } - if(str.trim().contains("{")){ - elementList.add(str.trim()); + if(content.contains("{")){ + elementList.add(content); continue; } - if(str.trim().contains("}")){ - elementList.add(str.trim()); + if(content.contains("}")){ + elementList.add(content); parseClassElement(elementList,plantUmlContextBean,currentPackage); elementList.clear(); continue; } - elementList.add(str.trim()); + elementList.add(content); } //对类与类的关系进行解析 @@ -123,10 +112,14 @@ public class ReadPlantUMLFileServiceV2 { plantUmlContextBean.getClassBeanMap().forEach((className,classBean)->{ List fieldBeanList = classBean.getFieldBeanList(); Set fieldNameSet = new HashSet<>(); + Set fieldSimpleNameSet = new HashSet<>(); fieldBeanList.forEach(fieldBean -> { - if(fieldNameSet.contains(fieldBean.getFieldName())){ - log.error("属性重复,类名{},属性名:{}",className,fieldBean.getFieldName()); + fieldBean.buildFieldDetail(); + if(fieldNameSet.contains(fieldBean.getFieldName()) || fieldSimpleNameSet.contains(fieldBean.getFieldSimpleName())){ + log.error("属性重复,类名{},属性信息:{}",className, fieldBean.toString()); } + + fieldSimpleNameSet.add(fieldBean.getFieldSimpleName()); fieldNameSet.add(fieldBean.getFieldName()); }); @@ -155,7 +148,6 @@ public class ReadPlantUMLFileServiceV2 { return plantUmlContextBean; } - /** * 解析文件内容整体路由 * @param elementList diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/ReadInvokePlantUMLFileService.java b/codemaker-core/src/main/java/com/coderman/codemaker/service/plantuml/ReadInvokeSequencePlantDocService.java similarity index 42% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/ReadInvokePlantUMLFileService.java rename to codemaker-core/src/main/java/com/coderman/codemaker/service/plantuml/ReadInvokeSequencePlantDocService.java index 6ec3bcbe9d8118040dfa54c7839752cdc8de7437..9e587e1daa04ebe12682d90ea44585cd0c2603de 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/ReadInvokePlantUMLFileService.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/service/plantuml/ReadInvokeSequencePlantDocService.java @@ -1,22 +1,17 @@ -package com.coderman.codemaker.service; +package com.coderman.codemaker.service.plantuml; import com.coderman.codemaker.bean.GlobalConstant; import com.coderman.codemaker.bean.invoke.InvokeContextBean; import com.coderman.codemaker.bean.plantuml.*; -import com.coderman.codemaker.service.invoker.MethodInvokeHandler; +import com.coderman.codemaker.service.invoker.MethodFactoryService; +import com.coderman.codemaker.service.invoker.MethodInvokeService; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.io.FileUtils; -import org.apache.commons.lang3.StringUtils; import org.assertj.core.util.Lists; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import org.springframework.util.ResourceUtils; -import java.io.File; -import java.io.IOException; import java.util.ArrayList; -import java.util.LinkedList; import java.util.List; import java.util.Optional; import java.util.concurrent.atomic.AtomicInteger; @@ -32,171 +27,138 @@ import java.util.concurrent.atomic.AtomicReference; */ @Service @Slf4j -public class ReadInvokePlantUMLFileService { +public class ReadInvokeSequencePlantDocService { @Autowired - private MethodInvokeHandler methodInvokeHandler; + private MethodInvokeService methodInvokeHandler; - /** - * 读取plantUMl文件 - * @param plantUMLFileName - * @return - */ - private List readPlantUMLContent(String plantUMLFileName){ - if(StringUtils.isEmpty(plantUMLFileName)){ - log.error("plantUMLFileName is empty,can't read content----------------!!!!!!!!!!"); - return null; - } - try { - File file = ResourceUtils.getFile("classpath:invoke-plantuml/"+plantUMLFileName); - return FileUtils.readLines(file,"UTF-8"); - } catch (IOException e) { - e.printStackTrace(); - } - return null; - } + @Autowired + private ReadPlantUMLDocService readPlantUMLDocService; + @Autowired + private MethodFactoryService methodFactoryService; /** * 解析plantUML文件内容 + * * @return */ - public void parseInvokeChainList( PlantUmlContextBean plantUmlContextBean,String plantUMLFileName){ - List contentList = readPlantUMLContent(plantUMLFileName); + public void parseInvokeChainList(PlantUmlContextBean plantUmlContextBean, String plantUMLFileName) { + List contentList = readPlantUMLDocService.readInvokeSequencePlantDoc(plantUMLFileName); List elementList = new ArrayList<>(); - for(String str : contentList){ - if(str.trim().contains(GlobalConstant.INVOKE_TAG)){ + for (String str : contentList) { + if (str.trim().contains(GlobalConstant.INVOKE_TAG)) { elementList.add(str.trim()); } } - for(String invokeContent : elementList){ - dealInvokeMethodConent(invokeContent,plantUmlContextBean); + for (String invokeContent : elementList) { + dealInvokeMethodConent(invokeContent, plantUmlContextBean); } } /** * 对调用方的method进行动态绘制 + * * @param invokeContent * @param plantUmlContextBean */ - private void dealInvokeMethodConent(String invokeContent, PlantUmlContextBean plantUmlContextBean){ - String [] invokeArr = invokeContent.split(GlobalConstant.INVOKE_TAG); - AbstractClassBean invokerClassBean = getTargetClass(invokeArr[0],plantUmlContextBean); - AbstractClassBean providerClassBean = getTargetClass(invokeArr[1],plantUmlContextBean); + private void dealInvokeMethodConent(String invokeContent, PlantUmlContextBean plantUmlContextBean) { + String[] invokeArr = invokeContent.split(GlobalConstant.INVOKE_TAG); + AbstractClassBean invokerClassBean = getTargetClass(invokeArr[0], plantUmlContextBean); + AbstractClassBean providerClassBean = getTargetClass(invokeArr[1], plantUmlContextBean); - if(invokerClassBean == null || providerClassBean == null){ - log.error("获取调用者类名 或者提供者类名为空,绘制动态调用失败,invokeContent = {}",invokeContent); + if (invokerClassBean == null || providerClassBean == null) { + log.error("获取调用者类名 或者提供者类名为空,绘制动态调用失败,invokeContent = {}", invokeContent); return; } - String invokerMethod = invokeArr[0].toLowerCase().split(invokerClassBean.getClassName().toLowerCase()+".")[1].trim()+"("; + if(org.apache.commons.collections4.CollectionUtils.isEmpty(invokerClassBean.getDynamicImportPackageList())){ + invokerClassBean.setDynamicImportPackageList(Lists.newArrayList()); + } - String providerMethod = invokeArr[1].toLowerCase().split(providerClassBean.getClassName().toLowerCase()+".")[1].trim()+"("; + String invokerMethodStr = invokeArr[0].split(invokerClassBean.getClassName() + ".")[1].trim(); - Optional providerMethodBean = providerClassBean.getMethodBeanList().stream().filter(methodBean -> methodBean.getMethodName().toLowerCase().startsWith(providerMethod)).findFirst(); + String providerMethodStr = invokeArr[1].split(providerClassBean.getClassName() + ".")[1].trim(); - Optional invokerMethodBean = invokerClassBean.getMethodBeanList().stream().filter(methodBean -> methodBean.getMethodName().toLowerCase().startsWith(invokerMethod)).findFirst(); - if(!providerMethodBean.isPresent() || !invokerMethodBean.isPresent()){ - log.error("获取调用者方法名 或者提供者方法名为空,绘制动态调用失败,invokeContent = {}",invokeContent); + //如果被调用方的方法不在plantuml领域文档中，则根据方法名智能推导出一个方法走下面的流程 + MethodBean providerMethodBean = methodFactoryService.buildDynamicMethod(plantUmlContextBean,providerClassBean,providerMethodStr); + MethodBean invokerMethodBean = invokerClassBean.getOrAddMethodBean(invokerMethodStr); + InvokeContextBean invokeBean = new InvokeContextBean(); + invokeBean.setInvokerMethodBean(invokerMethodBean); + invokeBean.setPlantUmlContextBean(plantUmlContextBean); + invokeBean.setInvokerMethod(invokerMethodStr); + invokeBean.setProviderClassName(providerClassBean.getClassName()); + invokeBean.setProviderClassMethod(providerMethodBean); + invokeBean.buildInvokeScene(invokerClassBean.getClassName(), providerClassBean.getClassName()); + invokeBean.setInvokerClassBean(invokerClassBean); + + boolean result = plantUmlContextBean.addInvokeMethod(invokeBean); + if (!result) { return; } - InvokeContextBean invokeBean = new InvokeContextBean(); - - if(invokerMethodBean.isPresent()){ - MethodBean methodBean = invokerMethodBean.get(); - if(CollectionUtils.isEmpty(methodBean.getInvokeMethodList())){ - methodBean.initInvokeRowContentList(); - } - invokeBean.setMethodBean(methodBean); - invokeBean.setPlantUmlContextBean(plantUmlContextBean); - invokeBean.setInvokerMethod(invokerMethod); - invokeBean.setProviderClassName(providerClassBean.getClassName()); - invokeBean.setProviderClassMethod(providerMethodBean.get().getMethodName()); - invokeBean.setProviderClassMethodReturn(providerMethodBean.get().getReturnClass()); - invokeBean.buildInvokeScene(invokerClassBean.getClassName(),providerClassBean.getClassName()); - invokeBean.setInvokerClassBean(invokerClassBean); - - boolean result = plantUmlContextBean.addInvokeMethod(invokeBean); - if(!result){ - return; - } - } + //处理动态调用内容 methodInvokeHandler.dealInvokeContent(invokeBean); - - - - //注册被调用方的field methodInvokeHandler.registField(invokerClassBean, providerClassBean); //注册被调用方的方法返回值引用包 - methodInvokeHandler.registImportPackageByClass(invokerClassBean,plantUmlContextBean,providerMethodBean.get().getReturnClass()); + methodInvokeHandler.registImportPackageByClass(invokerClassBean, plantUmlContextBean, providerMethodBean.getReturnClass()); //更新plantumlcontext上下文 - refreshPlantUmlContext(invokerClassBean,plantUmlContextBean); + refreshPlantUmlContext(invokerClassBean, plantUmlContextBean); } - /** * 从调用描述中获取调用类或者被调用类 + * * @param invokerClassContent * @param plantUmlContextBean * @return */ - private AbstractClassBean getTargetClass(String invokerClassContent,PlantUmlContextBean plantUmlContextBean){ + private AbstractClassBean getTargetClass(String invokerClassContent, PlantUmlContextBean plantUmlContextBean) { AtomicReference abstractClassBean = new AtomicReference<>(); AtomicInteger size = new AtomicInteger(0); - plantUmlContextBean.getInterfaceBeanMap().forEach((k,v)->{ - v.getMethodBeanList().forEach(methodBean -> { - String methodInfo = k.toLowerCase()+"."+methodBean.getSimplMethodName().toLowerCase(); - if(invokerClassContent.trim().toLowerCase().endsWith(methodInfo) && methodInfo.length() > size.get()){ - abstractClassBean.set(v); - size.set(methodInfo.length()); - } - }); + String [] contentArr = invokerClassContent.split("\\."); + + plantUmlContextBean.getInterfaceBeanMap().forEach((k, v) -> { + if(v.checkMatchClass(contentArr) && v.getClassName().length() > size.get()){ + abstractClassBean.set(v); + size.set(v.getClassName().length()); + } }); - plantUmlContextBean.getClassBeanMap().forEach((k,v)->{ - v.getMethodBeanList().forEach(methodBean -> { - String methodInfo = k.toLowerCase()+"."+methodBean.getSimplMethodName().toLowerCase(); - if(invokerClassContent.trim().toLowerCase().endsWith(methodInfo) && methodInfo.length() > size.get()){ - abstractClassBean.set(v); - size.set(methodInfo.length()); - } - }); + plantUmlContextBean.getClassBeanMap().forEach((k, v) -> { + if(v.checkMatchClass(contentArr) && v.getClassName().length() > size.get()){ + abstractClassBean.set(v); + size.set(v.getClassName().length()); + } }); - if(abstractClassBean.get() != null){ + if (abstractClassBean.get() != null) { return abstractClassBean.get(); } - if(plantUmlContextBean.getDerivedPlantUmlContextBean() != null){ - plantUmlContextBean.getDerivedPlantUmlContextBean().getInterfaceBeanMap().forEach((k,v)->{ - v.getMethodBeanList().forEach(methodBean -> { - String methodInfo = k.toLowerCase()+"."+methodBean.getSimplMethodName().toLowerCase(); - if(invokerClassContent.trim().toLowerCase().endsWith(methodInfo) && methodInfo.length() > size.get()){ - abstractClassBean.set(v); - size.set(methodInfo.length()); - } - }); + if (plantUmlContextBean.getDerivedPlantUmlContextBean() != null) { + plantUmlContextBean.getDerivedPlantUmlContextBean().getInterfaceBeanMap().forEach((k, v) -> { + if(v.checkMatchClass(contentArr) && v.getClassName().length() > size.get()){ + abstractClassBean.set(v); + size.set(v.getClassName().length()); + } }); - plantUmlContextBean.getDerivedPlantUmlContextBean().getClassBeanMap().forEach((k,v)->{ - v.getMethodBeanList().forEach(methodBean -> { - String methodInfo = k.toLowerCase()+"."+methodBean.getSimplMethodName().toLowerCase(); - if(invokerClassContent.trim().toLowerCase().endsWith(methodInfo) && methodInfo.length() > size.get()){ - abstractClassBean.set(v); - size.set(methodInfo.length()); - } - }); + plantUmlContextBean.getDerivedPlantUmlContextBean().getClassBeanMap().forEach((k, v) -> { + if(v.checkMatchClass(contentArr) && v.getClassName().length() > size.get()){ + abstractClassBean.set(v); + size.set(v.getClassName().length()); + } }); } - if(abstractClassBean.get() != null){ + if (abstractClassBean.get() != null) { return abstractClassBean.get(); } @@ -205,43 +167,46 @@ public class ReadInvokePlantUMLFileService { } + + /** * 更新plantUMlcontext上下文 + * * @param invokerClassBean * @param plantUmlContextBean */ - private void refreshPlantUmlContext(AbstractClassBean invokerClassBean,PlantUmlContextBean plantUmlContextBean){ + private void refreshPlantUmlContext(AbstractClassBean invokerClassBean, PlantUmlContextBean plantUmlContextBean) { InterfaceBean oldInterface = plantUmlContextBean.getInterfaceBeanMap().get(invokerClassBean.getClassName()); - if(oldInterface != null){ + if (oldInterface != null) { oldInterface.setFieldBeanList(invokerClassBean.getFieldBeanList()); oldInterface.setMethodBeanList(invokerClassBean.getMethodBeanList()); - plantUmlContextBean.getInterfaceBeanMap().put(oldInterface.getClassName(),oldInterface); + plantUmlContextBean.getInterfaceBeanMap().put(oldInterface.getClassName(), oldInterface); return; } ClassBean oldClass = plantUmlContextBean.getClassBeanMap().get(invokerClassBean.getClassName()); - if(oldClass != null){ + if (oldClass != null) { oldClass.setFieldBeanList(invokerClassBean.getFieldBeanList()); oldClass.setMethodBeanList(invokerClassBean.getMethodBeanList()); oldClass.mergeImportClass(invokerClassBean.getDynamicImportPackageList()); - plantUmlContextBean.getClassBeanMap().put(oldClass.getClassName(),oldClass); + plantUmlContextBean.getClassBeanMap().put(oldClass.getClassName(), oldClass); return; } ClassBean oldDervidClass = plantUmlContextBean.getDerivedPlantUmlContextBean().getClassBeanMap().get(invokerClassBean.getClassName()); - if(oldDervidClass != null){ + if (oldDervidClass != null) { oldDervidClass.setFieldBeanList(invokerClassBean.getFieldBeanList()); oldDervidClass.setMethodBeanList(invokerClassBean.getMethodBeanList()); oldDervidClass.mergeImportClass(invokerClassBean.getDynamicImportPackageList()); - plantUmlContextBean.getDerivedPlantUmlContextBean().getClassBeanMap().put(oldDervidClass.getClassName(),oldDervidClass); + plantUmlContextBean.getDerivedPlantUmlContextBean().getClassBeanMap().put(oldDervidClass.getClassName(), oldDervidClass); return; } InterfaceBean oldDervidInterface = plantUmlContextBean.getDerivedPlantUmlContextBean().getInterfaceBeanMap().get(invokerClassBean.getClassName()); - if(oldDervidInterface != null){ + if (oldDervidInterface != null) { oldDervidInterface.setFieldBeanList(invokerClassBean.getFieldBeanList()); oldDervidInterface.setMethodBeanList(invokerClassBean.getMethodBeanList()); - plantUmlContextBean.getDerivedPlantUmlContextBean().getInterfaceBeanMap().put(oldDervidInterface.getClassName(),oldDervidInterface); + plantUmlContextBean.getDerivedPlantUmlContextBean().getInterfaceBeanMap().put(oldDervidInterface.getClassName(), oldDervidInterface); return; } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/plantuml/ReadPlantUMLDocService.java b/codemaker-core/src/main/java/com/coderman/codemaker/service/plantuml/ReadPlantUMLDocService.java new file mode 100644 index 0000000000000000000000000000000000000000..04d422e2d9f9bd63d5e8170ce2e3035a8bc69b75 --- /dev/null +++ b/codemaker-core/src/main/java/com/coderman/codemaker/service/plantuml/ReadPlantUMLDocService.java @@ -0,0 +1,71 @@ +package com.coderman.codemaker.service.plantuml; + +import com.coderman.codemaker.bean.GlobalConstant; +import com.coderman.codemaker.config.AppServiceConfig; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.ResourceUtils; + +import java.io.File; +import java.io.IOException; +import java.util.List; + +/** + * Description: 读取plantUML类图统一处理类 + * date: 2021/10/25 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +@Service +@Slf4j +public class ReadPlantUMLDocService { + @Autowired + private AppServiceConfig appServiceConfig; + + /** + * 读取领域模型plantUML类图文档 + * @param plantUMLFileName + * @return + */ + public List readDomainPlantDoc(String plantUMLFileName){ + return readPlantUMLContent(GlobalConstant.DOMAIN_MODLE_FILE_DIR,appServiceConfig.getApplicationName(),plantUMLFileName); + } + + /** + * 读取调用时序plantUML类图文档 + * @param plantUMLFileName + * @return + */ + public List readInvokeSequencePlantDoc(String plantUMLFileName){ + return readPlantUMLContent(GlobalConstant.INVOKE_SEQUENCE_FILE_DIR,appServiceConfig.getApplicationName(),plantUMLFileName); + } + + + /** + * 读取plantUMl文件通用方法 + * @param plantUMLFileDir + * @param applicationName + * @param plantUMLFileName + * @return + */ + private List readPlantUMLContent(String plantUMLFileDir,String applicationName,String plantUMLFileName){ + if(StringUtils.isEmpty(plantUMLFileName)){ + log.error("plantUMLFileName is empty,can't read content----------------!!!!!!!!!!"); + return null; + } + try { + File file = ResourceUtils.getFile("classpath:"+plantUMLFileDir+"/"+applicationName+"/"+plantUMLFileName); + return FileUtils.readLines(file,"UTF-8"); + } catch (IOException e) { + e.printStackTrace(); + } + return null; + } + + +} diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/AbstractVarRegistry.java b/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/AbstractVarRegistry.java similarity index 86% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/AbstractVarRegistry.java rename to codemaker-core/src/main/java/com/coderman/codemaker/service/registry/AbstractVarRegistry.java index c00d82ebe9366ab8573ede237d9c922ef6686c70..283b8aa091d40ca2dfc8a263e6e9de9119b754cb 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/AbstractVarRegistry.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/AbstractVarRegistry.java @@ -1,7 +1,10 @@ -package com.coderman.codemaker.service; +package com.coderman.codemaker.service.registry; import com.coderman.codemaker.app.dynamicddd.DomainElementHandler; -import com.coderman.codemaker.app.dynamicddd.DynamicInvokeHandler; +import com.coderman.codemaker.bean.ColumnBean; +import com.coderman.codemaker.enums.TemplateFileEnum; +import com.coderman.codemaker.service.invoker.InvokeElementRegistService; +import com.coderman.codemaker.service.invoker.InvokeSequenceService; import com.coderman.codemaker.app.dynamicddd.derivedhandler.*; import com.coderman.codemaker.bean.TableBean; import com.coderman.codemaker.bean.dddelement.*; @@ -12,10 +15,12 @@ import com.coderman.codemaker.bean.plantuml.PlantUmlContextBean; import com.coderman.codemaker.config.AppServiceConfig; import com.coderman.codemaker.enums.DomainDerivedElementEnum; import com.coderman.codemaker.enums.DomainElementEnum; +import com.coderman.codemaker.service.plantuml.ReadDomainPlantDocService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import javax.annotation.Resource; +import java.util.List; import java.util.Map; /** @@ -26,17 +31,14 @@ import java.util.Map; */ public abstract class AbstractVarRegistry { @Autowired - //private ReadPlantUMLFileService readFileService; - private ReadPlantUMLFileServiceV2 readFileService; + private ReadDomainPlantDocService readFileService; @Autowired private AppServiceConfig appServiceConfig; - @Resource(name = "domainBoElementHandler") private DomainElementHandler domainElementHandler; - @Resource(name = "valueObjectElementHandler") private DomainElementHandler valueObjectElementHandler; @@ -46,7 +48,6 @@ public abstract class AbstractVarRegistry { @Resource(name = "domainGatawayElementHandler") private DomainElementHandler domainGatawayElementHandler; - @Resource(name = "msgBodyElementHandler") private DomainElementHandler msgBodyElementHandler; @@ -65,7 +66,6 @@ public abstract class AbstractVarRegistry { @Resource(name = "eventElementHandler") private DomainElementHandler eventElementHandler; - @Resource(name = "appListenerElementHandler") private DomainElementHandler appListenerElementHandler; @@ -78,6 +78,8 @@ public abstract class AbstractVarRegistry { @Resource(name = "mqProducerElementHandler") private DomainElementHandler mqProducerElementHandler; + @Resource(name = "dynamicMapperElementHandler") + private DomainElementHandler dynamicMapperElementHandler; //------------------以下为领域元素派生类对象处理器 @@ -120,8 +122,10 @@ public abstract class AbstractVarRegistry { //------------------以下为动态调用处理服务 @Autowired - private DynamicInvokeHandler dynamicInvokeHandler; + private InvokeSequenceService invokeSequenceService; + @Autowired + private InvokeElementRegistService invokeElementRegistService; /** * 合并全局配置 @@ -131,6 +135,9 @@ public abstract class AbstractVarRegistry { Map varMap = getRegistVarMap(); varMap.putIfAbsent("package",appServiceConfig.getPackage()); + varMap.putIfAbsent("packageInfrast",appServiceConfig.getPackage()+".infrast"); + varMap.putIfAbsent("packageDomain",appServiceConfig.getPackage()+".domain"); + varMap.putIfAbsent("author",appServiceConfig.getAuthor()); String plantUMLName = appServiceConfig.getPlantUMLFileName(); if(StringUtils.isEmpty(plantUMLName)){ @@ -144,17 +151,22 @@ public abstract class AbstractVarRegistry { Map tableBeanMap = (Map)varMap.get("table"); - varMap.put("package",appServiceConfig.getPackage()+".infrast"); - tableBeanMap.forEach((k,v)->{ - ClassBean classBean = v.convertToClassBean(appServiceConfig.getPackage()+".infrast.dao.dataobject"); - InterfaceBean mapperInterface = v.convertToMapperInterface(appServiceConfig.getPackage()+".infrast.dao.mapper"); + Map> columnBeanListMap = (Map>)varMap.get("columns"); + + //varMap.put("package",appServiceConfig.getPackage()+".infrast"); + tableBeanMap.forEach((k,v)->{ + ClassBean classBean = v.convertToClassBean(appServiceConfig.getPackage()+".infrast.dao.dataobject",columnBeanListMap.get(k)); + InterfaceBean mapperInterface = v.convertToMapperInterface(appServiceConfig.getPackage()+".infrast.dao.mapper",columnBeanListMap.get(k)); plantUmlContextBean.getClassBeanMap().put(classBean.getClassName(),classBean); plantUmlContextBean.getInterfaceBeanMap().put(mapperInterface.getClassName(),mapperInterface); }); + //注册内置工具类和方法 + invokeElementRegistService.registDefaultClass(plantUmlContextBean); + //打标 varMap.put("dynamicddd","dynamicddd"); @@ -189,8 +201,10 @@ public abstract class AbstractVarRegistry { InfrastAclImplElementBean infrastAclImplElementBean = derivedInfrastAclImplElementHandler.getElementBeanList(plantUmlContextBean); //最后进行动态调用绘制 - dynamicInvokeHandler.exeDynamicInvoke(plantUmlContextBean); + invokeSequenceService.exeDynamicInvoke(plantUmlContextBean); + //这里增加动态mapper的代码生成，补足调用时序图中缺失的方法 + DynamicMapperElementBean dynamicMapperElementBean = (DynamicMapperElementBean)dynamicMapperElementHandler.getElementBeanList(plantUmlContextBean); varMap.put("domainevent",domainEventElementBean.getClassBeanList()); @@ -224,7 +238,8 @@ public abstract class AbstractVarRegistry { varMap.put("gatawayimpl",gatawayImplElementBean.refreshClass(plantUmlContextBean, DomainElementEnum.GATAWAY_IMPL.getElement()).getClassBeanList()); varMap.put("repositoryimpl",repositoryImplElementBean.refreshClass(plantUmlContextBean, DomainElementEnum.REPOSITORY_IMPL.getElement()).getClassBeanList()); varMap.put("infrastaclimpl",infrastAclImplElementBean.refreshClass(plantUmlContextBean, DomainElementEnum.ADAPTER_ACL_IMPL.getElement()).getClassBeanList()); - + varMap.put("dynamicmapper",dynamicMapperElementBean.getInterfaceBeanList()); + varMap.put("dynamicmapperxml",dynamicMapperElementBean.getClassBeanList()); return varMap; } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/ApplicationPropertiesVarRegistry.java b/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/ApplicationPropertiesVarRegistry.java similarity index 72% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/registry/ApplicationPropertiesVarRegistry.java rename to codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/ApplicationPropertiesVarRegistry.java index a22821a66f4d883839832c480d3004d34d6c367d..6943366f1e1a842d456b111ed1a5ade0236bdcf5 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/ApplicationPropertiesVarRegistry.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/ApplicationPropertiesVarRegistry.java @@ -1,7 +1,7 @@ -package com.coderman.codemaker.service.registry; +package com.coderman.codemaker.service.registry.element; -import com.coderman.codemaker.service.AbstractVarRegistry; +import com.coderman.codemaker.service.registry.AbstractVarRegistry; import java.util.Map; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/BaseControllerVarRegistry.java b/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/BaseControllerVarRegistry.java similarity index 69% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/registry/BaseControllerVarRegistry.java rename to codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/BaseControllerVarRegistry.java index cd75d56bae6ac5fd04fe6064654fcd95bc1687a5..fafcedcfe725521f5e1199c2eaf7212f6676b17b 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/BaseControllerVarRegistry.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/BaseControllerVarRegistry.java @@ -1,6 +1,6 @@ -package com.coderman.codemaker.service.registry; +package com.coderman.codemaker.service.registry.element; -import com.coderman.codemaker.service.AbstractVarRegistry; +import com.coderman.codemaker.service.registry.AbstractVarRegistry; import java.util.Map; @@ -10,6 +10,7 @@ import java.util.Map; * author: coderman
* version: 1.0
*/ +@Deprecated public class BaseControllerVarRegistry extends AbstractVarRegistry { @Override public Map getRegistVarMap() { diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/ControllerVarRegistry.java b/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/ControllerVarRegistry.java similarity index 83% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/registry/ControllerVarRegistry.java rename to codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/ControllerVarRegistry.java index 67f30c6fe76f0e1ec99155d988fcd47ae6eb3fb6..97d90417dabf689608345273301f72d386947239 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/ControllerVarRegistry.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/ControllerVarRegistry.java @@ -1,9 +1,9 @@ -package com.coderman.codemaker.service.registry; +package com.coderman.codemaker.service.registry.element; import com.coderman.codemaker.bean.ColumnBean; import com.coderman.codemaker.bean.TableBean; -import com.coderman.codemaker.service.AbstractVarRegistry; -import com.coderman.codemaker.service.TemlateVarService; +import com.coderman.codemaker.service.registry.AbstractVarRegistry; +import com.coderman.codemaker.service.template.TemlateVarService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/DynamicDDDVarRegistry.java b/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/DynamicDDDVarRegistry.java similarity index 96% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/registry/DynamicDDDVarRegistry.java rename to codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/DynamicDDDVarRegistry.java index d15a173d6fb52583c40911e3361ff062e66635a9..30eefaf353de380e4b1a5da9985685958cfa97a9 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/DynamicDDDVarRegistry.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/DynamicDDDVarRegistry.java @@ -1,4 +1,4 @@ -package com.coderman.codemaker.service.registry; +package com.coderman.codemaker.service.registry.element; import com.coderman.codemaker.app.dynamicddd.DomainElementHandler; import com.coderman.codemaker.app.dynamicddd.derivedhandler.DerivedInfrastAclImplElementHandler; @@ -7,8 +7,8 @@ import com.coderman.codemaker.bean.dddelementderive.InfrastAclImplElementBean; import com.coderman.codemaker.bean.plantuml.PlantUmlContextBean; import com.coderman.codemaker.config.ProjectTemplateDynamicDDDConfig; import com.coderman.codemaker.enums.DomainElementEnum; -import com.coderman.codemaker.service.AbstractVarRegistry; -import com.coderman.codemaker.service.ReadPlantUMLFileServiceV2; +import com.coderman.codemaker.service.registry.AbstractVarRegistry; +import com.coderman.codemaker.service.plantuml.ReadDomainPlantDocService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -29,7 +29,7 @@ public class DynamicDDDVarRegistry extends AbstractVarRegistry { @Autowired //private ReadPlantUMLFileService readFileService; - private ReadPlantUMLFileServiceV2 readFileService; + private ReadDomainPlantDocService readFileService; @Resource(name = "domainBoElementHandler") private DomainElementHandler domainElementHandler; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/EntityVarRegistry.java b/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/EntityVarRegistry.java similarity index 83% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/registry/EntityVarRegistry.java rename to codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/EntityVarRegistry.java index 0f94b8cf0bbb9d01df9945a5c6da4467c0d9843f..1e0f8d067ea1e128e3c71cc7547f76912f095264 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/EntityVarRegistry.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/EntityVarRegistry.java @@ -1,9 +1,9 @@ -package com.coderman.codemaker.service.registry; +package com.coderman.codemaker.service.registry.element; import com.coderman.codemaker.bean.ColumnBean; import com.coderman.codemaker.bean.TableBean; -import com.coderman.codemaker.service.AbstractVarRegistry; -import com.coderman.codemaker.service.TemlateVarService; +import com.coderman.codemaker.service.registry.AbstractVarRegistry; +import com.coderman.codemaker.service.template.TemlateVarService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/MapperVarRegistry.java b/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/MapperVarRegistry.java similarity index 83% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/registry/MapperVarRegistry.java rename to codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/MapperVarRegistry.java index 1b7f0fe2c4ce03d54832789462cbb51caac73bd3..25f5bc1cfdd06b4a51e13bb8d0b35d23789cb8f1 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/MapperVarRegistry.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/MapperVarRegistry.java @@ -1,9 +1,9 @@ -package com.coderman.codemaker.service.registry; +package com.coderman.codemaker.service.registry.element; import com.coderman.codemaker.bean.ColumnBean; import com.coderman.codemaker.bean.TableBean; -import com.coderman.codemaker.service.AbstractVarRegistry; -import com.coderman.codemaker.service.TemlateVarService; +import com.coderman.codemaker.service.registry.AbstractVarRegistry; +import com.coderman.codemaker.service.template.TemlateVarService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/MapperXmlVarRegistry.java b/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/MapperXmlVarRegistry.java similarity index 93% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/registry/MapperXmlVarRegistry.java rename to codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/MapperXmlVarRegistry.java index 8a3c82afd6d4018e46554218f72609d2ff79a6fd..f4b9bfc04b125cf1ccbe9cc1a7ca67410648d800 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/MapperXmlVarRegistry.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/MapperXmlVarRegistry.java @@ -1,9 +1,9 @@ -package com.coderman.codemaker.service.registry; +package com.coderman.codemaker.service.registry.element; import com.coderman.codemaker.bean.ColumnBean; import com.coderman.codemaker.bean.TableBean; -import com.coderman.codemaker.service.AbstractVarRegistry; -import com.coderman.codemaker.service.TemlateVarService; +import com.coderman.codemaker.service.registry.AbstractVarRegistry; +import com.coderman.codemaker.service.template.TemlateVarService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/PomVarRegsitry.java b/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/PomVarRegsitry.java similarity index 70% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/registry/PomVarRegsitry.java rename to codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/PomVarRegsitry.java index 608ba0bf9b2bf94d5e811a4a4e84e5d601b23ffc..3b01f70154ee5a3285158366f2dec529c808ce46 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/PomVarRegsitry.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/PomVarRegsitry.java @@ -1,6 +1,6 @@ -package com.coderman.codemaker.service.registry; +package com.coderman.codemaker.service.registry.element; -import com.coderman.codemaker.service.AbstractVarRegistry; +import com.coderman.codemaker.service.registry.AbstractVarRegistry; import java.util.Map; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/ServiceImplVarRegistry.java b/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/ServiceImplVarRegistry.java similarity index 83% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/registry/ServiceImplVarRegistry.java rename to codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/ServiceImplVarRegistry.java index 5df85357deb93181fa68f9286a2033993ad3221a..351bec5f913d5796bacb8f64e26d3b15a152588e 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/ServiceImplVarRegistry.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/ServiceImplVarRegistry.java @@ -1,9 +1,9 @@ -package com.coderman.codemaker.service.registry; +package com.coderman.codemaker.service.registry.element; import com.coderman.codemaker.bean.ColumnBean; import com.coderman.codemaker.bean.TableBean; -import com.coderman.codemaker.service.AbstractVarRegistry; -import com.coderman.codemaker.service.TemlateVarService; +import com.coderman.codemaker.service.registry.AbstractVarRegistry; +import com.coderman.codemaker.service.template.TemlateVarService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/ServiceVarRegistry.java b/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/ServiceVarRegistry.java similarity index 83% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/registry/ServiceVarRegistry.java rename to codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/ServiceVarRegistry.java index 1892a8f06a60b1a5d1007737175b3d06edd6b7b4..ebbd382adf0bd6280714e40b7e92500dd2c6b772 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/ServiceVarRegistry.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/ServiceVarRegistry.java @@ -1,9 +1,9 @@ -package com.coderman.codemaker.service.registry; +package com.coderman.codemaker.service.registry.element; import com.coderman.codemaker.bean.ColumnBean; import com.coderman.codemaker.bean.TableBean; -import com.coderman.codemaker.service.AbstractVarRegistry; -import com.coderman.codemaker.service.TemlateVarService; +import com.coderman.codemaker.service.registry.AbstractVarRegistry; +import com.coderman.codemaker.service.template.TemlateVarService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/SpringApplicationContextVarRegistry.java b/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/SpringApplicationContextVarRegistry.java similarity index 73% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/registry/SpringApplicationContextVarRegistry.java rename to codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/SpringApplicationContextVarRegistry.java index 5423306745bf4a3ad7fe6d9f1de6b89dd1aa7787..5040596450e4c56db6388a9bb78b4b8c10bada2b 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/SpringApplicationContextVarRegistry.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/SpringApplicationContextVarRegistry.java @@ -1,6 +1,6 @@ -package com.coderman.codemaker.service.registry; +package com.coderman.codemaker.service.registry.element; -import com.coderman.codemaker.service.AbstractVarRegistry; +import com.coderman.codemaker.service.registry.AbstractVarRegistry; import java.util.Map; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/TestVarRegistry.java b/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/TestVarRegistry.java similarity index 83% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/registry/TestVarRegistry.java rename to codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/TestVarRegistry.java index 40e26393f8ca9eff7525e8aa26ecda89743b5ffe..569d2a3e38ea67cfa4076b314efe181992c6651c 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/TestVarRegistry.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/TestVarRegistry.java @@ -1,9 +1,9 @@ -package com.coderman.codemaker.service.registry; +package com.coderman.codemaker.service.registry.element; import com.coderman.codemaker.bean.ColumnBean; import com.coderman.codemaker.bean.TableBean; -import com.coderman.codemaker.service.AbstractVarRegistry; -import com.coderman.codemaker.service.TemlateVarService; +import com.coderman.codemaker.service.registry.AbstractVarRegistry; +import com.coderman.codemaker.service.template.TemlateVarService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/VoVarRegistry.java b/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/VoVarRegistry.java similarity index 83% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/registry/VoVarRegistry.java rename to codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/VoVarRegistry.java index 558dbb8612a91a9a63125db745d2ff5cdf4059f3..be9d294f9d56f832bf62d88f0c40de40696e4115 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/VoVarRegistry.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/VoVarRegistry.java @@ -1,9 +1,9 @@ -package com.coderman.codemaker.service.registry; +package com.coderman.codemaker.service.registry.element; import com.coderman.codemaker.bean.ColumnBean; import com.coderman.codemaker.bean.TableBean; -import com.coderman.codemaker.service.AbstractVarRegistry; -import com.coderman.codemaker.service.TemlateVarService; +import com.coderman.codemaker.service.registry.AbstractVarRegistry; +import com.coderman.codemaker.service.template.TemlateVarService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/FreemarkerService.java b/codemaker-core/src/main/java/com/coderman/codemaker/service/template/FreemarkerService.java similarity index 97% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/FreemarkerService.java rename to codemaker-core/src/main/java/com/coderman/codemaker/service/template/FreemarkerService.java index 10154adc67ef86e0cae5aeed7609140ed7b8fa5b..981cd240316e241b7eec3dd828991c1599f2ae4e 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/FreemarkerService.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/service/template/FreemarkerService.java @@ -1,4 +1,4 @@ -package com.coderman.codemaker.service; +package com.coderman.codemaker.service.template; import com.coderman.codemaker.config.AppServiceConfig; import com.coderman.codemaker.utils.FreemarkerUtils; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/TemlateVarService.java b/codemaker-core/src/main/java/com/coderman/codemaker/service/template/TemlateVarService.java similarity index 99% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/TemlateVarService.java rename to codemaker-core/src/main/java/com/coderman/codemaker/service/template/TemlateVarService.java index 9cdb5b1bfb4f54d5cab2e4d082231c7d098f4b2e..5bbb069f7fb22d105d47c5a0fcf4baa1a45fe215 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/TemlateVarService.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/service/template/TemlateVarService.java @@ -1,4 +1,4 @@ -package com.coderman.codemaker.service; +package com.coderman.codemaker.service.template; import com.coderman.codemaker.bean.ColumnBean; import com.coderman.codemaker.bean.TableBean; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/WriteFileService.java b/codemaker-core/src/main/java/com/coderman/codemaker/service/write/WriteSpringbootService.java similarity index 98% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/WriteFileService.java rename to codemaker-core/src/main/java/com/coderman/codemaker/service/write/WriteSpringbootService.java index d63b81786990bf1c8cc61b1fff62bbda75d87048..0c98bb4ef5e0c80c852ace61b88a542f50cbd077 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/WriteFileService.java +++ b/codemaker-core/src/main/java/com/coderman/codemaker/service/write/WriteSpringbootService.java @@ -1,8 +1,9 @@ -package com.coderman.codemaker.service; +package com.coderman.codemaker.service.write; import com.coderman.codemaker.config.AppServiceConfig; import com.coderman.codemaker.config.ProjectTemplateSpringbootConfig; import com.coderman.codemaker.enums.TemplateFileEnum; +import com.coderman.codemaker.service.dberpicture.DBErPictureService; import com.coderman.codemaker.utils.Constant; import com.coderman.codemaker.utils.FreemarkerUtils; import org.apache.commons.io.FileUtils; @@ -25,7 +26,7 @@ import java.util.Map; * 因此需要重构，整体api不变，新服务类参考WriteAppModuleService */ @Service -public class WriteFileService { +public class WriteSpringbootService { @Autowired private ProjectTemplateSpringbootConfig projectTemplateConfig; diff --git a/codemaker-core/src/main/resources/application.properties b/codemaker-core/src/main/resources/application.properties index 4ffaaae02169a16f5747f82662fa2cad9092363d..ae7b980599e75b21964baa289586e651900f935c 100644 --- a/codemaker-core/src/main/resources/application.properties +++ b/codemaker-core/src/main/resources/application.properties @@ -23,8 +23,8 @@ server.port=8099 #数据库配置 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.url=jdbc:mysql://localhost:3306/infosys_auth?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=UTC -spring.datasource.username=root -spring.datasource.password=root +spring.datasource.username= +spring.datasource.password= #配置.xml文件路径 mybatis.config-locations=classpath:mybatis-config.xml @@ -33,8 +33,11 @@ mybatis.mapper-locations=classpath:mapper/*.xml mybatis.type-aliases-package=com.coderman.codemaker.bean spring.application.name=codemaker #生成的应用类型，支持springboot,dubbo,cola -application.type=dubbo +application.type=cola #目标应用根包名称 application.global.package=com.coderman.infosys.auth #作者 -application.global.author=fanchunshuai \ No newline at end of file +application.global.author=shenshuai + +#接口方法返回声明需要依赖的包信息，适配实现 +application.global.package.adapterbean=defaultClazzWrapperImpl \ No newline at end of file diff --git a/codemaker-core/src/main/resources/ddd-plantuml/CommonAuth.puml b/codemaker-core/src/main/resources/ddd-plantuml/infosys-auth/CommonAuth.puml similarity index 100% rename from codemaker-core/src/main/resources/ddd-plantuml/CommonAuth.puml rename to codemaker-core/src/main/resources/ddd-plantuml/infosys-auth/CommonAuth.puml diff --git a/codemaker-core/src/main/resources/ddd-plantuml/CommonAuthWithPackage.puml b/codemaker-core/src/main/resources/ddd-plantuml/infosys-auth/CommonAuthWithPackage.puml similarity index 100% rename from codemaker-core/src/main/resources/ddd-plantuml/CommonAuthWithPackage.puml rename to codemaker-core/src/main/resources/ddd-plantuml/infosys-auth/CommonAuthWithPackage.puml diff --git a/codemaker-core/src/main/resources/ddd-plantuml/auth-domain.puml b/codemaker-core/src/main/resources/ddd-plantuml/infosys-auth/auth-domain.puml similarity index 78% rename from codemaker-core/src/main/resources/ddd-plantuml/auth-domain.puml rename to codemaker-core/src/main/resources/ddd-plantuml/infosys-auth/auth-domain.puml index d00fc60700a34362fd1b43cf4344e5471e555837..1aef9457b45f8f41816e6aa65ab239dfef7954c5 100644 --- a/codemaker-core/src/main/resources/ddd-plantuml/auth-domain.puml +++ b/codemaker-core/src/main/resources/ddd-plantuml/infosys-auth/auth-domain.puml @@ -37,18 +37,18 @@ package domain.bo { 组编码:String groupCode 组内用户列表:List userList 用户组状态:Integer status - 用户组对应的角色列表:List userList - 用户组对应角色组列表:List userList + 用户组对应的角色列表:List roleList + 用户组对应角色组列表:List roleGroupList .. extend info .. tableKey:String user_group facadeKey:String UserGroupFacade,UserGroupQueryFacade controllerKey:String UserGroupController,UserGroupQueryController dtoKeyList:String UpdateUserGroupRequestDTO,UserGroupResponseDTO,CreateUserGroupRequestDTO - voKeyList:String UserGroupPageVO,UserGroupVO + voKeyList:String UserGroupVO 获取用户组信息: ResultDataDto userGroupQueryFacade.getByGroupCode(String groupCode) 创建用户组: ResultDataDto userGroupFacade.createUserGroup(CreateUserGroupRequestDTO createUserGroupRequestDTO) - 分页获取用户组信息/usergroup/pagelist: ResultDataDto userGroupQueryController.getPageList() - 创建用户组/usergroup/creategroup: ResultDataDto userGroupController.createUserGroup(UserGroupVO userGroupVO) + 分页获取用户组信息/usergroup/pagelist: ResultDataDto> userGroupQueryController.getPageList() + 创建用户组/usergroup/creategroup: ResultDataDto userGroupController.createUserGroup(UserGroupVO userGroupVO) } @@ -69,10 +69,14 @@ package domain.bo { tableKey:String role facadeKey:String RoleFacade controllerKey:String RoleController,RoleQueryController - dtoKeyList:String UpdateRoleRequestDTO,RoleResponseDTO - voKeyList:String RolePageVO + dtoKeyList:String UpdateRoleRequestDTO,RoleResponseDTO,CreateRoleRequestDTO + voKeyList:String RoleVO,CreateRoleRequestVO + 创建角色/role/createrule: ResultDataDto RoleController.createRole(CreateRoleRequestVO createRoleRequestVO) + 根据编码获取角色详情/role/getbyrolecode: ResultDataDto RoleController.getByRoleCode(String roleCode) 获取角色详情: ResultDataDto getByRoleCode(String roleCode) - 分页获取用户组信息/role/pagelist: ResultDataDto getPageList() + 禁用角色/role/disable: ResultDataDto RoleController.disable(String roleCode) + 启用角色/role/enable: ResultDataDto RoleController.enable(String roleCode) + 分页获取用户组信息/role/pagelist: ResultDataDto> RoleQueryController.getPageList(PageVO pageVO) } class "角色组-RoleGroupBO" as RoleGroupBO{ @@ -85,9 +89,9 @@ package domain.bo { facadeKey:String RoleGroupFacade controllerKey:String RoleGroupController dtoKeyList:String UpdateRoleGroupRequestDTO,RoleGroupResponseDTO - voKeyList:String RoleGroupPageVO + voKeyList:String RoleGroupVO 获取学生信息: ResultDataDto getByNumber(String number) - 分页获取用户组信息/role/pagelist: ResultDataDto getPageList() + 分页获取用户组信息/role/pagelist: ResultDataDto> getPageList(PageVO pageVO) } class "权限-AuthorityBO" as AuthorityBO{ @@ -100,17 +104,17 @@ package domain.bo { 行政权限列表:List adminAuthorityBOList 权限状态:Integer status .. extend info .. - invokeFileKey:String queryauthoritydata.puml tableKey:String authority facadeKey:String AuthorityFacade controllerKey:String AuthorityOperationController,AuthorityQueryController dtoKeyList:String UpdateAuthorityRequestDTO,AuthorityResponseDTO,CreateAuthorityRequestDTO - voKeyList:String AuthorityPageVO,AuthorityVO + voKeyList:String AuthorityVO + !invokeFileKey:String createauthoritydata.puml,createauthoritydatahttp.puml 判断用户有没有访问某系统的权限: ResultDataDto checkUserSystemAuth(Long userId,String systemCode) 根据用户和系统获取系统权限信息: ResultDataDto getUserSystemAuth(Long userId,String systemCode) 根据权限code获取权限信息: ResultDataDto getByCode(String authCode) 保存权限信息: ResultDataDto saveAuthority(CreateAuthorityRequestDTO createAuthorityRequestDTO) - 分页获取权限信息/authority/pagelist: ResultDataDto AuthorityQueryController.getPageList() + 分页获取权限信息/authority/pagelist: ResultDataDto> AuthorityQueryController.getPageList() 获取权限信息/authority/getbycode: ResultDataDto AuthorityQueryController.getByCode(String authCode) 给角色授权/authority/savetorole: ResultDataDto AuthorityOperationController.saveAuthority(AuthorityVO authorityVO) @@ -146,11 +150,10 @@ package domain.bo { facadeKey:String SystemAuthorityFacade controllerKey:String SystemAuthorityController dtoKeyList:String UpdateSystemAuthorityRequestDTO,SystemAuthorityResponseDTO,CreateSystemAuthorityRequestDTO - voKeyList:String SystemAuthorityResponseVO - invokeFileKey:String queryauthoritydata.puml,queryauthoritydatahttp.puml,createauthoritydata.puml,createauthoritydatahttp.puml + voKeyList:String SystemAuthorityVO 获取权限信息: ResultDataDto getByCode(String authCode) - 获取权限信息/systemauthority/getbycode: ResultDataDto getByCode(String authCode) - 分页获取权限信息/systemauthority/pagelist: ResultDataDto getPageList() + 获取权限信息/systemauthority/getbycode: ResultDataDto getByCode(String authCode) + 分页获取权限信息/systemauthority/pagelist: ResultDataDto> getPageList() } @@ -180,8 +183,22 @@ package domain.bo { .. extend info .. tableKey:String system facadeKey:String SystemFacade - dtoKeyList:String SystemDTO + dtoKeyList:String SystemDTO,CreateSystemRequestDTO,UpdateSystemRequestDTO + voKeyList:String CreateSystemRequestVO,UpdateSystemRequestVO,SystemVO + controllerKey:String SystemController + invokeFileKey:String systemcontextseq.puml 注册系统: ResultDataDto registSystem(SystemDTO systemDTO) + 分页获取系统信息: ResultDataDto> getPageList(PageDTO pageDto) + 获取单条系统信息: ResultDataDto getBySystemCode(String systemCode) + 修改系统信息: ResultDataDto updateSystem(UpdateSystemRequestDTO dto) + 搜索获取系统信息: ResultDataDto> getSearchList(String search) + + 分页获取系统信息/system/pagelist: ResultDataDto> getPageList(SystemVO systemVO) + 搜索获取系统信息/system/search: ResultDataDto> getSearchList(String search) + 新建系统信息/system/save: ResultDataDto saveSystem(CreateSystemRequestVO systemVO) + 修改系统信息/system/update: ResultDataDto updateSystem(UpdateSystemRequestVO systemVO) + 通过系统编号获取系统信息/system/getbycode: ResultDataDto getByCode(String systemCode) + } class "菜单/模块管理-ModuleBO" as ModuleBO{ 菜单名称:String moduleName @@ -194,32 +211,32 @@ package domain.bo { facadeKey:String ModuleFacade controllerKey:String ModuleController dtoKeyList:String UpdateModuleRequestDTO,ModuleResponseDTO,CreateModuleRequestDTO - voKeyList:String ModuleResponseVO,ModulePageVO - 创建菜单信息/module/createmodule: ResultDataDto> getBySystemCode(CreateModuleRequestDTO createRequest) - 获取系统菜单列表信息/module/getbysystemcode: ResultDataDto> getBySystemCode(String systemCode) - 获取权限信息/module/getbycode: ResultDataDto getByCode(String authCode) - 分页获取权限信息/module/pagelist: ResultDataDto getPageList() + voKeyList:String ModuleVO,UpdateModuleRequestVO,CreateModuleRequestVO + 创建菜单信息/module/createmodule: ResultDataDto> createModule(CreateModuleRequestVO createRequest) + 创建菜单信息/module/updatemodule: ResultDataDto> updateModule(UpdateModuleRequestVO updateRequest) + 获取系统菜单列表信息/module/getbysystemcode: ResultDataDto> getBySystemCode(String systemCode) + 获取菜单信息/module/getbycode: ResultDataDto getByModuleCode(String moduleCode) + 分页获取菜单信息/module/pagelist: ResultDataDto> getPageList() 导入菜单信息/module/import: ResultDataDto importModuleList(List createRequest) 导出菜单信息/module/export: ResultDataDto exportModuleList(String systemCode) - } class "按钮管理-MenuBO" as MenuBO{ 按钮名称:String menuName 按钮编码:String menuCode 按钮链接:String menuUrl - 系统编码:String menuCode + 系统编码:String systemCode 菜单编码:String moduleCode .. extend info .. tableKey:String menu facadeKey:String MenuFacade controllerKey:String MenuController dtoKeyList:String UpdateMenuRequestDTO,MenuResponseDTO,CreateMenuRequestDTO - voKeyList:String MenuResponseVO,MenuPageVO - 修改按钮信息/menu/updatemenu: ResultDataDto updateMenu(UpdateMenuRequestDTO updateMenuRequestDTO) - 创建按钮信息/menu/createmenu: ResultDataDto createMenu(CreateMenuRequestDTO createMenuRequestDto) - 获取按钮详情信息/menu/getbycode: ResultDataDto getByCode(String menuCode) - 获取按钮列表信息/menu/pagelist: ResultDataDto> getPageList(String moduleCode ) + voKeyList:String MenuVO,UpdateMenuRequestVO,CreateMenuRequestVO + 修改按钮信息/menu/updatemenu: ResultDataDto updateMenu(UpdateMenuRequestVO updateMenuRequestVO) + 创建按钮信息/menu/createmenu: ResultDataDto createMenu(CreateMenuRequestVO createMenuRequestVO) + 获取按钮详情信息/menu/getbycode: ResultDataDto getByCode(String menuCode) + 获取按钮列表信息/menu/pagelist: ResultDataDto> getPageList(String moduleCode ) } class "数据字段实体-DataColumnBO" as DataColumnBO{ @@ -234,8 +251,9 @@ package domain.bo { tableKey:String data_column_config controllerKey:String DataColumnController voKeyList:String DataColumnResponseVO,DataColumnVO - 获取数据字段信息/datacolumn/getbycode: ResultDataDto getByBusDataBase(String busDataBase) - 分页获取数据字段信息/datacolumn/pagelist: ResultDataDto> getPageList() + !invokeFileKey:String datacolumncontextseq.puml + 获取数据字段信息/datacolumn/getbycode: ResultDataDto> getListByBusDataBase(String busDataBase) + 分页获取数据字段信息/datacolumn/pagelist: ResultDataDto> getPageList(PageVO pageVO) 导入数据字段列表/datacolumn/import: ResultDataDto importDataColumnList(List updateMenuRequestDTO) } @@ -302,16 +320,18 @@ package domain.gataway { 更新菜单信息:Integer updateModule(ModuleBO moduleBO) 创建按钮信息:Long saveMenu(MenuBO moduleBO) 更新按钮信息:Integer updateMenu(MenuBO moduleBO) - 根据code查询系统详情:SystemBO getSystemByCode(String systemCode) - 根据code查询菜单详情:ModuleBO getModule(String moduleCode) - 根据code查询按钮详情:MenuBO getMenu(String menuCode) + } interface "系统菜单按钮查询服务-SystemModuleQueryGataWay" as SystemModuleQueryGataWay{ - 分页查询系统列表:List querySystemPage() + 分页查询系统列表:List querySystemPage(PageBO pageBO) 分页查询菜单列表:List queryModulePage() 基于系统code查询菜单和按钮:SystemBO queryBySystemCode(String systemCode) - 查询所有系统菜单和按钮:List queryAll() + 根据条件查询系统:List queryByCondition(String search) + 查询所有系统菜单和按钮:List queryWithAll(String search) + 根据code查询系统详情:SystemBO getSystemByCode(String systemCode) + 根据code查询菜单详情:ModuleBO getModuleByCode(String moduleCode) + 根据code查询按钮详情:MenuBO getMenu(String menuCode) } @@ -325,9 +345,11 @@ package domain.gataway { interface "数据字段管理网关-DataColumnGataWay" as DataColumnGataWay{ 保存数据字段:Long saveDataColumn(DataColumnBO dataColumnBO) + 批量保存保存数据字段:Boolean saveBatchDataColumn(List list) 更新数据字段:Long updateDataColumn(DataColumnBO dataColumnBO) 根据ID查询数据字段详情:DataColumnBO getById(Long id) - 分页查询数据字段内容:List getPageList() + 根据数据库名称获取字段元数据内容:List getByDBCode(String busDataBase) + 分页查询数据字段内容:List getPageList(PageBO pageBO) } interface "用户和角色管理仓库-UserRoleRepository" as UserRoleRepository{ @@ -335,8 +357,9 @@ package domain.gataway { 更新用户组:Integer updateUserGroup(UserGroupBO userGroupBO) 保存角色组并尝试关联角色:Long saveRoleGroup(RoleGroupBO roleGroupBO) 更新角色组:Integer updateRoleGroup(RoleGroupBO roleGroupBO) - 保存角色并尝试关联用户:Long saveRole(RoleBO roleBO) + 保存角色:Long saveRole(RoleBO roleBO) 更新角色:Integer updateRole(RoleBO roleBO) + 分页获取角色:List getPageList(PageBO pageBO) 根据code查询用户组详情:UserGroupBO getByUserGroupCode(String userGroupCode) 根据code查询角色详情:RoleBO getByRoleCode(String roleCode) 根据code查询角色组详情:RoleGroupBO getByRoleGroupCode(String roleGroupCode) @@ -351,7 +374,6 @@ package "领域工厂服务包-domain.factory" { +基于用户的维度构建权限模型:UserAuthAggregateBO buildAuthorityWithRoleCode(String roleCode) } - } package "防腐层包-infrast.acl" as infrast.acl { @@ -457,12 +479,12 @@ package app.exe { package "应用层事件监听器包支持域内消息和域外消息，在应用层处理消息-app.listener" as app.listener{ class "权限变更监听器-AuthorityChangeListener" as AuthorityChangeListener{ - 事务提交后权限变更监听:void authorityCreate(String authCode) - 用户状态信息变更监听消费:void userStatusChange(Long userId) + +事务提交后权限变更监听:void authorityCreate(String authCode) + +用户状态信息变更监听消费:void userStatusChange(Long userId) } class "系统菜单按钮变更监听器-SystemChangeListener" as SystemChangeListener{ - 事务提交后权限变更监听:void systemChange(MenuChangeEvent event) + +事务提交后权限变更监听:void systemChange(MenuChangeEvent event) } } @@ -470,28 +492,28 @@ package "应用层事件监听器包支持域内消息和域外消息，在应 package "基础设施层消息生产者-mq.producer" as mq.producer { class "权限上下文消息生产者-AuthorityMqProducer" as AuthorityMqProducer{ - 权限创建:void authorityCreate(String authCode) - 权限更新:void authorityUpdate(String authCode) + +权限创建:void authorityCreate(String authCode) + +权限更新:void authorityUpdate(String authCode) } class "系统上下文消息生产者-SystemMqProducer" as SystemMqProducer{ - 事务提交后权限变更监听:void systemChange(MenuChangeEvent event) + +事务提交后权限变更监听:void systemChange(MenuChangeEvent event) } } package "基础设施层消息消费者-mq.consumer" as mq.consumer { class "用户上下文消息消费者或者监听-UserMqConsumer" as UserMqConsumer{ - 监听用户状态变更:void consumeUserStatusChange(String mqBody) + +监听用户状态变更:void consumeUserStatusChange(String mqBody) } class "组织上下文消息消费者或者监听-DepartmentMqConsumer" as DepartmentMqConsumer{ - 监听组织状态变更:void consumeDepartmentStatusChange(String mqBody) + +监听组织状态变更:void consumeDepartmentStatusChange(String mqBody) } } package "基础设施层消息消费处理器或者直接在基础设施层处理消息代码方案一-mq.handler" as mq.handler { class "用户上下文消息处理器-UserMqHandler" as UserMqHandler{ - 处理用户状态变更的权限信息:void handleUserStatusChange(String mqBody) + +处理用户状态变更的权限信息:void handleUserStatusChange(String mqBody) } } diff --git a/codemaker-core/src/main/resources/ddd-plantuml/SchoolManager.puml b/codemaker-core/src/main/resources/ddd-plantuml/schoolmanager/SchoolManager.puml similarity index 100% rename from codemaker-core/src/main/resources/ddd-plantuml/SchoolManager.puml rename to codemaker-core/src/main/resources/ddd-plantuml/schoolmanager/SchoolManager.puml diff --git a/codemaker-core/src/main/resources/ddd-plantuml/TradeOrderDomain.puml b/codemaker-core/src/main/resources/ddd-plantuml/tradeservice/TradeOrderDomain.puml similarity index 100% rename from codemaker-core/src/main/resources/ddd-plantuml/TradeOrderDomain.puml rename to codemaker-core/src/main/resources/ddd-plantuml/tradeservice/TradeOrderDomain.puml diff --git a/codemaker-core/src/main/resources/invoke-plantuml/createsystemdata.puml b/codemaker-core/src/main/resources/invoke-plantuml/createsystemdata.puml deleted file mode 100644 index d71686b10ad26630e5d6f6d94087217b273ee784..0000000000000000000000000000000000000000 --- a/codemaker-core/src/main/resources/invoke-plantuml/createsystemdata.puml +++ /dev/null @@ -1,17 +0,0 @@ -@startuml - -participant 应用api层 as facade -participant 领域层 as domain -participant 基础设施层 as infrast -group 系统上下文调用流程 -facade --> domain: 1.查询系统信息是否已注册\nSystemFacade.registSystem invoke SystemModuleRepository.getSystemByCode -domain --> infrast:2.查询系统信息\n SystemModuleRepository.getSystemByCode invoke SystemMapper.getByCode - -facade --> domain: 3.注册系统\nSystemFacade.registSystem invoke SystemModuleRepository.saveSystem -domain --> infrast:4.持久化系统数据\n SystemModuleRepository.saveSystem invoke SystemMapper.insert - -domain --> infrast:5.发送mq\n SystemModuleRepository.saveSystem invoke SystemMqProducer.systemChange - -end - -@enduml \ No newline at end of file diff --git a/codemaker-core/src/main/resources/invoke-plantuml/createauthoritydata.puml b/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/createauthoritydata.puml similarity index 100% rename from codemaker-core/src/main/resources/invoke-plantuml/createauthoritydata.puml rename to codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/createauthoritydata.puml diff --git a/codemaker-core/src/main/resources/invoke-plantuml/createauthoritydatahttp.puml b/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/createauthoritydatahttp.puml similarity index 100% rename from codemaker-core/src/main/resources/invoke-plantuml/createauthoritydatahttp.puml rename to codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/createauthoritydatahttp.puml diff --git a/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/datacolumncontextseq.puml b/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/datacolumncontextseq.puml new file mode 100644 index 0000000000000000000000000000000000000000..d8bbca08526e89fcf15e9b3ada3733cd07f96d19 --- /dev/null +++ b/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/datacolumncontextseq.puml @@ -0,0 +1,25 @@ +@startuml + +participant 应用facade层 as facade +participant 应用http层 as http +participant 领域层 as domain +participant 基础设施层 as infrast + +group 导入数据字段内容 +http --> domain: 3.注册系统\n DataColumnController.importDataColumnList invoke DataColumnGataWay.saveBatchDataColumn +domain --> infrast:4.持久化系统数据\n DataColumnGataWay.saveBatchDataColumn invoke DataColumnConfigMapper.insertBatch(List) +end + + +group 分页查询 +http --> domain: 3.注册系统\n DataColumnController.getPageList invoke DataColumnGataWay.getPageList +domain --> infrast:4.持久化系统数据\n DataColumnGataWay.getPageList invoke DataColumnConfigMapper.getPageList(PageBO) +end + +group +http --> domain: 3.注册系统\n DataColumnController.getListByBusDataBase invoke DataColumnGataWay.getByDBCode +domain --> infrast:4.持久化系统数据\n DataColumnGataWay.getByDBCode invoke DataColumnConfigMapper.getByDBCode(String busDataBase) +end + + +@enduml \ No newline at end of file diff --git a/codemaker-core/src/main/resources/invoke-plantuml/queryauthoritydata.puml b/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/queryauthoritydata.puml similarity index 100% rename from codemaker-core/src/main/resources/invoke-plantuml/queryauthoritydata.puml rename to codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/queryauthoritydata.puml diff --git a/codemaker-core/src/main/resources/invoke-plantuml/queryauthoritydatahttp.puml b/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/queryauthoritydatahttp.puml similarity index 100% rename from codemaker-core/src/main/resources/invoke-plantuml/queryauthoritydatahttp.puml rename to codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/queryauthoritydatahttp.puml diff --git a/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/rolecontextseq.puml b/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/rolecontextseq.puml new file mode 100644 index 0000000000000000000000000000000000000000..81e16fdbbbfd7d2e31eb35fad74fcc59ff1ebbaf --- /dev/null +++ b/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/rolecontextseq.puml @@ -0,0 +1,25 @@ +@startuml + +participant 应用facade层 as facade +participant 应用http层 as http +participant 领域层 as domain +participant 基础设施层 as infrast + +group 创建角色 +http --> domain: 1.创建角色\n RoleController.createRole invoke UserRoleRepository.saveRole +domain --> infrast:2.持久化角色\n UserRoleRepository.saveRole invoke RoleMapper.insert +end + +group +http --> domain: 1.禁用角色\n RoleController.disable invoke UserRoleRepository.getByRoleCode +domain --> infrast:2.持久化变更\n RoleController.disable invoke UserRoleRepository.updateRole +domain --> infrast:2.持久化变更\n UserRoleRepository.updateRole invoke RoleMapper.update +end + + +group +http --> domain: 1.分页获取角色 \n RoleQueryController.getPageList invoke UserRoleRepository.getPageList +domain --> infrast:2.持久化变更\n UserRoleRepository.getPageList invoke RoleMapper.getPageList(PageBO) +end + +@enduml \ No newline at end of file diff --git a/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/systemcontextseq.puml b/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/systemcontextseq.puml new file mode 100644 index 0000000000000000000000000000000000000000..09d7db0ca1f44862af49f8a4282b4a1e48ae85bb --- /dev/null +++ b/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/systemcontextseq.puml @@ -0,0 +1,99 @@ +@startuml + +participant 应用facade层 as facade +participant 应用http层 as http +participant 领域层 as domain +participant 基础设施层 as infrast +group 系统注册流程 +http --> domain: 1.查询系统信息是否已注册\nSystemController.saveSystem invoke SystemModuleQueryGataWay.getSystemByName +domain --> infrast:2.查询系统信息\n SystemModuleQueryGataWay.getSystemByName invoke SystemMapper.getByName(String systemName) +http --> domain: 3.注册系统\nSystemController.saveSystem invoke SystemModuleRepository.saveSystem +domain --> infrast:4.持久化系统数据\n SystemModuleRepository.saveSystem invoke SystemMapper.insert +domain --> infrast:5.发送mq\n SystemModuleRepository.saveSystem invoke SystemMqProducer.systemChange +end + + +group 系统查询流程 +http --> domain: 1.分页查询系统数据\n SystemController.getPageList invoke SystemModuleQueryGataWay.querySystemPage +domain --> infrast:2.分页查询系统数据\n SystemModuleQueryGataWay.querySystemPage invoke SystemMapper.getPageList(PageBO pageBO) +http --> domain: 3.根据条件搜索\nSystemController.getSearchList invoke SystemModuleQueryGataWay.queryByCondition +domain --> infrast:4.根据条件搜索\n SystemModuleQueryGataWay.queryByCondition invoke SystemMapper.queryByCondition +end + +group 查询单条数据 +http --> domain: 1.查询单条系统数据\n SystemController.getByCode invoke SystemModuleQueryGataWay.queryBySystemCode +domain --> infrast: 2.查询单条系统数据\n SystemModuleQueryGataWay.queryBySystemCode invoke SystemMapper.queryBySystemCode(String systemCode) + +end + + +group 修改系统数据 +http --> domain: 1.修改系统数据\n SystemController.updateSystem invoke SystemModuleRepository.updateSystem +domain --> infrast:2.修改系统数据\n SystemModuleRepository.updateSystem invoke SystemMapper.updateSystem +end + + + + + + + + + + + +group 系统注册流程 +facade --> domain: 1.查询系统信息是否已注册\nSystemFacade.registSystem invoke SystemModuleQueryGataWay.getSystemByName +end + + +group 系统查询流程 +facade --> domain: 1.分页查询系统数据\n SystemFacade.getPageList invoke SystemModuleQueryGataWay.querySystemPage +facade --> domain: 2.根据条件搜索\n SystemFacade.getSearchList invoke SystemModuleQueryGataWay.queryByCondition + +end + +group 查询单条数据 +facade --> domain: 1.查询单条系统数据\n SystemFacade.getBySystemCode invoke SystemModuleQueryGataWay.queryBySystemCode +end + + +group 修改系统数据 +facade --> domain: 1.修改系统数据\n SystemFacade.updateSystem invoke SystemModuleRepository.updateSystem +end + +group 添加菜单流程 +http --> domain: 1.添加菜单前先查一下菜单是否被注册过\n ModuleController.createModule invoke SystemModuleQueryGataWay.getModuleByCode +http --> domain: 2.添加菜单前先查一下菜单是否被注册过\n ModuleController.createModule invoke SystemModuleRepository.saveModule +domain --> infrast:3.持久化菜单信息\n SystemModuleRepository.saveModule invoke ModuleMapper.insert +end + +group 根据菜单code查询菜单和按钮列表详情 +http --> domain: 1.查询菜单信息是否已注册\nModuleController.getByModuleCode invoke SystemModuleQueryGataWay.getModuleByCode +domain --> infrast:2.查询历史菜单信息\n SystemModuleQueryGataWay.getModuleByCode invoke ModuleMapper.getByName(String moduleName) +domain --> infrast:3.查询关联的按钮信息\n SystemModuleQueryGataWay.getModuleByCode invoke MenuMapper.getListByModuleCode(String moduleCode) +end + + +group 修改菜单信息 +http --> domain: 1.修改菜单信息\nModuleController.updateModule invoke SystemModuleRepository.updateModule +domain --> infrast:2.查询历史菜单信息\n SystemModuleRepository.updateModule invoke ModuleMapper.update +end + + + + + + +group 添加按钮流程(简化版) +http --> domain: 3.注册系统\n MenuController.createMenu invoke SystemModuleRepository.saveMenu +domain --> infrast:4.持久化系统数据\n SystemModuleRepository.saveMenu invoke MenuMapper.insert +end + +group 修改按钮流程(简化版) +http --> domain: 3.注册系统\n MenuController.updateMenu invoke SystemModuleRepository.updateMenu +domain --> infrast:4.持久化系统数据\n SystemModuleRepository.updateMenu invoke MenuMapper.update +end + + +@enduml \ No newline at end of file diff --git a/codemaker-core/src/main/resources/projecttemplate-cola.properties b/codemaker-core/src/main/resources/projecttemplate-cola.properties index 07df1f0bf0acb1c35de661aae06f2556f4c6ccab..6ee6f50a00945a8ea54816426ab3bea409a30a7a 100644 --- a/codemaker-core/src/main/resources/projecttemplate-cola.properties +++ b/codemaker-core/src/main/resources/projecttemplate-cola.properties @@ -1,16 +1,17 @@ #数据库名称 -cola.global.dbName=school_manager +cola.global.dbName=infosys_auth -cola.global.applicationName=school-manager +cola.global.applicationName=infosys-auth #目标工程输出目录，这里填写对应的工程的绝对路径 -cola.code.outpath.cola-adapter=/Users/scworkspace/sourceSpace/code-maker/codemaker-cola/cola-adapter -cola.code.outpath.cola-infrast=/Users/scworkspace/sourceSpace/code-maker/codemaker-cola/cola-infrast -cola.code.outpath.cola-app=/Users/scworkspace/sourceSpace/code-maker/codemaker-cola/cola-app -cola.code.outpath.cola-domain=/Users/scworkspace/sourceSpace/code-maker/codemaker-cola/cola-domain -cola.code.outpath.cola-client=/Users/scworkspace/sourceSpace/code-maker/codemaker-cola/cola-client +cola.code.outpath.cola-adapter=/Users/shenshuai/myspace/code-maker/codemaker-cola/cola-adapter +cola.code.outpath.cola-infrast=/Users/shenshuai/myspace/code-maker/codemaker-cola/cola-infrast +cola.code.outpath.cola-app=/Users/shenshuai/myspace/code-maker/codemaker-cola/cola-app +cola.code.outpath.cola-domain=/Users/shenshuai/myspace/code-maker/codemaker-cola/cola-domain +cola.code.outpath.cola-client=/Users/shenshuai/myspace/code-maker/codemaker-cola/cola-client #应用服务的plantUML类图文件,不配置则走基于数据表的方式生成代码 -cola.domain.plantuml=SchoolManager.puml +cola.domain.plantuml=auth-domain.puml +#cola.domain.plantuml= diff --git a/codemaker-core/src/main/resources/projecttemplate-dubbo.properties b/codemaker-core/src/main/resources/projecttemplate-dubbo.properties index 14e14b5de3821f05b5be1ab4030f2ff6143113d9..489f81ff7ccbf1b3e1c41d8f8063aa024dfb2ee8 100644 --- a/codemaker-core/src/main/resources/projecttemplate-dubbo.properties +++ b/codemaker-core/src/main/resources/projecttemplate-dubbo.properties @@ -1,11 +1,14 @@ #数据库名称 -dubbo.global.dbName=school_manager +dubbo.global.dbName=infosys_auth +dubbo.global.applicationName=infosys-auth #目标工程输出目录，这里填写对应的工程的绝对路径 -dubbo.code.outpath.dubbo-common=/Users/scworkspace/sourceSpace/code-maker/codemaker-dubbo/dubbo-common -dubbo.code.outpath.dubbo-api=/Users/scworkspace/sourceSpace/code-maker/codemaker-dubbo/dubbo-api -dubbo.code.outpath.dubbo-core=/Users/scworkspace/sourceSpace/code-maker/codemaker-dubbo/dubbo-core +dubbo.code.outpath.dubbo-common=/Users/shenshuai/myspace/code-maker/codemaker-dubbo/dubbo-common +dubbo.code.outpath.dubbo-api=/Users/shenshuai/myspace/code-maker/codemaker-dubbo/dubbo-api +dubbo.code.outpath.dubbo-core=/Users/shenshuai/myspace/code-maker/codemaker-dubbo/dubbo-core #应用服务的plantUML类图文件,不配置则走基于数据表的方式生成代码 -dubbo.domain.plantuml=SchoolManager.puml \ No newline at end of file +dubbo.domain.plantuml=auth-domain.puml + +#dubbo.domain.plantuml=SchoolManager.puml \ No newline at end of file diff --git a/codemaker-core/src/main/resources/projecttemplate-springboot.properties b/codemaker-core/src/main/resources/projecttemplate-springboot.properties index beee9cd6875fe35c13b584258902b2c35b9de613..2eeadcac8be350d6558b2f4b95444ed7ac30336e 100644 --- a/codemaker-core/src/main/resources/projecttemplate-springboot.properties +++ b/codemaker-core/src/main/resources/projecttemplate-springboot.properties @@ -1,13 +1,16 @@ #数据库名称 -codemaker.global.dbName=school_manager +springboot.global.dbName=infosys_auth + #项目名称 -codemaker.pom.projectName=school_manager +springboot.global.applicationName=infosys-auth + #maven坐标-GAV codemaker.pom.groupId=com.snail.school.manager codemaker.pom.artifactId=schoolmanager-web codemaker.pom.version=1.0.0.SNAPSHOT #目标工程输出目录，这里填写对应的codemaker-web工程的绝对路径 -codemaker.code.outpath=/Users/scworkspace/sourceSpace/code-maker/codemaker-springboot +codemaker.code.outpath=/Users/shenshuai/myspace/code-maker/codemaker-springboot #应用服务的plantUML类图文件,不配置则走基于数据表的方式生成代码 -codemaker.domain.plantuml=SchoolManager.puml \ No newline at end of file +codemaker.domain.plantuml=auth-domain.puml +#codemaker.domain.plantuml=SchoolManager.puml \ No newline at end of file diff --git a/codemaker-core/src/main/resources/template/cola/AppEventPublisher.ftl b/codemaker-core/src/main/resources/template/cola/AppEventPublisher.ftl new file mode 100644 index 0000000000000000000000000000000000000000..a46044426b5c0ba29e5c9aba113dbbac727f4761 --- /dev/null +++ b/codemaker-core/src/main/resources/template/cola/AppEventPublisher.ftl @@ -0,0 +1,18 @@ +package ${package}.utils; + +import ${package}.domain.event.BaseEvent; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.stereotype.Component; + +@Component +public class AppEventPublisher { + + @Autowired + private ApplicationContext applicationContext; + + public void publish(T t) { + applicationContext.publishEvent(t); + } + +} \ No newline at end of file diff --git a/codemaker-core/src/main/resources/template/cola/BaseEvent.ftl b/codemaker-core/src/main/resources/template/cola/BaseEvent.ftl new file mode 100644 index 0000000000000000000000000000000000000000..4ff2d9325cbbb820b018940f57ffd1c6968cd2c7 --- /dev/null +++ b/codemaker-core/src/main/resources/template/cola/BaseEvent.ftl @@ -0,0 +1,9 @@ +package ${package}.domain.event; + +import org.springframework.context.ApplicationEvent; + +public class BaseEvent extends ApplicationEvent { + public BaseEvent(Object source) { + super(source); + } +} diff --git a/codemaker-core/src/main/resources/template/cola/boddd.ftl b/codemaker-core/src/main/resources/template/cola/boddd.ftl index 5c2f634e6bcd418c79556b914b5b2c9c4701aff5..6107567ccb4101f3e4384e086c235c719e343b36 100644 --- a/codemaker-core/src/main/resources/template/cola/boddd.ftl +++ b/codemaker-core/src/main/resources/template/cola/boddd.ftl @@ -18,6 +18,7 @@ import lombok.ToString; public class ${class.className} ${class.relationClassStr}{ <#list fields as field> + /** ${field.desc} **/ ${field.visibility} ${field.fieldName}; diff --git a/codemaker-core/src/main/resources/template/cola/do.ftl b/codemaker-core/src/main/resources/template/cola/do.ftl index 0416b5c5eca04c2cb11b535bffc2265678604b46..5cb6980c8680c78017324dca6939094acf5835ec 100644 --- a/codemaker-core/src/main/resources/template/cola/do.ftl +++ b/codemaker-core/src/main/resources/template/cola/do.ftl @@ -1,4 +1,4 @@ -package ${package}.dao.dataobject; +package ${packageInfrast}.dao.dataobject; import java.util.Date; import java.math.BigDecimal; diff --git a/codemaker-core/src/main/resources/template/cola/facade.ftl b/codemaker-core/src/main/resources/template/cola/facade.ftl index ca82ab36e347d75bf925549966ea9725ce17c7ab..25af93e70591fa7565dcc59cc3d5736f054cbd41 100644 --- a/codemaker-core/src/main/resources/template/cola/facade.ftl +++ b/codemaker-core/src/main/resources/template/cola/facade.ftl @@ -3,6 +3,7 @@ package ${package}.api.facade; import java.util.List; import com.coderman.utils.response.ResultDataDto; import com.coderman.utils.response.ResultDto; +import com.coderman.utils.response.PageDTO; import ${package}.api.dto.${table.humpClassName}DTO; @@ -15,9 +16,7 @@ import ${package}.api.dto.${table.humpClassName}DTO; public interface ${table.humpClassName}Facade{ /** - * - * @Title: save - * @Description:新增 + * @Description:新增${table.tableComment} * @author: * @param dto * @return ResultDto 返回类型 @@ -27,9 +26,7 @@ public interface ${table.humpClassName}Facade{ /** * - * @Title: delete * @Description: 通过id删除数据 - * @author: * @param id * @return ResultDto 返回类型 * @throws @@ -38,9 +35,7 @@ public interface ${table.humpClassName}Facade{ /** * - * @Title: getById * @Description: 通过id查询 - * @author: * @param @param id * @return ResultDataDto<${table.humpClassName}DTO> * @throws @@ -48,24 +43,26 @@ public interface ${table.humpClassName}Facade{ public ResultDataDto<${table.humpClassName}DTO> getById(Long id) throws Exception; /** - * - * @Title: getAll - * @Description:查询所有数据 - * @author: + * @Description:查询所有数据 * @return ResultDataDto> * @throws */ public ResultDataDto> getAll() throws Exception; /** - * - * @Title: update - * @Description:修改 - * @author: - * @param @param ${table.humpTableName}DTO - * @return int - * @throws - */ + * @Description:修改 + * @param @param ${table.humpTableName}DTO + * @return int + * @throws + */ public ResultDto update(${table.humpClassName}DTO ${table.humpTableName}DTO) throws Exception; + + /** + * @Description:分页查询记录 + * @return ResultDataDto> + * @throws + */ + public ResultDataDto> getPageList(PageDTO pageDto) throws Exception; + } \ No newline at end of file diff --git a/codemaker-core/src/main/resources/template/cola/facadeimpl.ftl b/codemaker-core/src/main/resources/template/cola/facadeimpl.ftl index a47d1cc4d969f8b6b58f100ac79b1fd15f887791..bc8bcef292d1c6ebe39129410b005d4ef1a7b941 100644 --- a/codemaker-core/src/main/resources/template/cola/facadeimpl.ftl +++ b/codemaker-core/src/main/resources/template/cola/facadeimpl.ftl @@ -1,4 +1,4 @@ -package ${package}.app.facade.impl; +package ${package}.app.facadeimpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -6,6 +6,7 @@ import org.apache.dubbo.config.annotation.Service; import com.coderman.utils.response.ResultDataDto; import com.coderman.utils.response.ResultDto; +import com.coderman.utils.response.PageDTO; import ${package}.api.facade.${table.humpClassName}Facade; import ${package}.api.dto.${table.humpClassName}DTO; @@ -61,4 +62,11 @@ public class ${table.humpClassName}FacadeImpl implements ${table.humpClassName}F return resultDto; } + @Override + public ResultDataDto> getPageList(PageDTO pageDto) { + ResultDataDto> resultDataDto = new ResultDataDto>(); + //todo impl code + return resultDataDto; + } + } \ No newline at end of file diff --git a/codemaker-core/src/main/resources/template/cola/gataway.ftl b/codemaker-core/src/main/resources/template/cola/gataway.ftl index 327c40fbaea1ec6fd7c168452e5c16efead0fb36..c22e22b86d2bb4ab483e7e0215e5498c73decec9 100644 --- a/codemaker-core/src/main/resources/template/cola/gataway.ftl +++ b/codemaker-core/src/main/resources/template/cola/gataway.ftl @@ -13,6 +13,7 @@ import ${importClass}; */ public interface ${class.className}{ <#list methods as method> + ${method.doc} ${method.returnClass} ${method.methodName}; diff --git a/codemaker-core/src/main/resources/template/cola/mapper.ftl b/codemaker-core/src/main/resources/template/cola/mapper.ftl index 04ec226e05c248985e4a0aaa0240205ed00d09a9..c66fddfca85b9627b4109953a770f81ec4575d04 100644 --- a/codemaker-core/src/main/resources/template/cola/mapper.ftl +++ b/codemaker-core/src/main/resources/template/cola/mapper.ftl @@ -1,7 +1,9 @@ -package ${package}.dao.mapper; +package ${packageInfrast}.dao.mapper; import java.util.List; -import ${package}.dao.dataobject.${table.humpClassName}DO; +import ${packageInfrast}.dao.dataobject.${table.humpClassName}DO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** @@ -10,60 +12,54 @@ import ${package}.dao.dataobject.${table.humpClassName}DO; * @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} * @version v1.0 */ +@Mapper public interface ${table.humpClassName}Mapper{ /** - * - * @Title: save - * @Description:新增或修改 - * @author: - * @param @param ${table.humpTableName}DO + * @Description:新增或修改 + * @param ${table.humpTableName}DO * @return int - * @throws */ - public int insert(${table.humpClassName}DO ${table.humpTableName}DO); + public long insert(${table.humpClassName}DO ${table.humpTableName}DO); /** - * - * @Title: delete * @Description: 通过id删除数据 - * @author: - * @param @param id + * @param id * @return int - * @throws */ public int deleteById(Long id); /** - * - * @Title: getById * @Description: 通过id查询 - * @author: - * @param @param id - * @return ResultDataDto<${table.humpClassName}DO> 返回类型 - * @throws + * @param id + * @return ResultDataDto<${table.humpClassName}DO> */ public ${table.humpClassName}DO getById(Long id); /** - * - * @Title: getAll * @Description:查询所有数据 - * @author: - * @return List<${table.humpClassName}DO 返回类型 - * @throws + * @return List<${table.humpClassName}DO */ public List<${table.humpClassName}DO> getAll(); /** - * - * @Title: update - * @Description:新增或修改 - * @author: - * @param @param ${table.humpTableName}DO - * @return int - * @throws - */ + * @Description:新增或修改 + * @param ${table.humpTableName}DO + * @return int + */ public int update(${table.humpClassName}DO ${table.humpTableName}DO); - + + /** + * @Description:查询所有数据 + * @return List<${table.humpClassName}DO + */ + public List<${table.humpClassName}DO> getPageList(); + + + /** + * @Description:查询数量 + * @return int + */ + public int getCount(); + } \ No newline at end of file diff --git a/codemaker-core/src/main/resources/template/cola/mapperddd.ftl b/codemaker-core/src/main/resources/template/cola/mapperddd.ftl new file mode 100644 index 0000000000000000000000000000000000000000..786135a0d5679c34e40d3167f601a5b5dfb17f32 --- /dev/null +++ b/codemaker-core/src/main/resources/template/cola/mapperddd.ftl @@ -0,0 +1,25 @@ +package ${class.packageName}; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +<#list imports as importClass> +import ${importClass}; + + + +/** +* @Description:${class.classDesc}接口 +* @Author:${class.author} +* @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} +* @version v1.0 +*/ +@Mapper +public interface ${class.className}{ + +<#list methods as method> +${method.doc} + ${method.returnClass} ${method.methodName}; + + +} \ No newline at end of file diff --git a/codemaker-core/src/main/resources/template/cola/mapperxml.ftl b/codemaker-core/src/main/resources/template/cola/mapperxml.ftl index b6f6b2b0962258059e3eb07cbd80390844334113..09384958461d99720c6e3a04db346fa30b14f5ca 100644 --- a/codemaker-core/src/main/resources/template/cola/mapperxml.ftl +++ b/codemaker-core/src/main/resources/template/cola/mapperxml.ftl @@ -11,13 +11,18 @@ + + + + + ${table.columnNameList} - + insert into ${table.tableName}( ${table.insertColumnNames} ) @@ -33,12 +38,12 @@ where id = <#noparse>#{id<#noparse>} - select from ${table.tableName} @@ -46,4 +51,12 @@ delete from ${table.tableName} where id = <#noparse>#{id<#noparse>} + + + + diff --git a/codemaker-core/src/main/resources/template/cola/mapperxmlddd.ftl b/codemaker-core/src/main/resources/template/cola/mapperxmlddd.ftl new file mode 100644 index 0000000000000000000000000000000000000000..7d50a9abc14735d5c345f581d318c4ba35bb7d4d --- /dev/null +++ b/codemaker-core/src/main/resources/template/cola/mapperxmlddd.ftl @@ -0,0 +1,59 @@ + + + + + + + + + <#list columns as column> + + + + + + + + + + + + + ${table.columnNameList} + + + + insert into ${table.tableName}( + ${table.insertColumnNames} + ) + values( + ${table.insertColumnNameList} + ) + + + + update ${table.tableName} + set + ${table.updateColumnNameList} + where id = <#noparse>#{id<#noparse>} + + + + + + + + delete from ${table.tableName} where id = <#noparse>#{id<#noparse>} + + +<#list fields as field> +${field.fieldName} + + + + + diff --git a/codemaker-core/src/main/resources/template/cola/service.ftl b/codemaker-core/src/main/resources/template/cola/service.ftl index 0996e2d9b844f94dfe10982ac59fa536536ef4c9..83cea8c547d423d7aba65ce057b95c2851803693 100644 --- a/codemaker-core/src/main/resources/template/cola/service.ftl +++ b/codemaker-core/src/main/resources/template/cola/service.ftl @@ -13,10 +13,7 @@ import ${package}.model.bo.${table.humpClassName}BO; public interface ${table.humpClassName}Service{ /** - * - * @Title: save * @Description:新增 - * @author: * @param bo * @return ResultDto 返回类型 * @throws @@ -24,21 +21,15 @@ public interface ${table.humpClassName}Service{ public ${table.humpClassName}BO save(${table.humpClassName}BO bo) throws Exception; /** - * - * @Title: delete * @Description: 通过id删除数据 - * @author: * @param id * @return ResultDto 返回类型 * @throws */ - public boolean delete(Long id); + public Boolean delete(Long id); /** - * - * @Title: getById * @Description: 通过id查询 - * @author: * @param id * @return ResultDataDto<${table.humpClassName}BO> * @throws @@ -46,24 +37,26 @@ public interface ${table.humpClassName}Service{ public ${table.humpClassName}BO getById(Long id) throws Exception; /** - * - * @Title: getAll - * @Description:查询所有数据 - * @author: + * @Description:查询所有数据 * @return List<${table.humpClassName}BO> * @throws */ public List<${table.humpClassName}BO> getAll() throws Exception; /** - * - * @Title: update - * @Description:修改 - * @author: - * @param ${table.humpTableName}BO - * @return boolean - * @throws - */ - public boolean update(${table.humpClassName}BO ${table.humpTableName}BO) throws Exception; + * @Description:修改 + * @param ${table.humpTableName}BO + * @return boolean + * @throws + */ + public Boolean update(${table.humpClassName}BO ${table.humpTableName}BO) throws Exception; + + + /** + * @Description:分页查询数据 + * @return List<${table.humpClassName}BO> + * @throws + */ + public List<${table.humpClassName}BO> getPageList() throws Exception; } \ No newline at end of file diff --git a/codemaker-core/src/main/resources/template/cola/serviceImpl.ftl b/codemaker-core/src/main/resources/template/cola/serviceImpl.ftl index 693538c9fe24edbcabbdb6506cd664330a4bcaa7..03c66a6a87bc817e844aae662e3b5fcc6f19b7ae 100644 --- a/codemaker-core/src/main/resources/template/cola/serviceImpl.ftl +++ b/codemaker-core/src/main/resources/template/cola/serviceImpl.ftl @@ -1,11 +1,11 @@ -package ${package}.service.impl; +package ${packageInfrast}.service.impl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import ${package}.dao.mapper.${table.humpClassName}Mapper; +import ${packageInfrast}.dao.mapper.${table.humpClassName}Mapper; import ${package}.service.${table.humpClassName}Service; import ${package}.model.bo.${table.humpClassName}BO; @@ -31,7 +31,7 @@ public class ${table.humpClassName}ServiceImpl implements ${table.humpClassName} } @Override - public boolean delete(Long id) { + public Boolean delete(Long id) { return false; } @@ -46,8 +46,13 @@ public class ${table.humpClassName}ServiceImpl implements ${table.humpClassName} } @Override - public boolean update(${table.humpClassName}BO bo) { + public Boolean update(${table.humpClassName}BO bo) { return false; } + + @Override + public List<${table.humpClassName}BO> getPageList() throws Exception { + return null; + } } \ No newline at end of file diff --git a/codemaker-core/src/main/resources/template/dubbo/AppEventPublisher.ftl b/codemaker-core/src/main/resources/template/dubbo/AppEventPublisher.ftl new file mode 100644 index 0000000000000000000000000000000000000000..a46044426b5c0ba29e5c9aba113dbbac727f4761 --- /dev/null +++ b/codemaker-core/src/main/resources/template/dubbo/AppEventPublisher.ftl @@ -0,0 +1,18 @@ +package ${package}.utils; + +import ${package}.domain.event.BaseEvent; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.stereotype.Component; + +@Component +public class AppEventPublisher { + + @Autowired + private ApplicationContext applicationContext; + + public void publish(T t) { + applicationContext.publishEvent(t); + } + +} \ No newline at end of file diff --git a/codemaker-core/src/main/resources/template/dubbo/BaseEvent.ftl b/codemaker-core/src/main/resources/template/dubbo/BaseEvent.ftl new file mode 100644 index 0000000000000000000000000000000000000000..4ff2d9325cbbb820b018940f57ffd1c6968cd2c7 --- /dev/null +++ b/codemaker-core/src/main/resources/template/dubbo/BaseEvent.ftl @@ -0,0 +1,9 @@ +package ${package}.domain.event; + +import org.springframework.context.ApplicationEvent; + +public class BaseEvent extends ApplicationEvent { + public BaseEvent(Object source) { + super(source); + } +} diff --git a/codemaker-core/src/main/resources/template/dubbo/application.ftl b/codemaker-core/src/main/resources/template/dubbo/application.ftl index 3c3a2c11238b9711d7af9bc37eaba14a3f3b8398..0ad0924d1aec47d37779fe056a44b00d6bf4497a 100644 --- a/codemaker-core/src/main/resources/template/dubbo/application.ftl +++ b/codemaker-core/src/main/resources/template/dubbo/application.ftl @@ -1,4 +1,4 @@ -package ${package}.core; +package ${package}; import org.apache.dubbo.config.spring.context.annotation.DubboComponentScan; @@ -13,10 +13,10 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; * @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} * @version v1.0 */ -@DubboComponentScan(basePackages = "${package}.core") +@DubboComponentScan(basePackages = "${package}") @EnableDubbo //开启Dubbo的注解支持 @SpringBootApplication(scanBasePackages = {"${package}"}) -@MapperScan(basePackages = "${package}.common") +@MapperScan(basePackages = "${package}.common.infrast") public class Application { public static void main(String[] args) { diff --git a/codemaker-core/src/main/resources/template/dubbo/bo.ftl b/codemaker-core/src/main/resources/template/dubbo/bo.ftl index ff33f1e6f726b7699806dc8ed67a1bf142a3ec6e..79fea9d311357de16ed8e3d6fc0dbc83dbc3c445 100644 --- a/codemaker-core/src/main/resources/template/dubbo/bo.ftl +++ b/codemaker-core/src/main/resources/template/dubbo/bo.ftl @@ -1,4 +1,4 @@ -package ${package}.core.model.bo; +package ${package}.model.bo; import java.util.Date; import java.math.BigDecimal; diff --git a/codemaker-core/src/main/resources/template/dubbo/do.ftl b/codemaker-core/src/main/resources/template/dubbo/do.ftl index 0416b5c5eca04c2cb11b535bffc2265678604b46..5cb6980c8680c78017324dca6939094acf5835ec 100644 --- a/codemaker-core/src/main/resources/template/dubbo/do.ftl +++ b/codemaker-core/src/main/resources/template/dubbo/do.ftl @@ -1,4 +1,4 @@ -package ${package}.dao.dataobject; +package ${packageInfrast}.dao.dataobject; import java.util.Date; import java.math.BigDecimal; diff --git a/codemaker-core/src/main/resources/template/dubbo/facade.ftl b/codemaker-core/src/main/resources/template/dubbo/facade.ftl index ca82ab36e347d75bf925549966ea9725ce17c7ab..a86a9b4b43e105bc517f37c4769171e05a5525d2 100644 --- a/codemaker-core/src/main/resources/template/dubbo/facade.ftl +++ b/codemaker-core/src/main/resources/template/dubbo/facade.ftl @@ -3,6 +3,7 @@ package ${package}.api.facade; import java.util.List; import com.coderman.utils.response.ResultDataDto; import com.coderman.utils.response.ResultDto; +import com.coderman.utils.response.PageDTO; import ${package}.api.dto.${table.humpClassName}DTO; @@ -15,10 +16,7 @@ import ${package}.api.dto.${table.humpClassName}DTO; public interface ${table.humpClassName}Facade{ /** - * - * @Title: save * @Description:新增 - * @author: * @param dto * @return ResultDto 返回类型 * @throws @@ -26,10 +24,7 @@ public interface ${table.humpClassName}Facade{ public ResultDto save(${table.humpClassName}DTO dto) throws Exception; /** - * - * @Title: delete * @Description: 通过id删除数据 - * @author: * @param id * @return ResultDto 返回类型 * @throws @@ -37,10 +32,7 @@ public interface ${table.humpClassName}Facade{ public ResultDto delete(Long id); /** - * - * @Title: getById * @Description: 通过id查询 - * @author: * @param @param id * @return ResultDataDto<${table.humpClassName}DTO> * @throws @@ -48,24 +40,27 @@ public interface ${table.humpClassName}Facade{ public ResultDataDto<${table.humpClassName}DTO> getById(Long id) throws Exception; /** - * - * @Title: getAll - * @Description:查询所有数据 - * @author: + * @Description:查询所有数据 * @return ResultDataDto> * @throws */ public ResultDataDto> getAll() throws Exception; /** - * - * @Title: update - * @Description:修改 - * @author: - * @param @param ${table.humpTableName}DTO - * @return int - * @throws - */ + * @Description:修改 + * @param @param ${table.humpTableName}DTO + * @return int + * @throws + */ public ResultDto update(${table.humpClassName}DTO ${table.humpTableName}DTO) throws Exception; + + + /** + * @Description:分页查询记录 + * @return ResultDataDto> + * @throws + */ + public ResultDataDto> getPageList(PageDTO pageDto) throws Exception; + } \ No newline at end of file diff --git a/codemaker-core/src/main/resources/template/dubbo/facadeImpl.ftl b/codemaker-core/src/main/resources/template/dubbo/facadeImpl.ftl index c83b121b39c3eb6647fcfba72d5c42af526157a1..96f996866c3cc43602bd618c24e84d9fcc208bfe 100644 --- a/codemaker-core/src/main/resources/template/dubbo/facadeImpl.ftl +++ b/codemaker-core/src/main/resources/template/dubbo/facadeImpl.ftl @@ -1,4 +1,4 @@ -package ${package}.core.facade.impl; +package ${package}.facade.impl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -6,6 +6,7 @@ import org.apache.dubbo.config.annotation.Service; import com.coderman.utils.response.ResultDataDto; import com.coderman.utils.response.ResultDto; +import com.coderman.utils.response.PageDTO; import ${package}.api.facade.${table.humpClassName}Facade; import ${package}.api.dto.${table.humpClassName}DTO; @@ -61,4 +62,11 @@ public class ${table.humpClassName}FacadeImpl implements ${table.humpClassName}F return resultDto; } + @Override + public ResultDataDto> getPageList(PageDTO pageDto) { + ResultDataDto> resultDataDto = new ResultDataDto>(); + //todo impl code + return resultDataDto; + } + } \ No newline at end of file diff --git a/codemaker-core/src/main/resources/template/dubbo/facadeaop.ftl b/codemaker-core/src/main/resources/template/dubbo/facadeaop.ftl index a55098013dd51cd0d11ff8e072098510dd117193..4b8c4f9a441315ec6a094f1b4f7b557bc72a9152 100644 --- a/codemaker-core/src/main/resources/template/dubbo/facadeaop.ftl +++ b/codemaker-core/src/main/resources/template/dubbo/facadeaop.ftl @@ -1,4 +1,4 @@ -package ${package}.core.aop; +package ${package}.aop; import com.alibaba.fastjson.JSON; @@ -21,7 +21,7 @@ import java.lang.reflect.Method; @Aspect @Slf4j public class FacadeServiceAop { - @Around(value = "execution( public * ${package}.core.facade.impl..*(..))") + @Around(value = "execution( public * ${package}.app.facadeimpl..*(..))") public Object transferException(ProceedingJoinPoint joinPoint) throws Exception { MethodSignature signature = (MethodSignature) joinPoint.getSignature(); Method method = signature.getMethod(); diff --git a/codemaker-core/src/main/resources/template/dubbo/mapper.ftl b/codemaker-core/src/main/resources/template/dubbo/mapper.ftl index 04ec226e05c248985e4a0aaa0240205ed00d09a9..a855883d26624e32fa303e6b5cb49818a0c5a723 100644 --- a/codemaker-core/src/main/resources/template/dubbo/mapper.ftl +++ b/codemaker-core/src/main/resources/template/dubbo/mapper.ftl @@ -2,6 +2,8 @@ package ${package}.dao.mapper; import java.util.List; import ${package}.dao.dataobject.${table.humpClassName}DO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** @@ -14,56 +16,52 @@ public interface ${table.humpClassName}Mapper{ /** * - * @Title: save - * @Description:新增或修改 - * @author: - * @param @param ${table.humpTableName}DO + * @Description:新增或修改 + * @param ${table.humpTableName}DO * @return int - * @throws */ - public int insert(${table.humpClassName}DO ${table.humpTableName}DO); + public long insert(${table.humpClassName}DO ${table.humpTableName}DO); /** * - * @Title: delete * @Description: 通过id删除数据 - * @author: - * @param @param id + * @param id * @return int - * @throws */ public int deleteById(Long id); /** * - * @Title: getById * @Description: 通过id查询 - * @author: - * @param @param id - * @return ResultDataDto<${table.humpClassName}DO> 返回类型 - * @throws + * @param id + * @return ${table.humpClassName}DO */ public ${table.humpClassName}DO getById(Long id); /** - * - * @Title: getAll - * @Description:查询所有数据 - * @author: - * @return List<${table.humpClassName}DO 返回类型 - * @throws + * @Description:查询所有数据 + * @return List<${table.humpClassName}DO */ public List<${table.humpClassName}DO> getAll(); /** - * - * @Title: update - * @Description:新增或修改 - * @author: - * @param @param ${table.humpTableName}DO - * @return int - * @throws - */ + * + * @Description:新增或修改 + * @param ${table.humpTableName}DO + * @return int + */ public int update(${table.humpClassName}DO ${table.humpTableName}DO); - + + + /** + * @Description:查询所有数据 + * @return List<${table.humpClassName}DO + */ + public List<${table.humpClassName}DO> getPageList(); + + /** + * @Description:查询数量 + * @return int + */ + public int getCount(); } \ No newline at end of file diff --git a/codemaker-core/src/main/resources/template/dubbo/mapperddd.ftl b/codemaker-core/src/main/resources/template/dubbo/mapperddd.ftl new file mode 100644 index 0000000000000000000000000000000000000000..682b73594b3ee1f5decfdaf1482c2d8f7e4bafaa --- /dev/null +++ b/codemaker-core/src/main/resources/template/dubbo/mapperddd.ftl @@ -0,0 +1,24 @@ +package ${class.packageName}; + +<#list imports as importClass> +import ${importClass}; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + + +/** +* @Description:${class.classDesc}接口 +* @Author:${class.author} +* @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} +* @version v1.0 +*/ +@Mapper +public interface ${class.className}{ + +<#list methods as method> + ${method.doc} + ${method.returnClass} ${method.methodName}; + + +} \ No newline at end of file diff --git a/codemaker-core/src/main/resources/template/dubbo/mapperxml.ftl b/codemaker-core/src/main/resources/template/dubbo/mapperxml.ftl index b6f6b2b0962258059e3eb07cbd80390844334113..0a93342d04e426881e0e25f9ee3a0a4389097a14 100644 --- a/codemaker-core/src/main/resources/template/dubbo/mapperxml.ftl +++ b/codemaker-core/src/main/resources/template/dubbo/mapperxml.ftl @@ -11,6 +11,10 @@ + + + + @@ -33,12 +37,12 @@ where id = <#noparse>#{id<#noparse>} - select from ${table.tableName} @@ -46,4 +50,13 @@ delete from ${table.tableName} where id = <#noparse>#{id<#noparse>} + + + + + diff --git a/codemaker-core/src/main/resources/template/dubbo/mapperxmlddd.ftl b/codemaker-core/src/main/resources/template/dubbo/mapperxmlddd.ftl new file mode 100644 index 0000000000000000000000000000000000000000..7d50a9abc14735d5c345f581d318c4ba35bb7d4d --- /dev/null +++ b/codemaker-core/src/main/resources/template/dubbo/mapperxmlddd.ftl @@ -0,0 +1,59 @@ + + + + + + + + + <#list columns as column> + + + + + + + + + + + + + ${table.columnNameList} + + + + insert into ${table.tableName}( + ${table.insertColumnNames} + ) + values( + ${table.insertColumnNameList} + ) + + + + update ${table.tableName} + set + ${table.updateColumnNameList} + where id = <#noparse>#{id<#noparse>} + + + + + + + + delete from ${table.tableName} where id = <#noparse>#{id<#noparse>} + + +<#list fields as field> +${field.fieldName} + + + + + diff --git a/codemaker-core/src/main/resources/template/dubbo/service.ftl b/codemaker-core/src/main/resources/template/dubbo/service.ftl index 0996e2d9b844f94dfe10982ac59fa536536ef4c9..83cea8c547d423d7aba65ce057b95c2851803693 100644 --- a/codemaker-core/src/main/resources/template/dubbo/service.ftl +++ b/codemaker-core/src/main/resources/template/dubbo/service.ftl @@ -13,10 +13,7 @@ import ${package}.model.bo.${table.humpClassName}BO; public interface ${table.humpClassName}Service{ /** - * - * @Title: save * @Description:新增 - * @author: * @param bo * @return ResultDto 返回类型 * @throws @@ -24,21 +21,15 @@ public interface ${table.humpClassName}Service{ public ${table.humpClassName}BO save(${table.humpClassName}BO bo) throws Exception; /** - * - * @Title: delete * @Description: 通过id删除数据 - * @author: * @param id * @return ResultDto 返回类型 * @throws */ - public boolean delete(Long id); + public Boolean delete(Long id); /** - * - * @Title: getById * @Description: 通过id查询 - * @author: * @param id * @return ResultDataDto<${table.humpClassName}BO> * @throws @@ -46,24 +37,26 @@ public interface ${table.humpClassName}Service{ public ${table.humpClassName}BO getById(Long id) throws Exception; /** - * - * @Title: getAll - * @Description:查询所有数据 - * @author: + * @Description:查询所有数据 * @return List<${table.humpClassName}BO> * @throws */ public List<${table.humpClassName}BO> getAll() throws Exception; /** - * - * @Title: update - * @Description:修改 - * @author: - * @param ${table.humpTableName}BO - * @return boolean - * @throws - */ - public boolean update(${table.humpClassName}BO ${table.humpTableName}BO) throws Exception; + * @Description:修改 + * @param ${table.humpTableName}BO + * @return boolean + * @throws + */ + public Boolean update(${table.humpClassName}BO ${table.humpTableName}BO) throws Exception; + + + /** + * @Description:分页查询数据 + * @return List<${table.humpClassName}BO> + * @throws + */ + public List<${table.humpClassName}BO> getPageList() throws Exception; } \ No newline at end of file diff --git a/codemaker-core/src/main/resources/template/dubbo/serviceImpl.ftl b/codemaker-core/src/main/resources/template/dubbo/serviceImpl.ftl index bf40150aa498a39fbaa978f7a6a05e438c7f6407..66ac9dda998fc18819d6913e3715d58bdea6fd51 100644 --- a/codemaker-core/src/main/resources/template/dubbo/serviceImpl.ftl +++ b/codemaker-core/src/main/resources/template/dubbo/serviceImpl.ftl @@ -1,12 +1,12 @@ -package ${package}.core.service.impl; +package ${package}.service.impl; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; import ${package}.dao.mapper.${table.humpClassName}Mapper; -import ${package}.core.service.${table.humpClassName}Service; -import ${package}.core.model.bo.${table.humpClassName}BO; +import ${package}.service.${table.humpClassName}Service; +import ${package}.model.bo.${table.humpClassName}BO; import java.util.List; @@ -47,8 +47,12 @@ public class ${table.humpClassName}ServiceImpl implements ${table.humpClassName} } @Override - public ${table.humpClassName}BO update(${table.humpClassName}BO ${table.humpTableName}BO) throws Exception { - return ${table.humpTableName}BO; + public Boolean update(${table.humpClassName}BO ${table.humpTableName}BO) throws Exception { + return false; } + @Override + public List<${table.humpClassName}BO> getPageList() throws Exception { + return null; + } } \ No newline at end of file diff --git a/codemaker-core/src/main/resources/template/mapper.ftl b/codemaker-core/src/main/resources/template/mapper.ftl index 4c7d42a59f4dafb07f16404886fe6a65e91056e2..8ce3a049661467550a950e9007ee4084567963ca 100644 --- a/codemaker-core/src/main/resources/template/mapper.ftl +++ b/codemaker-core/src/main/resources/template/mapper.ftl @@ -13,10 +13,10 @@ import ${package}.entity.${table.humpClassName}Entity; public interface ${table.humpClassName}Mapper{ /** - * - * @Title: save - * @Description:新增或修改 - * @author: + * + * @Title: save + * @Description:新增或修改 + * @author: * @param @param ${table.humpTableName}Entity * @return int * @throws @@ -24,10 +24,10 @@ public interface ${table.humpClassName}Mapper{ public int insert(${table.humpClassName}Entity ${table.humpTableName}Entity); /** - * - * @Title: delete + * + * @Title: delete * @Description: 通过id删除数据 - * @author: + * @author: * @param @param id * @return int * @throws @@ -35,10 +35,10 @@ public interface ${table.humpClassName}Mapper{ public int deleteById(Long id); /** - * - * @Title: getById + * + * @Title: getById * @Description: 通过id查询 - * @author: + * @author: * @param @param id * @return ResultDataDto<${table.humpClassName}Entity> 返回类型 * @throws @@ -46,10 +46,10 @@ public interface ${table.humpClassName}Mapper{ public ${table.humpClassName}Entity getById(Long id); /** - * - * @Title: getAll - * @Description:查询所有数据 - * @author: + * + * @Title: getAll + * @Description:查询所有数据 + * @author: * @return List<${table.humpClassName}Entity 返回类型 * @throws */ diff --git a/codemaker-core/src/main/resources/template/springboot/AppEventPublisher.ftl b/codemaker-core/src/main/resources/template/springboot/AppEventPublisher.ftl new file mode 100644 index 0000000000000000000000000000000000000000..a46044426b5c0ba29e5c9aba113dbbac727f4761 --- /dev/null +++ b/codemaker-core/src/main/resources/template/springboot/AppEventPublisher.ftl @@ -0,0 +1,18 @@ +package ${package}.utils; + +import ${package}.domain.event.BaseEvent; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.stereotype.Component; + +@Component +public class AppEventPublisher { + + @Autowired + private ApplicationContext applicationContext; + + public void publish(T t) { + applicationContext.publishEvent(t); + } + +} \ No newline at end of file diff --git a/codemaker-core/src/main/resources/template/springboot/BaseEvent.ftl b/codemaker-core/src/main/resources/template/springboot/BaseEvent.ftl new file mode 100644 index 0000000000000000000000000000000000000000..4ff2d9325cbbb820b018940f57ffd1c6968cd2c7 --- /dev/null +++ b/codemaker-core/src/main/resources/template/springboot/BaseEvent.ftl @@ -0,0 +1,9 @@ +package ${package}.domain.event; + +import org.springframework.context.ApplicationEvent; + +public class BaseEvent extends ApplicationEvent { + public BaseEvent(Object source) { + super(source); + } +} diff --git a/codemaker-core/src/main/resources/template/springboot/SpringApplicationContext.ftl b/codemaker-core/src/main/resources/template/springboot/SpringApplicationContext.ftl index f00b4e93e1d933067d247c6a32766ed4ffb6d60a..a6e7b6374ce46bd405e58bf3bd179e2feffe8b6b 100644 --- a/codemaker-core/src/main/resources/template/springboot/SpringApplicationContext.ftl +++ b/codemaker-core/src/main/resources/template/springboot/SpringApplicationContext.ftl @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ - package ${package}.context; + package ${package}.utils; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; diff --git a/codemaker-core/src/main/resources/template/springboot/application.ftl b/codemaker-core/src/main/resources/template/springboot/application.ftl index b64ca55af5fd09d4bfe60c8a1d04390c378625ad..62e9e70e4cbd4eff27bc42c1405ffd0281b152bc 100644 --- a/codemaker-core/src/main/resources/template/springboot/application.ftl +++ b/codemaker-core/src/main/resources/template/springboot/application.ftl @@ -7,14 +7,8 @@ import org.slf4j.LoggerFactory; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.cloud.client.loadbalancer.LoadBalanced; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; -import org.springframework.web.client.RestTemplate; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; /** @@ -24,14 +18,8 @@ import org.springframework.web.bind.annotation.*; * @version v1.0 */ @SpringBootApplication(exclude = DataSourceAutoConfiguration.class) -@EnableDiscoveryClient -@ComponentScan({"com.lightsnail.**","com.alibaba.nacos","com.coderman.**"}) +@ComponentScan({"${package}.**"}) public class Application { - @LoadBalanced - @Bean - public RestTemplate restTemplate() { - return new RestTemplate(); - } public static void main(String[] args) { SpringApplication.run(Application.class, args); diff --git a/codemaker-core/src/main/resources/template/springboot/bo.ftl b/codemaker-core/src/main/resources/template/springboot/bo.ftl index ff33f1e6f726b7699806dc8ed67a1bf142a3ec6e..bda879528eb4348db9074de60a254d187dec78ea 100644 --- a/codemaker-core/src/main/resources/template/springboot/bo.ftl +++ b/codemaker-core/src/main/resources/template/springboot/bo.ftl @@ -1,4 +1,4 @@ -package ${package}.core.model.bo; +package ${package}.bo; import java.util.Date; import java.math.BigDecimal; diff --git a/codemaker-core/src/main/resources/template/springboot/controllerddd.ftl b/codemaker-core/src/main/resources/template/springboot/controllerddd.ftl index db0d725575c53aeba8af5a117b4d18c5ff3ff2ea..570a4e93153a5f60083038aa4dca8e1a715ee0b6 100644 --- a/codemaker-core/src/main/resources/template/springboot/controllerddd.ftl +++ b/codemaker-core/src/main/resources/template/springboot/controllerddd.ftl @@ -21,14 +21,17 @@ public class ${class.className} { protected Logger logger = LoggerFactory.getLogger(${class.className}.class); +<#list fields as field> + @Autowired + ${field.visibility} ${field.fieldName}; + + <#list methods as method> - /** - * - * @Description:${method.desc} - * @return ${method.returnClass} - */ + +${method.doc} @RequestMapping(value = "${method.pathValue}") public ${method.returnClass} ${method.methodName}{ +${method.methodContent} ${method.returnBody} } diff --git a/codemaker-core/src/main/resources/template/springboot/do.ftl b/codemaker-core/src/main/resources/template/springboot/do.ftl index 0416b5c5eca04c2cb11b535bffc2265678604b46..5cb6980c8680c78017324dca6939094acf5835ec 100644 --- a/codemaker-core/src/main/resources/template/springboot/do.ftl +++ b/codemaker-core/src/main/resources/template/springboot/do.ftl @@ -1,4 +1,4 @@ -package ${package}.dao.dataobject; +package ${packageInfrast}.dao.dataobject; import java.util.Date; import java.math.BigDecimal; diff --git a/codemaker-core/src/main/resources/template/springboot/dto.ftl b/codemaker-core/src/main/resources/template/springboot/dto.ftl index 12465ba0cc11a90cdf0a02265ce52772ceeab0ac..53b7d4e007d74fb912a31d9b3f39979a36d3c88e 100644 --- a/codemaker-core/src/main/resources/template/springboot/dto.ftl +++ b/codemaker-core/src/main/resources/template/springboot/dto.ftl @@ -1,4 +1,4 @@ -package ${package}.api.dto; +package ${package}.dto; import java.util.Date; import java.math.BigDecimal; diff --git a/codemaker-core/src/main/resources/template/springboot/mapper.ftl b/codemaker-core/src/main/resources/template/springboot/mapper.ftl index 04ec226e05c248985e4a0aaa0240205ed00d09a9..db78b21dca8f442b236fe1bf20f5c7a80263c25d 100644 --- a/codemaker-core/src/main/resources/template/springboot/mapper.ftl +++ b/codemaker-core/src/main/resources/template/springboot/mapper.ftl @@ -2,6 +2,8 @@ package ${package}.dao.mapper; import java.util.List; import ${package}.dao.dataobject.${table.humpClassName}DO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** @@ -10,60 +12,57 @@ import ${package}.dao.dataobject.${table.humpClassName}DO; * @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} * @version v1.0 */ +@Mapper public interface ${table.humpClassName}Mapper{ /** * - * @Title: save - * @Description:新增或修改 - * @author: - * @param @param ${table.humpTableName}DO + * @Description:新增或修改 + * @param ${table.humpTableName}DO * @return int - * @throws */ - public int insert(${table.humpClassName}DO ${table.humpTableName}DO); + public long insert(${table.humpClassName}DO ${table.humpTableName}DO); /** - * - * @Title: delete * @Description: 通过id删除数据 - * @author: - * @param @param id + * @param id * @return int - * @throws */ public int deleteById(Long id); /** - * - * @Title: getById * @Description: 通过id查询 - * @author: - * @param @param id - * @return ResultDataDto<${table.humpClassName}DO> 返回类型 - * @throws + * @param id + * @return ResultDataDto<${table.humpClassName}DO> */ public ${table.humpClassName}DO getById(Long id); /** - * - * @Title: getAll - * @Description:查询所有数据 - * @author: - * @return List<${table.humpClassName}DO 返回类型 - * @throws + * @Description:查询所有数据 + * @return List<${table.humpClassName}DO */ public List<${table.humpClassName}DO> getAll(); /** * - * @Title: update * @Description:新增或修改 - * @author: - * @param @param ${table.humpTableName}DO + * @param ${table.humpTableName}DO * @return int - * @throws */ public int update(${table.humpClassName}DO ${table.humpTableName}DO); - + + /** + * @Description:查询所有数据 + * @return List<${table.humpClassName}DO + */ + public List<${table.humpClassName}DO> getPageList(); + + + /** + * @Description:查询数量 + * @return int + */ + public int getCount(); + + } \ No newline at end of file diff --git a/codemaker-core/src/main/resources/template/springboot/mapperddd.ftl b/codemaker-core/src/main/resources/template/springboot/mapperddd.ftl new file mode 100644 index 0000000000000000000000000000000000000000..43102bc46dc874bde3bcc9316203d6183e3adda9 --- /dev/null +++ b/codemaker-core/src/main/resources/template/springboot/mapperddd.ftl @@ -0,0 +1,26 @@ +package ${class.packageName}; + +<#list imports as importClass> +import ${importClass}; + + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + + + +/** +* @Description:${class.classDesc}接口 +* @Author:${class.author} +* @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} +* @version v1.0 +*/ +@Mapper +public interface ${class.className}{ + +<#list methods as method> + ${method.doc} + ${method.returnClass} ${method.methodName}; + + +} \ No newline at end of file diff --git a/codemaker-core/src/main/resources/template/springboot/mapperxml.ftl b/codemaker-core/src/main/resources/template/springboot/mapperxml.ftl index b6f6b2b0962258059e3eb07cbd80390844334113..3e3c284f13bb9414fe3d561bdc4f4a9453ced9bd 100644 --- a/codemaker-core/src/main/resources/template/springboot/mapperxml.ftl +++ b/codemaker-core/src/main/resources/template/springboot/mapperxml.ftl @@ -11,6 +11,11 @@ + + + + + @@ -33,12 +38,12 @@ where id = <#noparse>#{id<#noparse>} - select from ${table.tableName} @@ -46,4 +51,12 @@ delete from ${table.tableName} where id = <#noparse>#{id<#noparse>} + + + + diff --git a/codemaker-core/src/main/resources/template/springboot/mapperxmlddd.ftl b/codemaker-core/src/main/resources/template/springboot/mapperxmlddd.ftl new file mode 100644 index 0000000000000000000000000000000000000000..7d50a9abc14735d5c345f581d318c4ba35bb7d4d --- /dev/null +++ b/codemaker-core/src/main/resources/template/springboot/mapperxmlddd.ftl @@ -0,0 +1,59 @@ + + + + + + + + + <#list columns as column> + + + + + + + + + + + + + ${table.columnNameList} + + + + insert into ${table.tableName}( + ${table.insertColumnNames} + ) + values( + ${table.insertColumnNameList} + ) + + + + update ${table.tableName} + set + ${table.updateColumnNameList} + where id = <#noparse>#{id<#noparse>} + + + + + + + + delete from ${table.tableName} where id = <#noparse>#{id<#noparse>} + + +<#list fields as field> +${field.fieldName} + + + + + diff --git a/codemaker-core/src/main/resources/template/springboot/service.ftl b/codemaker-core/src/main/resources/template/springboot/service.ftl index 0996e2d9b844f94dfe10982ac59fa536536ef4c9..13903d7f54e740c4970624dde9be6eccc4ad068c 100644 --- a/codemaker-core/src/main/resources/template/springboot/service.ftl +++ b/codemaker-core/src/main/resources/template/springboot/service.ftl @@ -2,7 +2,7 @@ package ${package}.service; import java.util.List; -import ${package}.model.bo.${table.humpClassName}BO; +import ${package}.bo.${table.humpClassName}BO; /** * @Description:${table.tableComment}Service接口 @@ -13,10 +13,7 @@ import ${package}.model.bo.${table.humpClassName}BO; public interface ${table.humpClassName}Service{ /** - * - * @Title: save * @Description:新增 - * @author: * @param bo * @return ResultDto 返回类型 * @throws @@ -24,21 +21,15 @@ public interface ${table.humpClassName}Service{ public ${table.humpClassName}BO save(${table.humpClassName}BO bo) throws Exception; /** - * - * @Title: delete * @Description: 通过id删除数据 - * @author: * @param id * @return ResultDto 返回类型 * @throws */ - public boolean delete(Long id); + public Boolean delete(Long id); /** - * - * @Title: getById * @Description: 通过id查询 - * @author: * @param id * @return ResultDataDto<${table.humpClassName}BO> * @throws @@ -46,24 +37,33 @@ public interface ${table.humpClassName}Service{ public ${table.humpClassName}BO getById(Long id) throws Exception; /** - * - * @Title: getAll - * @Description:查询所有数据 - * @author: + * @Description:查询所有数据 * @return List<${table.humpClassName}BO> * @throws */ public List<${table.humpClassName}BO> getAll() throws Exception; /** - * - * @Title: update - * @Description:修改 - * @author: - * @param ${table.humpTableName}BO - * @return boolean - * @throws - */ - public boolean update(${table.humpClassName}BO ${table.humpTableName}BO) throws Exception; + * @Description:修改 + * @param ${table.humpTableName}BO + * @return boolean + * @throws + */ + public Boolean update(${table.humpClassName}BO ${table.humpTableName}BO) throws Exception; + + + /** + * @Description:分页查询数据 + * @return List<${table.humpClassName}BO> + * @throws + */ + public List<${table.humpClassName}BO> getPageList() throws Exception; + + /** + * @Description:查询数量 + * @return int + */ + public int getCount() throws Exception; + } \ No newline at end of file diff --git a/codemaker-core/src/main/resources/template/springboot/serviceImpl.ftl b/codemaker-core/src/main/resources/template/springboot/serviceImpl.ftl index 8974666ce1f29c8fde702b2c43fb00879fbaef19..496601eeae98d89de8913b72045c62a0a364ecf9 100644 --- a/codemaker-core/src/main/resources/template/springboot/serviceImpl.ftl +++ b/codemaker-core/src/main/resources/template/springboot/serviceImpl.ftl @@ -8,10 +8,9 @@ import org.springframework.stereotype.Service; import com.coderman.utils.response.ResultDataDto; import com.coderman.utils.response.ResultDto; -import ${package}.mapper.${table.humpClassName}Mapper; +import ${package}.dao.mapper.${table.humpClassName}Mapper; import ${package}.service.${table.humpClassName}Service; -import ${package}.vo.${table.humpClassName}VO; -import ${package}.entity.${table.humpClassName}Entity; +import ${package}.bo.${table.humpClassName}BO; import java.util.List; import org.apache.commons.lang3.StringUtils; @@ -32,40 +31,47 @@ public class ${table.humpClassName}ServiceImpl implements ${table.humpClassName} private ${table.humpClassName}Mapper ${table.humpTableName}Mapper; @Override - public ResultDto save(${table.humpClassName}VO vo) { - ResultDto resultDto = new ResultDto(); + public ${table.humpClassName}BO save(${table.humpClassName}BO bo) { //todo impl code - return resultDto; + return null; } @Override - public ResultDto delete(Long id) { - ResultDto resultDto = new ResultDto(); + public Boolean delete(Long id) { logger.info("${table.humpTableName}Service.delete,id="+id); //todo impl code - return resultDto; + return false; } @Override - public ResultDataDto<${table.humpClassName}VO> getById(Long id) { - ResultDataDto<${table.humpClassName}VO> resultDataDto = new ResultDataDto<${table.humpClassName}VO>(); + public ${table.humpClassName}BO getById(Long id) { logger.info("${table.humpTableName}Service.getById,id="+id); //todo impl code - return resultDataDto; + return null; } @Override - public ResultDataDto> getAll() { - ResultDataDto> resultDataDto = new ResultDataDto>(); + public List<${table.humpClassName}BO> getAll() { //todo impl code - return resultDataDto; + return null; } @Override - public ResultDto update(${table.humpClassName}VO vo) { - ResultDto resultDto = new ResultDto(); + public Boolean update(${table.humpClassName}BO bo) { //todo impl code - return resultDto; + return false; + } + + + @Override + public List<${table.humpClassName}BO> getPageList() throws Exception { + return null; + } + + + @Override + public int getCount() throws Exception { + return 0; } } \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-api/pom.xml b/codemaker-dubbo/dubbo-api/pom.xml index e1224d6501d493dfa0c89f7468c6cf1f6b75689c..6940691cbca6d3e8d7be1846c88b40182f4fc629 100644 --- a/codemaker-dubbo/dubbo-api/pom.xml +++ b/codemaker-dubbo/dubbo-api/pom.xml @@ -38,7 +38,7 @@ com.coderman.utils coderman-utils - 1.0.2-SNAPSHOT + 1.0.4-SNAPSHOT diff --git a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/AuthorityResponseDTO.java b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/AuthorityResponseDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..c4f009a2e1e424f9320eaac3a67aa3c0e1283e32 --- /dev/null +++ b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/AuthorityResponseDTO.java @@ -0,0 +1,37 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:权限类 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Data +@ToString +public class AuthorityResponseDTO { + + /** 主键ID **/ + private Long id; + /** 权限编码标示 **/ + private String authCode; + /** 权限类型 **/ + private Integer authorityType; + /** 关联角色 **/ + private String roleCode; + /** 关联角色组 **/ + private String roleGroupCode; + /** 权限状态 **/ + private Integer status; + /** 数据字段权限列表 **/ + /** private List dataAuthorityBOList **/; + /** 系统菜单权限列表 **/ + /** private List systemAuthorityBOList **/; + /** 行政权限列表 **/ + /** private List adminAuthorityBOList **/; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/CreateAuthorityRequestDTO.java b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/CreateAuthorityRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..7d88490d10f518c71756dfba2fdd0b4199c92908 --- /dev/null +++ b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/CreateAuthorityRequestDTO.java @@ -0,0 +1,37 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:权限类 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Data +@ToString +public class CreateAuthorityRequestDTO { + + /** 主键ID **/ + private Long id; + /** 权限编码标示 **/ + private String authCode; + /** 权限类型 **/ + private Integer authorityType; + /** 关联角色 **/ + private String roleCode; + /** 关联角色组 **/ + private String roleGroupCode; + /** 权限状态 **/ + private Integer status; + /** 数据字段权限列表 **/ + /** private List dataAuthorityBOList **/; + /** 系统菜单权限列表 **/ + /** private List systemAuthorityBOList **/; + /** 行政权限列表 **/ + /** private List adminAuthorityBOList **/; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/CreateDataAuthorityRequestDTO.java b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/CreateDataAuthorityRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..e1556aae2dee6ea5eaf1ab2956286f3439e42e2f --- /dev/null +++ b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/CreateDataAuthorityRequestDTO.java @@ -0,0 +1,25 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:数据字段权限类 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Data +@ToString +public class CreateDataAuthorityRequestDTO { + + /** 主键ID **/ + private Long id; + /** 权限编码标示 **/ + private String authCode; + /** 数据字段ID **/ + private Long dataColumnId; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/CreateMenuRequestDTO.java b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/CreateMenuRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..3c110d389a0459beecd9acf9aefb990d331a2d00 --- /dev/null +++ b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/CreateMenuRequestDTO.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:按钮管理类 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Data +@ToString +public class CreateMenuRequestDTO { + + /** 主键ID **/ + private Long id; + /** 按钮名称 **/ + private String menuName; + /** 按钮编码 **/ + private String menuCode; + /** 按钮链接 **/ + private String menuUrl; + /** 系统编码 **/ + private String systemCode; + /** 菜单编码 **/ + private String moduleCode; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/CreateModuleRequestDTO.java b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/CreateModuleRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..300ae1cc53082d858c0d8f5236d9e8c51bfef215 --- /dev/null +++ b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/CreateModuleRequestDTO.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:菜单/模块管理类 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Data +@ToString +public class CreateModuleRequestDTO { + + /** 主键ID **/ + private Long id; + /** 菜单名称 **/ + private String moduleName; + /** 菜单编码 **/ + private String moduleCode; + /** 菜单链接 **/ + private String moduleUrl; + /** 系统标示 **/ + private String systemCode; + /** 按钮列表 **/ + /** private List menuBOList **/; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/CreateRoleRequestDTO.java b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/CreateRoleRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..9a0d08c5f2c8db4451e26e1efe573df682d21a38 --- /dev/null +++ b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/CreateRoleRequestDTO.java @@ -0,0 +1,29 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:角色类 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Data +@ToString +public class CreateRoleRequestDTO { + + /** 主键ID **/ + private Long id; + /** 角色名称 **/ + private String roleName; + /** 角色编码 **/ + private String roleCode; + /** 角色状态 **/ + private Integer status; + /** 角色对应用户列表 **/ + /** private List userList **/; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/CreateSystemAuthorityRequestDTO.java b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/CreateSystemAuthorityRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..a69502ab4a4af529334e2d300596304d947da2af --- /dev/null +++ b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/CreateSystemAuthorityRequestDTO.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:系统菜单权限类 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Data +@ToString +public class CreateSystemAuthorityRequestDTO { + + /** 主键ID **/ + private Long id; + /** 权限编码标示 **/ + private String authCode; + /** 业务数据系统标示 **/ + private String systemName; + /** 功能 **/ + private String funcName; + /** 菜单 **/ + private String categoryName; + /** 按钮 **/ + private String menuName; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/CreateSystemRequestDTO.java b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/CreateSystemRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..dbe4a0597dd46d0d5c3ef7b7d839f9aafb5660a0 --- /dev/null +++ b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/CreateSystemRequestDTO.java @@ -0,0 +1,37 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:系统管理类 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Data +@ToString +public class CreateSystemRequestDTO { + + /** 主键ID **/ + private Long id; + /** 系统名称 **/ + private String systemName; + /** 系统标示 **/ + private String systemCode; + /** 系统域名 **/ + private String systemUrl; + /** 系统图标 **/ + private String systemPicUrl; + /** 系统技术负责人 **/ + private Long tecAdminUserId; + /** 系统业务负责人 **/ + private Long busAdminUserId; + /** 系统当前所在部门 **/ + private Long departmentId; + /** 系统模块列表 **/ + /** private List moduleBOList **/; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/CreateUserGroupRequestDTO.java b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/CreateUserGroupRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..93f48a5532dad44bd5f2f422ca4b78063c25a70a --- /dev/null +++ b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/CreateUserGroupRequestDTO.java @@ -0,0 +1,33 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:用户组类 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Data +@ToString +public class CreateUserGroupRequestDTO { + + /** 主键ID **/ + private Long id; + /** 组名 **/ + private String groupName; + /** 组编码 **/ + private String groupCode; + /** 用户组状态 **/ + private Integer status; + /** 组内用户列表 **/ + /** private List userList **/; + /** 用户组对应的角色列表 **/ + /** private List roleList **/; + /** 用户组对应角色组列表 **/ + /** private List roleGroupList **/; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/DataAuthorityResponseDTO.java b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/DataAuthorityResponseDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..0c1eff881ccf3ccd85032ab0f110d7d4ad17ed3b --- /dev/null +++ b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/DataAuthorityResponseDTO.java @@ -0,0 +1,25 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:数据字段权限类 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Data +@ToString +public class DataAuthorityResponseDTO { + + /** 主键ID **/ + private Long id; + /** 权限编码标示 **/ + private String authCode; + /** 数据字段ID **/ + private Long dataColumnId; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/MenuResponseDTO.java b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/MenuResponseDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..c835de8317c0a6c4b2ca13758efe435fdb5d0290 --- /dev/null +++ b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/MenuResponseDTO.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:按钮管理类 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Data +@ToString +public class MenuResponseDTO { + + /** 主键ID **/ + private Long id; + /** 按钮名称 **/ + private String menuName; + /** 按钮编码 **/ + private String menuCode; + /** 按钮链接 **/ + private String menuUrl; + /** 系统编码 **/ + private String systemCode; + /** 菜单编码 **/ + private String moduleCode; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/ModuleResponseDTO.java b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/ModuleResponseDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..e18c2a0fd7f6b0bac445c1ff74c69a120af89be1 --- /dev/null +++ b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/ModuleResponseDTO.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:菜单/模块管理类 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Data +@ToString +public class ModuleResponseDTO { + + /** 主键ID **/ + private Long id; + /** 菜单名称 **/ + private String moduleName; + /** 菜单编码 **/ + private String moduleCode; + /** 菜单链接 **/ + private String moduleUrl; + /** 系统标示 **/ + private String systemCode; + /** 按钮列表 **/ + /** private List menuBOList **/; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/RoleGroupResponseDTO.java b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/RoleGroupResponseDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..5e72c4060851551753ac720bb62883e2af736e74 --- /dev/null +++ b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/RoleGroupResponseDTO.java @@ -0,0 +1,29 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:角色组类 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Data +@ToString +public class RoleGroupResponseDTO { + + /** 主键ID **/ + private Long id; + /** 角色组名称 **/ + private String roleName; + /** 角色组编码 **/ + private String roleCode; + /** 角色状态 **/ + private Integer status; + /** 组内角色列表 **/ + /** private List roleList **/; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/RoleResponseDTO.java b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/RoleResponseDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..fe314d5c98af89ee32bb2b92a6ad3aa0ec0c195e --- /dev/null +++ b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/RoleResponseDTO.java @@ -0,0 +1,29 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:角色类 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Data +@ToString +public class RoleResponseDTO { + + /** 主键ID **/ + private Long id; + /** 角色名称 **/ + private String roleName; + /** 角色编码 **/ + private String roleCode; + /** 角色状态 **/ + private Integer status; + /** 角色对应用户列表 **/ + /** private List userList **/; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/SystemAuthorityResponseDTO.java b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/SystemAuthorityResponseDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..46f4667189e2f11afc5b49dbd231522ded474b37 --- /dev/null +++ b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/SystemAuthorityResponseDTO.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:系统菜单权限类 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Data +@ToString +public class SystemAuthorityResponseDTO { + + /** 主键ID **/ + private Long id; + /** 权限编码标示 **/ + private String authCode; + /** 业务数据系统标示 **/ + private String systemName; + /** 功能 **/ + private String funcName; + /** 菜单 **/ + private String categoryName; + /** 按钮 **/ + private String menuName; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/SystemDTO.java b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/SystemDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..b73dc57e9adf27c3fb23a69579e6ba49bb0bbbe0 --- /dev/null +++ b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/SystemDTO.java @@ -0,0 +1,37 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:系统管理类 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Data +@ToString +public class SystemDTO { + + /** 主键ID **/ + private Long id; + /** 系统名称 **/ + private String systemName; + /** 系统标示 **/ + private String systemCode; + /** 系统域名 **/ + private String systemUrl; + /** 系统图标 **/ + private String systemPicUrl; + /** 系统技术负责人 **/ + private Long tecAdminUserId; + /** 系统业务负责人 **/ + private Long busAdminUserId; + /** 系统当前所在部门 **/ + private Long departmentId; + /** 系统模块列表 **/ + /** private List moduleBOList **/; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/UpdateAuthorityRequestDTO.java b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/UpdateAuthorityRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..c60bd6176accd5c25f6b8380e601c2bcbf617aa3 --- /dev/null +++ b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/UpdateAuthorityRequestDTO.java @@ -0,0 +1,37 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:权限类 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Data +@ToString +public class UpdateAuthorityRequestDTO { + + /** 主键ID **/ + private Long id; + /** 权限编码标示 **/ + private String authCode; + /** 权限类型 **/ + private Integer authorityType; + /** 关联角色 **/ + private String roleCode; + /** 关联角色组 **/ + private String roleGroupCode; + /** 权限状态 **/ + private Integer status; + /** 数据字段权限列表 **/ + /** private List dataAuthorityBOList **/; + /** 系统菜单权限列表 **/ + /** private List systemAuthorityBOList **/; + /** 行政权限列表 **/ + /** private List adminAuthorityBOList **/; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/UpdateDataAuthorityRequestDTO.java b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/UpdateDataAuthorityRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..72ae76085d17f3a21a711254913b7ed48d6f3229 --- /dev/null +++ b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/UpdateDataAuthorityRequestDTO.java @@ -0,0 +1,25 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:数据字段权限类 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Data +@ToString +public class UpdateDataAuthorityRequestDTO { + + /** 主键ID **/ + private Long id; + /** 权限编码标示 **/ + private String authCode; + /** 数据字段ID **/ + private Long dataColumnId; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/UpdateMenuRequestDTO.java b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/UpdateMenuRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..29070a72b1a1ebe416d58544763bbe3b705ada83 --- /dev/null +++ b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/UpdateMenuRequestDTO.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:按钮管理类 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Data +@ToString +public class UpdateMenuRequestDTO { + + /** 主键ID **/ + private Long id; + /** 按钮名称 **/ + private String menuName; + /** 按钮编码 **/ + private String menuCode; + /** 按钮链接 **/ + private String menuUrl; + /** 系统编码 **/ + private String systemCode; + /** 菜单编码 **/ + private String moduleCode; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/UpdateModuleRequestDTO.java b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/UpdateModuleRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..cecb068692499b35b3c98febb4f04879e7567659 --- /dev/null +++ b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/UpdateModuleRequestDTO.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:菜单/模块管理类 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Data +@ToString +public class UpdateModuleRequestDTO { + + /** 主键ID **/ + private Long id; + /** 菜单名称 **/ + private String moduleName; + /** 菜单编码 **/ + private String moduleCode; + /** 菜单链接 **/ + private String moduleUrl; + /** 系统标示 **/ + private String systemCode; + /** 按钮列表 **/ + /** private List menuBOList **/; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/UpdateRoleGroupRequestDTO.java b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/UpdateRoleGroupRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..3c7e669f34d9851b8b1d09776b188d696ad87f42 --- /dev/null +++ b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/UpdateRoleGroupRequestDTO.java @@ -0,0 +1,29 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:角色组类 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Data +@ToString +public class UpdateRoleGroupRequestDTO { + + /** 主键ID **/ + private Long id; + /** 角色组名称 **/ + private String roleName; + /** 角色组编码 **/ + private String roleCode; + /** 角色状态 **/ + private Integer status; + /** 组内角色列表 **/ + /** private List roleList **/; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/UpdateRoleRequestDTO.java b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/UpdateRoleRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..496f0b05ed6208f9e664714510280d58e0b3c69b --- /dev/null +++ b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/UpdateRoleRequestDTO.java @@ -0,0 +1,29 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:角色类 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Data +@ToString +public class UpdateRoleRequestDTO { + + /** 主键ID **/ + private Long id; + /** 角色名称 **/ + private String roleName; + /** 角色编码 **/ + private String roleCode; + /** 角色状态 **/ + private Integer status; + /** 角色对应用户列表 **/ + /** private List userList **/; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/UpdateSystemAuthorityRequestDTO.java b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/UpdateSystemAuthorityRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..27e4d56eaaead3629e076c4c04ba0c72bacd3999 --- /dev/null +++ b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/UpdateSystemAuthorityRequestDTO.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:系统菜单权限类 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Data +@ToString +public class UpdateSystemAuthorityRequestDTO { + + /** 主键ID **/ + private Long id; + /** 权限编码标示 **/ + private String authCode; + /** 业务数据系统标示 **/ + private String systemName; + /** 功能 **/ + private String funcName; + /** 菜单 **/ + private String categoryName; + /** 按钮 **/ + private String menuName; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/UpdateSystemRequestDTO.java b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/UpdateSystemRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..f4f0ba03bd914f514359384fa32d50971793345b --- /dev/null +++ b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/UpdateSystemRequestDTO.java @@ -0,0 +1,37 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:系统管理类 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Data +@ToString +public class UpdateSystemRequestDTO { + + /** 主键ID **/ + private Long id; + /** 系统名称 **/ + private String systemName; + /** 系统标示 **/ + private String systemCode; + /** 系统域名 **/ + private String systemUrl; + /** 系统图标 **/ + private String systemPicUrl; + /** 系统技术负责人 **/ + private Long tecAdminUserId; + /** 系统业务负责人 **/ + private Long busAdminUserId; + /** 系统当前所在部门 **/ + private Long departmentId; + /** 系统模块列表 **/ + /** private List moduleBOList **/; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/UpdateUserGroupRequestDTO.java b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/UpdateUserGroupRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..9182b480e51a06407b143e2a4ff365adcc69996d --- /dev/null +++ b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/UpdateUserGroupRequestDTO.java @@ -0,0 +1,33 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:用户组类 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Data +@ToString +public class UpdateUserGroupRequestDTO { + + /** 主键ID **/ + private Long id; + /** 组名 **/ + private String groupName; + /** 组编码 **/ + private String groupCode; + /** 用户组状态 **/ + private Integer status; + /** 组内用户列表 **/ + /** private List userList **/; + /** 用户组对应的角色列表 **/ + /** private List roleList **/; + /** 用户组对应角色组列表 **/ + /** private List roleGroupList **/; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/UserGroupResponseDTO.java b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/UserGroupResponseDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..d9911d5a9a49aa930ade9642a200e4bf25c5221b --- /dev/null +++ b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/UserGroupResponseDTO.java @@ -0,0 +1,33 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:用户组类 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Data +@ToString +public class UserGroupResponseDTO { + + /** 主键ID **/ + private Long id; + /** 组名 **/ + private String groupName; + /** 组编码 **/ + private String groupCode; + /** 用户组状态 **/ + private Integer status; + /** 组内用户列表 **/ + /** private List userList **/; + /** 用户组对应的角色列表 **/ + /** private List roleList **/; + /** 用户组对应角色组列表 **/ + /** private List roleGroupList **/; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/enums/AuthorityTypeEnum.java b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/enums/AuthorityTypeEnum.java new file mode 100644 index 0000000000000000000000000000000000000000..8460dd08070cdaa3b616981dc317725add1094b5 --- /dev/null +++ b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/enums/AuthorityTypeEnum.java @@ -0,0 +1,45 @@ +package com.coderman.infosys.auth.api.enums; + +import lombok.Getter; + + /** + * @Description:权限类型类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:28 + * @version v1.0 + */ +@Getter +public enum AuthorityTypeEnum{ + + /** + * + */ + DATA(1,"数据字段权限"), + FUNCATION(2,"菜单功能权限"), + ADMINISTRATION(3,"行政权限"), + CUSTOMIZE(4,"自定义权限"), + ; + + /** 权限类型code **/ + private Integer code; + /** 权限类型描述 **/ + private String desc; + + + AuthorityTypeEnum(Integer code,String desc){ + this.code = code; + this.desc = desc; + } + + + + /** + * + * @Description:static + * @return AuthorityTypeEnum + */ + public static AuthorityTypeEnum getByCode(Integer code){ + return null; + } + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/facade/AuthorityFacade.java b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/facade/AuthorityFacade.java new file mode 100644 index 0000000000000000000000000000000000000000..37733b40d68fb840cfab462ba0bb076c7240d144 --- /dev/null +++ b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/facade/AuthorityFacade.java @@ -0,0 +1,49 @@ +package com.coderman.infosys.auth.api.facade; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.api.dto.CreateAuthorityRequestDTO; +import com.coderman.infosys.auth.api.dto.AuthorityResponseDTO; + + +/** +* @Description:接口 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +public interface AuthorityFacade{ + + /** + * + * @Description 判断用户有没有访问某系统的权限 + * @param userId + * @param systemCode + * @return ResultDataDto + */ + ResultDataDto checkUserSystemAuth(Long userId,String systemCode); + + /** + * + * @Description 根据用户和系统获取系统权限信息 + * @param userId + * @param systemCode + * @return ResultDataDto + */ + ResultDataDto getUserSystemAuth(Long userId,String systemCode); + + /** + * + * @Description 根据权限code获取权限信息 + * @param authCode + * @return ResultDataDto + */ + ResultDataDto getByCode(String authCode); + + /** + * + * @Description 保存权限信息 + * @param createAuthorityRequestDTO + * @return ResultDataDto + */ + ResultDataDto saveAuthority(CreateAuthorityRequestDTO createAuthorityRequestDTO); +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/facade/DataAuthorityFacade.java b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/facade/DataAuthorityFacade.java new file mode 100644 index 0000000000000000000000000000000000000000..33c416e3428ff5145a8ac42cf7dc2318ec8bc9fc --- /dev/null +++ b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/facade/DataAuthorityFacade.java @@ -0,0 +1,32 @@ +package com.coderman.infosys.auth.api.facade; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.api.dto.CreateDataAuthorityRequestDTO; +import com.coderman.infosys.auth.api.dto.DataAuthorityResponseDTO; +import com.coderman.infosys.auth.api.dto.AuthorityResponseDTO; + + +/** +* @Description:接口 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +public interface DataAuthorityFacade{ + + /** + * + * @Description 获取权限信息 + * @param authCode + * @return ResultDataDto + */ + ResultDataDto getByCode(String authCode); + + /** + * + * @Description 保存权限信息 + * @param createDataAuthorityRequestDTO + * @return ResultDataDto + */ + ResultDataDto saveAuthority(CreateDataAuthorityRequestDTO createDataAuthorityRequestDTO); +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/facade/MenuFacade.java b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/facade/MenuFacade.java new file mode 100644 index 0000000000000000000000000000000000000000..a14ad0ac9fe04708af091d920ac3b8d08b408b06 --- /dev/null +++ b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/facade/MenuFacade.java @@ -0,0 +1,12 @@ +package com.coderman.infosys.auth.api.facade; + + + +/** +* @Description:接口 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +public interface MenuFacade{ +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/facade/ModuleFacade.java b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/facade/ModuleFacade.java new file mode 100644 index 0000000000000000000000000000000000000000..fcc27512eef64a525f9ac1955f86793eb42c96b2 --- /dev/null +++ b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/facade/ModuleFacade.java @@ -0,0 +1,12 @@ +package com.coderman.infosys.auth.api.facade; + + + +/** +* @Description:接口 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +public interface ModuleFacade{ +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/facade/RoleFacade.java b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/facade/RoleFacade.java new file mode 100644 index 0000000000000000000000000000000000000000..b86fe0be2d937b806af13b729161ea3d5217cd5f --- /dev/null +++ b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/facade/RoleFacade.java @@ -0,0 +1,22 @@ +package com.coderman.infosys.auth.api.facade; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.api.dto.RoleResponseDTO; + + +/** +* @Description:接口 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +public interface RoleFacade{ + + /** + * + * @Description 获取角色详情 + * @param roleCode + * @return ResultDataDto + */ + ResultDataDto getByRoleCode(String roleCode); +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/facade/RoleGroupFacade.java b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/facade/RoleGroupFacade.java new file mode 100644 index 0000000000000000000000000000000000000000..1478ec035d95a639af2db88a76c6df8412f773b2 --- /dev/null +++ b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/facade/RoleGroupFacade.java @@ -0,0 +1,22 @@ +package com.coderman.infosys.auth.api.facade; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.api.dto.RoleGroupResponseDTO; + + +/** +* @Description:接口 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +public interface RoleGroupFacade{ + + /** + * + * @Description 获取学生信息 + * @param number + * @return ResultDataDto + */ + ResultDataDto getByNumber(String number); +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/facade/SystemAuthorityFacade.java b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/facade/SystemAuthorityFacade.java new file mode 100644 index 0000000000000000000000000000000000000000..cad8108fc9dc62f4c7809f27222294fb5158f1e4 --- /dev/null +++ b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/facade/SystemAuthorityFacade.java @@ -0,0 +1,23 @@ +package com.coderman.infosys.auth.api.facade; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.api.dto.SystemAuthorityResponseDTO; +import com.coderman.infosys.auth.api.dto.AuthorityResponseDTO; + + +/** +* @Description:接口 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +public interface SystemAuthorityFacade{ + + /** + * + * @Description 获取权限信息 + * @param authCode + * @return ResultDataDto + */ + ResultDataDto getByCode(String authCode); +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/facade/SystemFacade.java b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/facade/SystemFacade.java new file mode 100644 index 0000000000000000000000000000000000000000..0c5973140d7f3eb5f430dbdce0841dec59825624 --- /dev/null +++ b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/facade/SystemFacade.java @@ -0,0 +1,57 @@ +package com.coderman.infosys.auth.api.facade; + +import com.coderman.utils.response.PageDTO; +import java.util.List; +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.api.dto.UpdateSystemRequestDTO; +import com.coderman.infosys.auth.api.dto.SystemDTO; + + +/** +* @Description:接口 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +public interface SystemFacade{ + + /** + * + * @Description 注册系统 + * @param systemDTO + * @return ResultDataDto + */ + ResultDataDto registSystem(SystemDTO systemDTO); + + /** + * + * @Description 分页获取系统信息 + * @param pageDto + * @return ResultDataDto> + */ + ResultDataDto> getPageList(PageDTO pageDto); + + /** + * + * @Description 获取单条系统信息 + * @param systemCode + * @return ResultDataDto + */ + ResultDataDto getBySystemCode(String systemCode); + + /** + * + * @Description 修改系统信息 + * @param dto + * @return ResultDataDto + */ + ResultDataDto updateSystem(UpdateSystemRequestDTO dto); + + /** + * + * @Description 搜索获取系统信息 + * @param search + * @return ResultDataDto> + */ + ResultDataDto> getSearchList(String search); +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/facade/UserGroupFacade.java b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/facade/UserGroupFacade.java new file mode 100644 index 0000000000000000000000000000000000000000..fe6fa537c08ad987dd5d362b44a225f208cd3e75 --- /dev/null +++ b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/facade/UserGroupFacade.java @@ -0,0 +1,23 @@ +package com.coderman.infosys.auth.api.facade; + +import com.coderman.infosys.auth.api.dto.UserGroupResponseDTO; +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.api.dto.CreateUserGroupRequestDTO; + + +/** +* @Description:接口 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +public interface UserGroupFacade{ + + /** + * + * @Description 创建用户组 + * @param createUserGroupRequestDTO + * @return ResultDataDto + */ + ResultDataDto createUserGroup(CreateUserGroupRequestDTO createUserGroupRequestDTO); +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/facade/UserGroupQueryFacade.java b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/facade/UserGroupQueryFacade.java new file mode 100644 index 0000000000000000000000000000000000000000..fceae83bd79b0ed9a6a90abcc1c364fe3a5274ea --- /dev/null +++ b/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/facade/UserGroupQueryFacade.java @@ -0,0 +1,22 @@ +package com.coderman.infosys.auth.api.facade; + +import com.coderman.infosys.auth.api.dto.UserGroupResponseDTO; +import com.coderman.utils.response.ResultDataDto; + + +/** +* @Description:接口 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +public interface UserGroupQueryFacade{ + + /** + * + * @Description 获取用户组信息 + * @param groupCode + * @return ResultDataDto + */ + ResultDataDto getByGroupCode(String groupCode); +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-api/src/main/java/com/lightsnail/schoolmanager/api/dto/ClassDTO.java b/codemaker-dubbo/dubbo-api/src/main/java/com/lightsnail/schoolmanager/api/dto/ClassDTO.java deleted file mode 100644 index af7cb862451aa9e38f1a796ddb4807a16277f222..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-api/src/main/java/com/lightsnail/schoolmanager/api/dto/ClassDTO.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.lightsnail.schoolmanager.api.dto; - -import java.util.Date; -import java.math.BigDecimal; -import lombok.Data; -import lombok.ToString; - -/** -* @Description:DTO类 -* @Author:fanchunshuai -* @CreateTime:2021-06-25 16:19:52 -* @version v1.0 -*/ -@Data -@ToString -public class ClassDTO{ - - /** **/ - private Long id; - /** **/ - private String manager; - /** **/ - private Integer studentCount; - /** 年级 **/ - private Integer gradeNum; - /** 班级 **/ - private Integer classNum; - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-api/src/main/java/com/lightsnail/schoolmanager/api/dto/ClassTeacherDTO.java b/codemaker-dubbo/dubbo-api/src/main/java/com/lightsnail/schoolmanager/api/dto/ClassTeacherDTO.java deleted file mode 100644 index 82bdbaef8f0ba8510e7e2c62340c6614d784709e..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-api/src/main/java/com/lightsnail/schoolmanager/api/dto/ClassTeacherDTO.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.lightsnail.schoolmanager.api.dto; - -import java.util.Date; -import java.math.BigDecimal; -import lombok.Data; -import lombok.ToString; - -/** -* @Description:DTO类 -* @Author:fanchunshuai -* @CreateTime:2021-06-25 16:19:51 -* @version v1.0 -*/ -@Data -@ToString -public class ClassTeacherDTO{ - - /** **/ - private Long id; - /** **/ - private Long classId; - /** **/ - private Long teacherId; - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-api/src/main/java/com/lightsnail/schoolmanager/api/dto/StudentDTO.java b/codemaker-dubbo/dubbo-api/src/main/java/com/lightsnail/schoolmanager/api/dto/StudentDTO.java deleted file mode 100644 index 7772473a557fbbdf1e5ad8ea78b39f4db2ba1ca3..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-api/src/main/java/com/lightsnail/schoolmanager/api/dto/StudentDTO.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.lightsnail.schoolmanager.api.dto; - -import java.util.Date; -import java.math.BigDecimal; -import lombok.Data; -import lombok.ToString; - -/** -* @Description:DTO类 -* @Author:fanchunshuai -* @CreateTime:2021-06-25 16:19:51 -* @version v1.0 -*/ -@Data -@ToString -public class StudentDTO{ - - /** **/ - private Long id; - /** **/ - private String studentName; - /** **/ - private String studentCode; - /** **/ - private String sex; - /** **/ - private Integer age; - /** 班级ID **/ - private Long classId; - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-api/src/main/java/com/lightsnail/schoolmanager/api/dto/TeacherDTO.java b/codemaker-dubbo/dubbo-api/src/main/java/com/lightsnail/schoolmanager/api/dto/TeacherDTO.java deleted file mode 100644 index 9a5f785895958afe04b62df9bcc5719d2602b3e3..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-api/src/main/java/com/lightsnail/schoolmanager/api/dto/TeacherDTO.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.lightsnail.schoolmanager.api.dto; - -import java.util.Date; -import java.math.BigDecimal; -import lombok.Data; -import lombok.ToString; - -/** -* @Description:DTO类 -* @Author:fanchunshuai -* @CreateTime:2021-06-25 16:19:51 -* @version v1.0 -*/ -@Data -@ToString -public class TeacherDTO{ - - /** **/ - private Long id; - /** **/ - private String teacherName; - /** **/ - private Integer age; - /** **/ - private Integer sex; - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-api/src/main/java/com/lightsnail/schoolmanager/api/facade/TeacherFacade.java b/codemaker-dubbo/dubbo-api/src/main/java/com/lightsnail/schoolmanager/api/facade/TeacherFacade.java deleted file mode 100644 index 1f77761ca598639d9580c7fa3aee2e8a80921839..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-api/src/main/java/com/lightsnail/schoolmanager/api/facade/TeacherFacade.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.lightsnail.schoolmanager.api.facade; - -import java.util.List; -import com.coderman.utils.response.ResultDataDto; -import com.coderman.utils.response.ResultDto; - -import com.lightsnail.schoolmanager.api.dto.TeacherDTO; - -/** - * @Description:Facade接口 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 16:19:51 - * @version v1.0 - */ -public interface TeacherFacade{ - - /** - * - * @Title: save - * @Description:新增 - * @author: - * @param @param dto - * @param @param userId - * @return ResultDto 返回类型 - * @throws - */ - public ResultDto save(TeacherDTO dto) throws Exception; - - /** - * - * @Title: delete - * @Description: 通过id删除数据 - * @author: - * @param @param id - * @return ResultDto 返回类型 - * @throws - */ - public ResultDto delete(Long id); - - /** - * - * @Title: getById - * @Description: 通过id查询 - * @author: - * @param @param id - * @return ResultDataDto - * @throws - */ - public ResultDataDto getById(Long id) throws Exception; - - /** - * - * @Title: getAll - * @Description:查询所有数据 - * @author: - * @return ResultDataDto> - * @throws - */ - public ResultDataDto> getAll() throws Exception; - - /** - * - * @Title: update - * @Description:修改 - * @author: - * @param @param teacherDTO - * @return int - * @throws - */ - public ResultDto update(TeacherDTO teacherDTO) throws Exception; - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-common/pom.xml b/codemaker-dubbo/dubbo-common/pom.xml index 0b27a4750c575e0eaa4aa7e9b1234511852e5c96..61234b9881c4d5c97ed4e9cd07bff2d67665e744 100644 --- a/codemaker-dubbo/dubbo-common/pom.xml +++ b/codemaker-dubbo/dubbo-common/pom.xml @@ -55,6 +55,12 @@ mysql mysql-connector-java + + com.coderman.utils + coderman-utils + 1.0.4-SNAPSHOT + compile + diff --git a/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/AdminAuthorityDO.java b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/AdminAuthorityDO.java new file mode 100644 index 0000000000000000000000000000000000000000..19f806a0c5998170aa6d3989f0b2a9ff10e5642c --- /dev/null +++ b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/AdminAuthorityDO.java @@ -0,0 +1,43 @@ +package com.coderman.infosys.auth.infrast.dao.dataobject; + +import java.util.Date; +import java.math.BigDecimal; +import lombok.Data; +import lombok.ToString; + + /** + * @Description:行政数据权限DO类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:28 + * @version v1.0 + */ +@Data +@ToString +public class AdminAuthorityDO{ + + + /** 主键 **/ + private Long id; + + /** 权限标示 **/ + private String authCode; + + /** 组织部门ID **/ + private Long departmentId; + + /** 城市权限 **/ + private Long cityId; + + /** 创建时间 **/ + private Date dateCreate; + + /** 修改时间 **/ + private Date dateUpdate; + + /** 修改人 **/ + private Long updateUserId; + + /** 创建人 **/ + private Long createUserId; + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/AuthorityDO.java b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/AuthorityDO.java new file mode 100644 index 0000000000000000000000000000000000000000..39d72edb3413ea40478e636bbc0701638263cc7f --- /dev/null +++ b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/AuthorityDO.java @@ -0,0 +1,49 @@ +package com.coderman.infosys.auth.infrast.dao.dataobject; + +import java.util.Date; +import java.math.BigDecimal; +import lombok.Data; +import lombok.ToString; + + /** + * @Description:抽象权限表DO类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:28 + * @version v1.0 + */ +@Data +@ToString +public class AuthorityDO{ + + + /** 主键 **/ + private Long id; + + /** 权限编码 **/ + private String authCode; + + /** 权限类型 **/ + private Integer authorityType; + + /** 关联角色编码 **/ + private String roleCode; + + /** 关联角色组 **/ + private String roleGroupCode; + + /** 权限状态 **/ + private Integer status; + + /** 创建时间 **/ + private Date dateCreate; + + /** 修改时间 **/ + private Date dateUpdate; + + /** 修改人 **/ + private Long updateUserId; + + /** 创建人 **/ + private Long createUserId; + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/DataAuthorityDO.java b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/DataAuthorityDO.java new file mode 100644 index 0000000000000000000000000000000000000000..a3abdd2457a7cfb9e71bf5372b6f93902c450c41 --- /dev/null +++ b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/DataAuthorityDO.java @@ -0,0 +1,40 @@ +package com.coderman.infosys.auth.infrast.dao.dataobject; + +import java.util.Date; +import java.math.BigDecimal; +import lombok.Data; +import lombok.ToString; + + /** + * @Description:数据字段权限DO类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:28 + * @version v1.0 + */ +@Data +@ToString +public class DataAuthorityDO{ + + + /** 主键 **/ + private Long id; + + /** 权限标示 **/ + private String authCode; + + /** 业务数据库标示 **/ + private String dataColumnId; + + /** 创建时间 **/ + private Date dateCreate; + + /** 修改时间 **/ + private Date dateUpdate; + + /** 修改人 **/ + private Long updateUserId; + + /** 创建人 **/ + private Long createUserId; + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/DataColumnConfigDO.java b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/DataColumnConfigDO.java new file mode 100644 index 0000000000000000000000000000000000000000..d3ad1b46853e4415fb0693fa344091ffde08af64 --- /dev/null +++ b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/DataColumnConfigDO.java @@ -0,0 +1,55 @@ +package com.coderman.infosys.auth.infrast.dao.dataobject; + +import java.util.Date; +import java.math.BigDecimal; +import lombok.Data; +import lombok.ToString; + + /** + * @Description:数据字段管理表DO类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:28 + * @version v1.0 + */ +@Data +@ToString +public class DataColumnConfigDO{ + + + /** 主键 **/ + private Long id; + + /** 数据库业务系统名称 **/ + private String busDatabase; + + /** 表名称 **/ + private String tableName; + + /** 表描述 **/ + private String tableDesc; + + /** 字段名称 **/ + private String columnName; + + /** 字段描述 **/ + private String columnDesc; + + /** 业务模块 **/ + private String busModel; + + /** 业务属性名称 **/ + private String fieldName; + + /** 创建时间 **/ + private Date dateCreate; + + /** 修改时间 **/ + private Date dateUpdate; + + /** 修改人 **/ + private Long updateUserId; + + /** 创建人 **/ + private Long createUserId; + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/MenuDO.java b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/MenuDO.java new file mode 100644 index 0000000000000000000000000000000000000000..5b85cffedb6ce008c2aa0dfe90ee190b0fd6e515 --- /dev/null +++ b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/MenuDO.java @@ -0,0 +1,49 @@ +package com.coderman.infosys.auth.infrast.dao.dataobject; + +import java.util.Date; +import java.math.BigDecimal; +import lombok.Data; +import lombok.ToString; + + /** + * @Description:按钮表DO类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:28 + * @version v1.0 + */ +@Data +@ToString +public class MenuDO{ + + + /** 主键 **/ + private Long id; + + /** 按钮名称 **/ + private String menuName; + + /** 按钮编码 **/ + private String menuCode; + + /** 所属菜单编码 **/ + private String moduleCode; + + /** 所属系统编码 **/ + private String systemCode; + + /** 菜单链接 **/ + private String moduleUrl; + + /** 创建时间 **/ + private Date dateCreate; + + /** 修改时间 **/ + private Date dateUpdate; + + /** 修改人 **/ + private Long updateUserId; + + /** 创建人 **/ + private Long createUserId; + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/ModuleDO.java b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/ModuleDO.java new file mode 100644 index 0000000000000000000000000000000000000000..646dc9764f957d1e29ab12e47f1ff4bd7da1a699 --- /dev/null +++ b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/ModuleDO.java @@ -0,0 +1,46 @@ +package com.coderman.infosys.auth.infrast.dao.dataobject; + +import java.util.Date; +import java.math.BigDecimal; +import lombok.Data; +import lombok.ToString; + + /** + * @Description:菜单模块表DO类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:28 + * @version v1.0 + */ +@Data +@ToString +public class ModuleDO{ + + + /** 主键 **/ + private Long id; + + /** 菜单名称 **/ + private String moduleName; + + /** 菜单编码 **/ + private String moduleCode; + + /** 系统编码 **/ + private String systemCode; + + /** 菜单链接 **/ + private String moduleUrl; + + /** 创建时间 **/ + private Date dateCreate; + + /** 修改时间 **/ + private Date dateUpdate; + + /** 修改人 **/ + private Long updateUserId; + + /** 创建人 **/ + private Long createUserId; + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/RoleDO.java b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/RoleDO.java new file mode 100644 index 0000000000000000000000000000000000000000..329acd4da8eab872f3488149d5326f11cfcab9c5 --- /dev/null +++ b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/RoleDO.java @@ -0,0 +1,43 @@ +package com.coderman.infosys.auth.infrast.dao.dataobject; + +import java.util.Date; +import java.math.BigDecimal; +import lombok.Data; +import lombok.ToString; + + /** + * @Description:角色表DO类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:28 + * @version v1.0 + */ +@Data +@ToString +public class RoleDO{ + + + /** 主键 **/ + private Long id; + + /** 角色名称 **/ + private String roleName; + + /** 角色编码 **/ + private String roleCode; + + /** 角色组状态 **/ + private Long status; + + /** 创建时间 **/ + private Date dateCreate; + + /** 修改时间 **/ + private Date dateUpdate; + + /** 修改人 **/ + private Long updateUserId; + + /** 创建人 **/ + private Long createUserId; + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/RoleGroupDO.java b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/RoleGroupDO.java new file mode 100644 index 0000000000000000000000000000000000000000..39468390577f4479cc9a11e10ff6b4a91ab94318 --- /dev/null +++ b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/RoleGroupDO.java @@ -0,0 +1,43 @@ +package com.coderman.infosys.auth.infrast.dao.dataobject; + +import java.util.Date; +import java.math.BigDecimal; +import lombok.Data; +import lombok.ToString; + + /** + * @Description:角色组DO类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:28 + * @version v1.0 + */ +@Data +@ToString +public class RoleGroupDO{ + + + /** 主键 **/ + private Long id; + + /** 角色组名 **/ + private String groupName; + + /** 角色组编码 **/ + private String groupCode; + + /** 角色列表 **/ + private String roleCodeList; + + /** 创建时间 **/ + private Date dateCreate; + + /** 修改时间 **/ + private Date dateUpdate; + + /** 修改人 **/ + private Long updateUserId; + + /** 创建人 **/ + private Long createUserId; + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/SystemAuthorityDO.java b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/SystemAuthorityDO.java new file mode 100644 index 0000000000000000000000000000000000000000..0da1ab4e3242aa8f718f33b868df6e1de55f5821 --- /dev/null +++ b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/SystemAuthorityDO.java @@ -0,0 +1,40 @@ +package com.coderman.infosys.auth.infrast.dao.dataobject; + +import java.util.Date; +import java.math.BigDecimal; +import lombok.Data; +import lombok.ToString; + + /** + * @Description:系统菜单权限表DO类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:28 + * @version v1.0 + */ +@Data +@ToString +public class SystemAuthorityDO{ + + + /** 主键 **/ + private Long id; + + /** 权限标示 **/ + private String authCode; + + /** 系统编码 **/ + private String systemCode; + + /** 菜单编码 **/ + private String moduleCode; + + /** 按钮编码 **/ + private String menuCode; + + /** 创建时间 **/ + private Date dateCreate; + + /** 创建人 **/ + private Long createUserId; + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/SystemDO.java b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/SystemDO.java new file mode 100644 index 0000000000000000000000000000000000000000..475dfb33714462a6c734c072bfc66f35663e9dbf --- /dev/null +++ b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/SystemDO.java @@ -0,0 +1,49 @@ +package com.coderman.infosys.auth.infrast.dao.dataobject; + +import java.util.Date; +import java.math.BigDecimal; +import lombok.Data; +import lombok.ToString; + + /** + * @Description:系统表DO类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:28 + * @version v1.0 + */ +@Data +@ToString +public class SystemDO{ + + + /** 主键 **/ + private Long id; + + /** 系统名称 **/ + private String systemName; + + /** 系统编码 **/ + private String systemCode; + + /** 系统域名 **/ + private String systemUrl; + + /** 系统图标 **/ + private String systemPicurl; + + /** 系统技术负责人 **/ + private Long tecAdminUserId; + + /** 系统业务负责人 **/ + private Long busAdminUserId; + + /** 系统所属部门 **/ + private Long departmentId; + + /** 创建时间 **/ + private Date dateCreate; + + /** 创建人 **/ + private Long createUserId; + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/UserGroupDO.java b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/UserGroupDO.java new file mode 100644 index 0000000000000000000000000000000000000000..561665615dfc5771e07e1e190b03e22d1cabfe8a --- /dev/null +++ b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/UserGroupDO.java @@ -0,0 +1,46 @@ +package com.coderman.infosys.auth.infrast.dao.dataobject; + +import java.util.Date; +import java.math.BigDecimal; +import lombok.Data; +import lombok.ToString; + + /** + * @Description:用户组DO类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:28 + * @version v1.0 + */ +@Data +@ToString +public class UserGroupDO{ + + + /** 主键 **/ + private Long id; + + /** 用户组名 **/ + private String groupName; + + /** 用户组编码 **/ + private String groupCode; + + /** 用户组状态 **/ + private Long status; + + /** 用户组内用户列表 **/ + private String userList; + + /** 创建时间 **/ + private Date dateCreate; + + /** 修改时间 **/ + private Date dateUpdate; + + /** 修改人 **/ + private Long updateUserId; + + /** 创建人 **/ + private Long createUserId; + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/model.bo/TeacherBO.java b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/UserRoleMappingDO.java similarity index 35% rename from codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/model.bo/TeacherBO.java rename to codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/UserRoleMappingDO.java index 1155432a05f1bfa0ce1b601b9a8180425c48aadc..f494743692078eff3bda157003fd2363f88e9d5d 100644 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/model.bo/TeacherBO.java +++ b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/UserRoleMappingDO.java @@ -1,4 +1,4 @@ -package com.lightsnail.schoolmanager.core.model.bo; +package com.coderman.infosys.auth.infrast.dao.dataobject; import java.util.Date; import java.math.BigDecimal; @@ -6,26 +6,23 @@ import lombok.Data; import lombok.ToString; /** - * @Description:BO类 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 16:19:51 + * @Description:用户角色关联表DO类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:28 * @version v1.0 */ @Data @ToString -public class TeacherBO{ +public class UserRoleMappingDO{ - /** **/ + /** 主键 **/ private Long id; - /** **/ - private String teacherName; + /** 用户ID **/ + private Long userId; - /** **/ - private Integer age; - - /** **/ - private Integer sex; + /** 角色code **/ + private String roleCode; } \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/AdminAuthorityMapper.java b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/AdminAuthorityMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..950d4499ff7af77a2b9e180dd7ce49f851feb13a --- /dev/null +++ b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/AdminAuthorityMapper.java @@ -0,0 +1,58 @@ +package com.coderman.infosys.auth.infrast.dao.mapper; + +import java.util.List; +import com.coderman.infosys.auth.infrast.dao.dataobject.AdminAuthorityDO; +import com.coderman.infosys.auth.infrast.dao.dataobject.AuthorityDO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + + +/** +* @Description:行政数据权限接口 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Mapper +public interface AdminAuthorityMapper{ + + /** + * + * @Description 保存数据记录 + * @param adminAuthorityDO + * @return long + */ + long insert(@Param(value = "adminAuthorityDO") AdminAuthorityDO adminAuthorityDO); + + /** + * + * @Description 更新数据记录 + * @param adminAuthorityDO + * @return int + */ + int update(@Param(value = "adminAuthorityDO") AdminAuthorityDO adminAuthorityDO); + + /** + * + * @Description 获取所有数据记录 + * @return List + */ + List getAll(); + + /** + * + * @Description 根据ID获取单条记录 + * @param id + * @return AdminAuthorityDO + */ + AdminAuthorityDO getById(@Param(value = "id") Long id); + + /** + * + * @Description 根据ID删除单条记录 + * @param id + * @return int + */ + int deleteById(@Param(value = "id") Long id); + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/AuthorityMapper.java b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/AuthorityMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..63d9d476d5895592c76e5665ff5dddcb12ad1cd5 --- /dev/null +++ b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/AuthorityMapper.java @@ -0,0 +1,57 @@ +package com.coderman.infosys.auth.infrast.dao.mapper; + +import java.util.List; +import com.coderman.infosys.auth.infrast.dao.dataobject.AuthorityDO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + + +/** +* @Description:抽象权限表接口 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Mapper +public interface AuthorityMapper{ + + /** + * + * @Description 保存数据记录 + * @param authorityDO + * @return long + */ + long insert(@Param(value = "authorityDO") AuthorityDO authorityDO); + + /** + * + * @Description 更新数据记录 + * @param authorityDO + * @return int + */ + int update(@Param(value = "authorityDO") AuthorityDO authorityDO); + + /** + * + * @Description 获取所有数据记录 + * @return List + */ + List getAll(); + + /** + * + * @Description 根据ID获取单条记录 + * @param id + * @return AuthorityDO + */ + AuthorityDO getById(@Param(value = "id") Long id); + + /** + * + * @Description 根据ID删除单条记录 + * @param id + * @return int + */ + int deleteById(@Param(value = "id") Long id); + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/DataAuthorityMapper.java b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/DataAuthorityMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..42e9bc44b6aa7064db216202eacdad892593a262 --- /dev/null +++ b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/DataAuthorityMapper.java @@ -0,0 +1,58 @@ +package com.coderman.infosys.auth.infrast.dao.mapper; + +import java.util.List; +import com.coderman.infosys.auth.infrast.dao.dataobject.DataAuthorityDO; +import com.coderman.infosys.auth.infrast.dao.dataobject.AuthorityDO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + + +/** +* @Description:数据字段权限接口 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Mapper +public interface DataAuthorityMapper{ + + /** + * + * @Description 保存数据记录 + * @param dataAuthorityDO + * @return long + */ + long insert(@Param(value = "dataAuthorityDO") DataAuthorityDO dataAuthorityDO); + + /** + * + * @Description 更新数据记录 + * @param dataAuthorityDO + * @return int + */ + int update(@Param(value = "dataAuthorityDO") DataAuthorityDO dataAuthorityDO); + + /** + * + * @Description 获取所有数据记录 + * @return List + */ + List getAll(); + + /** + * + * @Description 根据ID获取单条记录 + * @param id + * @return DataAuthorityDO + */ + DataAuthorityDO getById(@Param(value = "id") Long id); + + /** + * + * @Description 根据ID删除单条记录 + * @param id + * @return int + */ + int deleteById(@Param(value = "id") Long id); + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/DataColumnConfigMapper.java b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/DataColumnConfigMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..ae0a4a000f36eadb8dd73dbb68bc78b5f44c4056 --- /dev/null +++ b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/DataColumnConfigMapper.java @@ -0,0 +1,57 @@ +package com.coderman.infosys.auth.infrast.dao.mapper; + +import com.coderman.infosys.auth.infrast.dao.dataobject.DataColumnConfigDO; +import java.util.List; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + + +/** +* @Description:数据字段管理表接口 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Mapper +public interface DataColumnConfigMapper{ + + /** + * + * @Description 保存数据记录 + * @param dataColumnConfigDO + * @return long + */ + long insert(@Param(value = "dataColumnConfigDO") DataColumnConfigDO dataColumnConfigDO); + + /** + * + * @Description 更新数据记录 + * @param dataColumnConfigDO + * @return int + */ + int update(@Param(value = "dataColumnConfigDO") DataColumnConfigDO dataColumnConfigDO); + + /** + * + * @Description 获取所有数据记录 + * @return List + */ + List getAll(); + + /** + * + * @Description 根据ID获取单条记录 + * @param id + * @return DataColumnConfigDO + */ + DataColumnConfigDO getById(@Param(value = "id") Long id); + + /** + * + * @Description 根据ID删除单条记录 + * @param id + * @return int + */ + int deleteById(@Param(value = "id") Long id); + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/MenuMapper.java b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/MenuMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..5b97c1f00a61400f69c24a56482058598f6814cb --- /dev/null +++ b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/MenuMapper.java @@ -0,0 +1,65 @@ +package com.coderman.infosys.auth.infrast.dao.mapper; + +import java.util.List; +import com.coderman.infosys.auth.infrast.dao.dataobject.MenuDO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + + +/** +* @Description:按钮表接口 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Mapper +public interface MenuMapper{ + + /** + * + * @Description 保存数据记录 + * @param menuDO + * @return long + */ + long insert(@Param(value = "menuDO") MenuDO menuDO); + + /** + * + * @Description 更新数据记录 + * @param menuDO + * @return int + */ + int update(@Param(value = "menuDO") MenuDO menuDO); + + /** + * + * @Description 获取所有数据记录 + * @return List + */ + List getAll(); + + /** + * + * @Description 根据ID获取单条记录 + * @param id + * @return MenuDO + */ + MenuDO getById(@Param(value = "id") Long id); + + /** + * + * @Description 根据ID删除单条记录 + * @param id + * @return int + */ + int deleteById(@Param(value = "id") Long id); + + /** + * + * @Description 查询 + * @param moduleCode + * @return List + */ + List getListByModuleCode(@Param(value = "moduleCode") String moduleCode); + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/ModuleMapper.java b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/ModuleMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..23bc0b14488d12b3ad7a263e54f56c9302f9af36 --- /dev/null +++ b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/ModuleMapper.java @@ -0,0 +1,65 @@ +package com.coderman.infosys.auth.infrast.dao.mapper; + +import com.coderman.infosys.auth.infrast.dao.dataobject.ModuleDO; +import java.util.List; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + + +/** +* @Description:菜单模块表接口 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Mapper +public interface ModuleMapper{ + + /** + * + * @Description 保存数据记录 + * @param moduleDO + * @return long + */ + long insert(@Param(value = "moduleDO") ModuleDO moduleDO); + + /** + * + * @Description 更新数据记录 + * @param moduleDO + * @return int + */ + int update(@Param(value = "moduleDO") ModuleDO moduleDO); + + /** + * + * @Description 获取所有数据记录 + * @return List + */ + List getAll(); + + /** + * + * @Description 根据ID获取单条记录 + * @param id + * @return ModuleDO + */ + ModuleDO getById(@Param(value = "id") Long id); + + /** + * + * @Description 根据ID删除单条记录 + * @param id + * @return int + */ + int deleteById(@Param(value = "id") Long id); + + /** + * + * @Description 查询 + * @param moduleName + * @return List + */ + List getByName(@Param(value = "moduleName") String moduleName); + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/RoleGroupMapper.java b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/RoleGroupMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..dbb16beff470222c336b00f2cd8f9174f6302131 --- /dev/null +++ b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/RoleGroupMapper.java @@ -0,0 +1,57 @@ +package com.coderman.infosys.auth.infrast.dao.mapper; + +import java.util.List; +import com.coderman.infosys.auth.infrast.dao.dataobject.RoleGroupDO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + + +/** +* @Description:角色组接口 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Mapper +public interface RoleGroupMapper{ + + /** + * + * @Description 保存数据记录 + * @param roleGroupDO + * @return long + */ + long insert(@Param(value = "roleGroupDO") RoleGroupDO roleGroupDO); + + /** + * + * @Description 更新数据记录 + * @param roleGroupDO + * @return int + */ + int update(@Param(value = "roleGroupDO") RoleGroupDO roleGroupDO); + + /** + * + * @Description 获取所有数据记录 + * @return List + */ + List getAll(); + + /** + * + * @Description 根据ID获取单条记录 + * @param id + * @return RoleGroupDO + */ + RoleGroupDO getById(@Param(value = "id") Long id); + + /** + * + * @Description 根据ID删除单条记录 + * @param id + * @return int + */ + int deleteById(@Param(value = "id") Long id); + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/RoleMapper.java b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/RoleMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..1df2b2048b733bb961f79c4b1a26f52756b8a947 --- /dev/null +++ b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/RoleMapper.java @@ -0,0 +1,57 @@ +package com.coderman.infosys.auth.infrast.dao.mapper; + +import java.util.List; +import com.coderman.infosys.auth.infrast.dao.dataobject.RoleDO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + + +/** +* @Description:角色表接口 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Mapper +public interface RoleMapper{ + + /** + * + * @Description 保存数据记录 + * @param roleDO + * @return long + */ + long insert(@Param(value = "roleDO") RoleDO roleDO); + + /** + * + * @Description 更新数据记录 + * @param roleDO + * @return int + */ + int update(@Param(value = "roleDO") RoleDO roleDO); + + /** + * + * @Description 获取所有数据记录 + * @return List + */ + List getAll(); + + /** + * + * @Description 根据ID获取单条记录 + * @param id + * @return RoleDO + */ + RoleDO getById(@Param(value = "id") Long id); + + /** + * + * @Description 根据ID删除单条记录 + * @param id + * @return int + */ + int deleteById(@Param(value = "id") Long id); + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/SystemAuthorityMapper.java b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/SystemAuthorityMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..13744086b851030db3d21441d47a44787c4404b3 --- /dev/null +++ b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/SystemAuthorityMapper.java @@ -0,0 +1,58 @@ +package com.coderman.infosys.auth.infrast.dao.mapper; + +import java.util.List; +import com.coderman.infosys.auth.infrast.dao.dataobject.SystemAuthorityDO; +import com.coderman.infosys.auth.infrast.dao.dataobject.AuthorityDO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + + +/** +* @Description:系统菜单权限表接口 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Mapper +public interface SystemAuthorityMapper{ + + /** + * + * @Description 保存数据记录 + * @param systemAuthorityDO + * @return long + */ + long insert(@Param(value = "systemAuthorityDO") SystemAuthorityDO systemAuthorityDO); + + /** + * + * @Description 更新数据记录 + * @param systemAuthorityDO + * @return int + */ + int update(@Param(value = "systemAuthorityDO") SystemAuthorityDO systemAuthorityDO); + + /** + * + * @Description 获取所有数据记录 + * @return List + */ + List getAll(); + + /** + * + * @Description 根据ID获取单条记录 + * @param id + * @return SystemAuthorityDO + */ + SystemAuthorityDO getById(@Param(value = "id") Long id); + + /** + * + * @Description 根据ID删除单条记录 + * @param id + * @return int + */ + int deleteById(@Param(value = "id") Long id); + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/SystemMapper.java b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/SystemMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..9109ae0486df7bad4365c326f6f1dba44c477e6c --- /dev/null +++ b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/SystemMapper.java @@ -0,0 +1,96 @@ +package com.coderman.infosys.auth.infrast.dao.mapper; + +import java.util.List; +import com.coderman.utils.commonbo.PageBO; +import com.coderman.infosys.auth.infrast.dao.dataobject.SystemDO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + + +/** +* @Description:系统表接口 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Mapper +public interface SystemMapper{ + + /** + * + * @Description 保存数据记录 + * @param systemDO + * @return long + */ + long insert(@Param(value = "systemDO") SystemDO systemDO); + + /** + * + * @Description 更新数据记录 + * @param systemDO + * @return int + */ + int update(@Param(value = "systemDO") SystemDO systemDO); + + /** + * + * @Description 获取所有数据记录 + * @return List + */ + List getAll(); + + /** + * + * @Description 根据ID获取单条记录 + * @param id + * @return SystemDO + */ + SystemDO getById(@Param(value = "id") Long id); + + /** + * + * @Description 根据ID删除单条记录 + * @param id + * @return int + */ + int deleteById(@Param(value = "id") Long id); + + /** + * + * @Description 查询 + * @param systemName + * @return List + */ + List getByName(@Param(value = "systemName") String systemName); + + /** + * + * @Description 查询 + * @param pageBO + * @return List + */ + List getPageList(@Param(value = "pageBO") PageBO pageBO); + + /** + * + * @Description 查询 + * @return List + */ + List queryByCondition(); + + /** + * + * @Description 查询 + * @param systemCode + * @return List + */ + List queryBySystemCode(@Param(value = "systemCode") String systemCode); + + /** + * + * @Description 查询 + * @return int + */ + int updateSystem(); + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/UserGroupMapper.java b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/UserGroupMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..078e5afa4497b6923e54fd0acd47920ca6192c8f --- /dev/null +++ b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/UserGroupMapper.java @@ -0,0 +1,57 @@ +package com.coderman.infosys.auth.infrast.dao.mapper; + +import java.util.List; +import com.coderman.infosys.auth.infrast.dao.dataobject.UserGroupDO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + + +/** +* @Description:用户组接口 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Mapper +public interface UserGroupMapper{ + + /** + * + * @Description 保存数据记录 + * @param userGroupDO + * @return long + */ + long insert(@Param(value = "userGroupDO") UserGroupDO userGroupDO); + + /** + * + * @Description 更新数据记录 + * @param userGroupDO + * @return int + */ + int update(@Param(value = "userGroupDO") UserGroupDO userGroupDO); + + /** + * + * @Description 获取所有数据记录 + * @return List + */ + List getAll(); + + /** + * + * @Description 根据ID获取单条记录 + * @param id + * @return UserGroupDO + */ + UserGroupDO getById(@Param(value = "id") Long id); + + /** + * + * @Description 根据ID删除单条记录 + * @param id + * @return int + */ + int deleteById(@Param(value = "id") Long id); + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/UserRoleMappingMapper.java b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/UserRoleMappingMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..1833673d5592e1aadcbb48a085bb827f9ea21c43 --- /dev/null +++ b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/UserRoleMappingMapper.java @@ -0,0 +1,57 @@ +package com.coderman.infosys.auth.infrast.dao.mapper; + +import java.util.List; +import com.coderman.infosys.auth.infrast.dao.dataobject.UserRoleMappingDO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + + +/** +* @Description:用户角色关联表接口 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Mapper +public interface UserRoleMappingMapper{ + + /** + * + * @Description 保存数据记录 + * @param userRoleMappingDO + * @return long + */ + long insert(@Param(value = "userRoleMappingDO") UserRoleMappingDO userRoleMappingDO); + + /** + * + * @Description 更新数据记录 + * @param userRoleMappingDO + * @return int + */ + int update(@Param(value = "userRoleMappingDO") UserRoleMappingDO userRoleMappingDO); + + /** + * + * @Description 获取所有数据记录 + * @return List + */ + List getAll(); + + /** + * + * @Description 根据ID获取单条记录 + * @param id + * @return UserRoleMappingDO + */ + UserRoleMappingDO getById(@Param(value = "id") Long id); + + /** + * + * @Description 根据ID删除单条记录 + * @param id + * @return int + */ + int deleteById(@Param(value = "id") Long id); + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-common/src/main/java/com/lightsnail/schoolmanager/common/dataobject/ClassDO.java b/codemaker-dubbo/dubbo-common/src/main/java/com/lightsnail/schoolmanager/common/dataobject/ClassDO.java deleted file mode 100644 index dcd5b3715d4935176f1abe00b679efedd9c2d929..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-common/src/main/java/com/lightsnail/schoolmanager/common/dataobject/ClassDO.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.lightsnail.schoolmanager.common.dataobject; - -import java.util.Date; -import java.math.BigDecimal; -import lombok.Data; -import lombok.ToString; - - /** - * @Description:DO类 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 16:19:52 - * @version v1.0 - */ -@Data -@ToString -public class ClassDO{ - - - /** **/ - private Long id; - - /** **/ - private String manager; - - /** **/ - private Integer studentCount; - - /** 年级 **/ - private Integer gradeNum; - - /** 班级 **/ - private Integer classNum; - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-common/src/main/java/com/lightsnail/schoolmanager/common/dataobject/ClassTeacherDO.java b/codemaker-dubbo/dubbo-common/src/main/java/com/lightsnail/schoolmanager/common/dataobject/ClassTeacherDO.java deleted file mode 100644 index e4d6c598902c84ceb904b650d21bda12bc0279a2..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-common/src/main/java/com/lightsnail/schoolmanager/common/dataobject/ClassTeacherDO.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.lightsnail.schoolmanager.common.dataobject; - -import java.util.Date; -import java.math.BigDecimal; -import lombok.Data; -import lombok.ToString; - - /** - * @Description:DO类 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 16:19:51 - * @version v1.0 - */ -@Data -@ToString -public class ClassTeacherDO{ - - - /** **/ - private Long id; - - /** **/ - private Long classId; - - /** **/ - private Long teacherId; - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-common/src/main/java/com/lightsnail/schoolmanager/common/dataobject/StudentDO.java b/codemaker-dubbo/dubbo-common/src/main/java/com/lightsnail/schoolmanager/common/dataobject/StudentDO.java deleted file mode 100644 index 92bb9756028f14aa1f4ebd7d59bf80cb092f5968..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-common/src/main/java/com/lightsnail/schoolmanager/common/dataobject/StudentDO.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.lightsnail.schoolmanager.common.dataobject; - -import java.util.Date; -import java.math.BigDecimal; -import lombok.Data; -import lombok.ToString; - - /** - * @Description:DO类 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 16:19:51 - * @version v1.0 - */ -@Data -@ToString -public class StudentDO{ - - - /** **/ - private Long id; - - /** **/ - private String studentName; - - /** **/ - private String studentCode; - - /** **/ - private String sex; - - /** **/ - private Integer age; - - /** 班级ID **/ - private Long classId; - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-common/src/main/java/com/lightsnail/schoolmanager/common/mapper/ClassMapper.java b/codemaker-dubbo/dubbo-common/src/main/java/com/lightsnail/schoolmanager/common/mapper/ClassMapper.java deleted file mode 100644 index 1850e4d88bc5b9807f0f47af212d5c0eb48179e0..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-common/src/main/java/com/lightsnail/schoolmanager/common/mapper/ClassMapper.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.lightsnail.schoolmanager.common.mapper; - -import java.util.List; -import com.lightsnail.schoolmanager.common.dataobject.ClassDO; - - -/** - * @Description:mapperDAO接口 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 16:19:52 - * @version v1.0 - */ -public interface ClassMapper{ - - /** - * - * @Title: save - * @Description:新增或修改 - * @author: - * @param @param classDO - * @return int - * @throws - */ - public int insert(ClassDO classDO); - - /** - * - * @Title: delete - * @Description: 通过id删除数据 - * @author: - * @param @param id - * @return int - * @throws - */ - public int deleteById(Long id); - - /** - * - * @Title: getById - * @Description: 通过id查询 - * @author: - * @param @param id - * @return ResultDataDto 返回类型 - * @throws - */ - public ClassDO getById(Long id); - - /** - * - * @Title: getAll - * @Description:查询所有数据 - * @author: - * @return List getAll(); - - /** - * - * @Title: update - * @Description:新增或修改 - * @author: - * @param @param classDO - * @return int - * @throws - */ - public int update(ClassDO classDO); - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-common/src/main/java/com/lightsnail/schoolmanager/common/mapper/ClassTeacherMapper.java b/codemaker-dubbo/dubbo-common/src/main/java/com/lightsnail/schoolmanager/common/mapper/ClassTeacherMapper.java deleted file mode 100644 index a536f03fb48652b83829a6439c235715700bdba4..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-common/src/main/java/com/lightsnail/schoolmanager/common/mapper/ClassTeacherMapper.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.lightsnail.schoolmanager.common.mapper; - -import java.util.List; -import com.lightsnail.schoolmanager.common.dataobject.ClassTeacherDO; - - -/** - * @Description:mapperDAO接口 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 16:19:51 - * @version v1.0 - */ -public interface ClassTeacherMapper{ - - /** - * - * @Title: save - * @Description:新增或修改 - * @author: - * @param @param classTeacherDO - * @return int - * @throws - */ - public int insert(ClassTeacherDO classTeacherDO); - - /** - * - * @Title: delete - * @Description: 通过id删除数据 - * @author: - * @param @param id - * @return int - * @throws - */ - public int deleteById(Long id); - - /** - * - * @Title: getById - * @Description: 通过id查询 - * @author: - * @param @param id - * @return ResultDataDto 返回类型 - * @throws - */ - public ClassTeacherDO getById(Long id); - - /** - * - * @Title: getAll - * @Description:查询所有数据 - * @author: - * @return List getAll(); - - /** - * - * @Title: update - * @Description:新增或修改 - * @author: - * @param @param classTeacherDO - * @return int - * @throws - */ - public int update(ClassTeacherDO classTeacherDO); - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-common/src/main/java/com/lightsnail/schoolmanager/common/mapper/StudentMapper.java b/codemaker-dubbo/dubbo-common/src/main/java/com/lightsnail/schoolmanager/common/mapper/StudentMapper.java deleted file mode 100644 index 79af1640ca5364a7ae656f738629ebae97a4cd91..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-common/src/main/java/com/lightsnail/schoolmanager/common/mapper/StudentMapper.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.lightsnail.schoolmanager.common.mapper; - -import java.util.List; -import com.lightsnail.schoolmanager.common.dataobject.StudentDO; - - -/** - * @Description:mapperDAO接口 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 16:19:51 - * @version v1.0 - */ -public interface StudentMapper{ - - /** - * - * @Title: save - * @Description:新增或修改 - * @author: - * @param @param studentDO - * @return int - * @throws - */ - public int insert(StudentDO studentDO); - - /** - * - * @Title: delete - * @Description: 通过id删除数据 - * @author: - * @param @param id - * @return int - * @throws - */ - public int deleteById(Long id); - - /** - * - * @Title: getById - * @Description: 通过id查询 - * @author: - * @param @param id - * @return ResultDataDto 返回类型 - * @throws - */ - public StudentDO getById(Long id); - - /** - * - * @Title: getAll - * @Description:查询所有数据 - * @author: - * @return List getAll(); - - /** - * - * @Title: update - * @Description:新增或修改 - * @author: - * @param @param studentDO - * @return int - * @throws - */ - public int update(StudentDO studentDO); - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-common/src/main/java/com/lightsnail/schoolmanager/common/mapper/TeacherMapper.java b/codemaker-dubbo/dubbo-common/src/main/java/com/lightsnail/schoolmanager/common/mapper/TeacherMapper.java deleted file mode 100644 index 7087ace474a54225ff2cacbc8f6bdb84ae2e6ce4..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-common/src/main/java/com/lightsnail/schoolmanager/common/mapper/TeacherMapper.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.lightsnail.schoolmanager.common.mapper; - -import java.util.List; -import com.lightsnail.schoolmanager.common.dataobject.TeacherDO; - - -/** - * @Description:mapperDAO接口 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 16:19:51 - * @version v1.0 - */ -public interface TeacherMapper{ - - /** - * - * @Title: save - * @Description:新增或修改 - * @author: - * @param @param teacherDO - * @return int - * @throws - */ - public int insert(TeacherDO teacherDO); - - /** - * - * @Title: delete - * @Description: 通过id删除数据 - * @author: - * @param @param id - * @return int - * @throws - */ - public int deleteById(Long id); - - /** - * - * @Title: getById - * @Description: 通过id查询 - * @author: - * @param @param id - * @return ResultDataDto 返回类型 - * @throws - */ - public TeacherDO getById(Long id); - - /** - * - * @Title: getAll - * @Description:查询所有数据 - * @author: - * @return List getAll(); - - /** - * - * @Title: update - * @Description:新增或修改 - * @author: - * @param @param teacherDO - * @return int - * @throws - */ - public int update(TeacherDO teacherDO); - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-common/src/main/resources/erpicture/infosys_auth.puml b/codemaker-dubbo/dubbo-common/src/main/resources/erpicture/infosys_auth.puml new file mode 100644 index 0000000000000000000000000000000000000000..ec48036076ccd696194b744870f16fccce5cfa99 --- /dev/null +++ b/codemaker-dubbo/dubbo-common/src/main/resources/erpicture/infosys_auth.puml @@ -0,0 +1,149 @@ +@startuml +' hide the spot +hide circle + +' avoid problems with angled crows feet +skinparam linetype ortho + +entity " user_role_mapping 用户角色关联表" as user_role_mapping { + id: 主键/bigint(20) unsigned + user_id: 用户ID/bigint(20) + role_code: 角色code/varchar(50) +} + +entity " user_group 用户组" as user_group { + id: 主键/bigint(20) unsigned + group_name: 用户组名/varchar(50) + group_code: 用户组编码/varchar(50) + status: 用户组状态/bigint(20) + user_list: 用户组内用户列表/varchar(2000) + date_create: 创建时间/timestamp + date_update: 修改时间/timestamp + update_user_id: 修改人/bigint(20) + create_user_id: 创建人/bigint(20) +} + +entity " data_column_config 数据字段管理表" as data_column_config { + id: 主键/bigint(20) unsigned + bus_database: 数据库业务系统名称/varchar(60) + table_name: 表名称/varchar(60) + table_desc: 表描述/varchar(60) + column_name: 字段名称/varchar(60) + column_desc: 字段描述/varchar(60) + bus_model: 业务模块/varchar(60) + field_name: 业务属性名称/varchar(60) + date_create: 创建时间/timestamp + date_update: 修改时间/timestamp + update_user_id: 修改人/bigint(20) + create_user_id: 创建人/bigint(20) +} + +entity " role 角色表" as role { + id: 主键/bigint(20) unsigned + role_name: 角色名称/varchar(50) + role_code: 角色编码/varchar(50) + status: 角色组状态/bigint(20) + date_create: 创建时间/timestamp + date_update: 修改时间/timestamp + update_user_id: 修改人/bigint(20) + create_user_id: 创建人/bigint(20) +} + +entity " system 系统表" as system { + id: 主键/bigint(20) unsigned + system_name: 系统名称/varchar(50) + system_code: 系统编码/varchar(50) + system_url: 系统域名/varchar(50) + system_picurl: 系统图标/varchar(50) + tec_admin_user_id: 系统技术负责人/bigint(20) + bus_admin_user_id: 系统业务负责人/bigint(20) + department_id: 系统所属部门/bigint(20) + date_create: 创建时间/timestamp + create_user_id: 创建人/bigint(20) +} + +entity " role_group 角色组" as role_group { + id: 主键/bigint(20) unsigned + group_name: 角色组名/varchar(50) + group_code: 角色组编码/varchar(50) + role_code_list: 角色列表/varchar(2000) + date_create: 创建时间/timestamp + date_update: 修改时间/timestamp + update_user_id: 修改人/bigint(20) + create_user_id: 创建人/bigint(20) +} + +entity " system_authority 系统菜单权限表" as system_authority { + id: 主键/bigint(20) unsigned + auth_code: 权限标示/varchar(50) + system_code: 系统编码/varchar(50) + module_code: 菜单编码/varchar(50) + menu_code: 按钮编码/varchar(50) + date_create: 创建时间/timestamp + create_user_id: 创建人/bigint(20) +} + +entity " admin_authority 行政数据权限" as admin_authority { + id: 主键/bigint(20) unsigned + auth_code: 权限标示/varchar(50) + department_id: 组织部门ID/bigint(20) + city_id: 城市权限/bigint(20) + date_create: 创建时间/timestamp + date_update: 修改时间/timestamp + update_user_id: 修改人/bigint(20) + create_user_id: 创建人/bigint(20) +} + +entity " authority 抽象权限表" as authority { + id: 主键/bigint(20) unsigned + auth_code: 权限编码/varchar(50) + authority_type: 权限类型/tinyint(4) + role_code: 关联角色编码/varchar(50) + role_group_code: 关联角色组/varchar(50) + status: 权限状态/tinyint(4) + date_create: 创建时间/timestamp + date_update: 修改时间/timestamp + update_user_id: 修改人/bigint(20) + create_user_id: 创建人/bigint(20) +} + +entity " module 菜单模块表" as module { + id: 主键/bigint(20) unsigned + module_name: 菜单名称/varchar(50) + module_code: 菜单编码/varchar(50) + system_code: 系统编码/varchar(50) + module_url: 菜单链接/varchar(50) + date_create: 创建时间/timestamp + date_update: 修改时间/timestamp + update_user_id: 修改人/bigint(20) + create_user_id: 创建人/bigint(20) +} + +entity " menu 按钮表" as menu { + id: 主键/bigint(20) unsigned + menu_name: 按钮名称/varchar(50) + menu_code: 按钮编码/varchar(50) + module_code: 所属菜单编码/varchar(50) + system_code: 所属系统编码/varchar(50) + module_url: 菜单链接/varchar(50) + date_create: 创建时间/timestamp + date_update: 修改时间/timestamp + update_user_id: 修改人/bigint(20) + create_user_id: 创建人/bigint(20) +} + +entity " data_authority 数据字段权限" as data_authority { + id: 主键/bigint(20) unsigned + auth_code: 权限标示/varchar(50) + data_column_id: 业务数据库标示/varchar(50) + date_create: 创建时间/timestamp + date_update: 修改时间/timestamp + update_user_id: 修改人/bigint(20) + create_user_id: 创建人/bigint(20) +} + + + + + +@enduml \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-common/src/main/resources/mapper/AdminAuthorityMapper.xml b/codemaker-dubbo/dubbo-common/src/main/resources/mapper/AdminAuthorityMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..d90ee8d0688d1b2eae378386de40ec8bed5cce8e --- /dev/null +++ b/codemaker-dubbo/dubbo-common/src/main/resources/mapper/AdminAuthorityMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id,auth_code,department_id,city_id,date_create,date_update,update_user_id,create_user_id + + + + insert into admin_authority( + auth_code,department_id,city_id,date_create,date_update,update_user_id,create_user_id + ) + values( + #{auth_code},#{department_id},#{city_id},#{date_create},#{date_update},#{update_user_id},#{create_user_id} + ) + + + + update admin_authority + set + auth_code=#{auth_code},department_id=#{department_id},city_id=#{city_id},date_create=#{date_create},date_update=#{date_update},update_user_id=#{update_user_id},create_user_id=#{create_user_id} + where id = #{id} + + + + + + + + delete from admin_authority where id = #{id} + + + + + + + + diff --git a/codemaker-dubbo/dubbo-common/src/main/resources/mapper/AuthorityMapper.xml b/codemaker-dubbo/dubbo-common/src/main/resources/mapper/AuthorityMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..9365c4ca7741489e6fed9c2d5535812a76ab9d6a --- /dev/null +++ b/codemaker-dubbo/dubbo-common/src/main/resources/mapper/AuthorityMapper.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id,auth_code,authority_type,role_code,role_group_code,status,date_create,date_update,update_user_id,create_user_id + + + + insert into authority( + auth_code,authority_type,role_code,role_group_code,status,date_create,date_update,update_user_id,create_user_id + ) + values( + #{auth_code},#{authority_type},#{role_code},#{role_group_code},#{status},#{date_create},#{date_update},#{update_user_id},#{create_user_id} + ) + + + + update authority + set + auth_code=#{auth_code},authority_type=#{authority_type},role_code=#{role_code},role_group_code=#{role_group_code},status=#{status},date_create=#{date_create},date_update=#{date_update},update_user_id=#{update_user_id},create_user_id=#{create_user_id} + where id = #{id} + + + + + + + + delete from authority where id = #{id} + + + + + + + + diff --git a/codemaker-dubbo/dubbo-common/src/main/resources/mapper/DataAuthorityMapper.xml b/codemaker-dubbo/dubbo-common/src/main/resources/mapper/DataAuthorityMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..d32b78ddca00e417f93cf50cc5fc4a9023c08d87 --- /dev/null +++ b/codemaker-dubbo/dubbo-common/src/main/resources/mapper/DataAuthorityMapper.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id,auth_code,data_column_id,date_create,date_update,update_user_id,create_user_id + + + + insert into data_authority( + auth_code,data_column_id,date_create,date_update,update_user_id,create_user_id + ) + values( + #{auth_code},#{data_column_id},#{date_create},#{date_update},#{update_user_id},#{create_user_id} + ) + + + + update data_authority + set + auth_code=#{auth_code},data_column_id=#{data_column_id},date_create=#{date_create},date_update=#{date_update},update_user_id=#{update_user_id},create_user_id=#{create_user_id} + where id = #{id} + + + + + + + + delete from data_authority where id = #{id} + + + + + + + + diff --git a/codemaker-dubbo/dubbo-common/src/main/resources/mapper/DataColumnConfigMapper.xml b/codemaker-dubbo/dubbo-common/src/main/resources/mapper/DataColumnConfigMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..7ceb58a42c5367825424e30bd77b54a93d434f60 --- /dev/null +++ b/codemaker-dubbo/dubbo-common/src/main/resources/mapper/DataColumnConfigMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id,bus_database,table_name,table_desc,column_name,column_desc,bus_model,field_name,date_create,date_update,update_user_id,create_user_id + + + + insert into data_column_config( + bus_database,table_name,table_desc,column_name,column_desc,bus_model,field_name,date_create,date_update,update_user_id,create_user_id + ) + values( + #{bus_database},#{table_name},#{table_desc},#{column_name},#{column_desc},#{bus_model},#{field_name},#{date_create},#{date_update},#{update_user_id},#{create_user_id} + ) + + + + update data_column_config + set + bus_database=#{bus_database},table_name=#{table_name},table_desc=#{table_desc},column_name=#{column_name},column_desc=#{column_desc},bus_model=#{bus_model},field_name=#{field_name},date_create=#{date_create},date_update=#{date_update},update_user_id=#{update_user_id},create_user_id=#{create_user_id} + where id = #{id} + + + + + + + + delete from data_column_config where id = #{id} + + + + + + + + diff --git a/codemaker-dubbo/dubbo-common/src/main/resources/mapper/MenuMapper.xml b/codemaker-dubbo/dubbo-common/src/main/resources/mapper/MenuMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..4738ec4633ba83abfdf6e75acbf18506bfd0a3c7 --- /dev/null +++ b/codemaker-dubbo/dubbo-common/src/main/resources/mapper/MenuMapper.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id,menu_name,menu_code,module_code,system_code,module_url,date_create,date_update,update_user_id,create_user_id + + + + insert into menu( + menu_name,menu_code,module_code,system_code,module_url,date_create,date_update,update_user_id,create_user_id + ) + values( + #{menu_name},#{menu_code},#{module_code},#{system_code},#{module_url},#{date_create},#{date_update},#{update_user_id},#{create_user_id} + ) + + + + update menu + set + menu_name=#{menu_name},menu_code=#{menu_code},module_code=#{module_code},system_code=#{system_code},module_url=#{module_url},date_create=#{date_create},date_update=#{date_update},update_user_id=#{update_user_id},create_user_id=#{create_user_id} + where id = #{id} + + + + + + + + delete from menu where id = #{id} + + + + + + + + diff --git a/codemaker-dubbo/dubbo-common/src/main/resources/mapper/ModuleMapper.xml b/codemaker-dubbo/dubbo-common/src/main/resources/mapper/ModuleMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..dba8a9a845eac91cd42ef2dd5d31bf21261d0372 --- /dev/null +++ b/codemaker-dubbo/dubbo-common/src/main/resources/mapper/ModuleMapper.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id,module_name,module_code,system_code,module_url,date_create,date_update,update_user_id,create_user_id + + + + insert into module( + module_name,module_code,system_code,module_url,date_create,date_update,update_user_id,create_user_id + ) + values( + #{module_name},#{module_code},#{system_code},#{module_url},#{date_create},#{date_update},#{update_user_id},#{create_user_id} + ) + + + + update module + set + module_name=#{module_name},module_code=#{module_code},system_code=#{system_code},module_url=#{module_url},date_create=#{date_create},date_update=#{date_update},update_user_id=#{update_user_id},create_user_id=#{create_user_id} + where id = #{id} + + + + + + + + delete from module where id = #{id} + + + + + + + + diff --git a/codemaker-dubbo/dubbo-common/src/main/resources/mapper/RoleGroupMapper.xml b/codemaker-dubbo/dubbo-common/src/main/resources/mapper/RoleGroupMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..d29121b638293113b9671b0b962f857417ded5db --- /dev/null +++ b/codemaker-dubbo/dubbo-common/src/main/resources/mapper/RoleGroupMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id,group_name,group_code,role_code_list,date_create,date_update,update_user_id,create_user_id + + + + insert into role_group( + group_name,group_code,role_code_list,date_create,date_update,update_user_id,create_user_id + ) + values( + #{group_name},#{group_code},#{role_code_list},#{date_create},#{date_update},#{update_user_id},#{create_user_id} + ) + + + + update role_group + set + group_name=#{group_name},group_code=#{group_code},role_code_list=#{role_code_list},date_create=#{date_create},date_update=#{date_update},update_user_id=#{update_user_id},create_user_id=#{create_user_id} + where id = #{id} + + + + + + + + delete from role_group where id = #{id} + + + + + + + + diff --git a/codemaker-dubbo/dubbo-common/src/main/resources/mapper/RoleMapper.xml b/codemaker-dubbo/dubbo-common/src/main/resources/mapper/RoleMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..0a6a67391e5c85f05e0a0d688f62467bb829def4 --- /dev/null +++ b/codemaker-dubbo/dubbo-common/src/main/resources/mapper/RoleMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id,role_name,role_code,status,date_create,date_update,update_user_id,create_user_id + + + + insert into role( + role_name,role_code,status,date_create,date_update,update_user_id,create_user_id + ) + values( + #{role_name},#{role_code},#{status},#{date_create},#{date_update},#{update_user_id},#{create_user_id} + ) + + + + update role + set + role_name=#{role_name},role_code=#{role_code},status=#{status},date_create=#{date_create},date_update=#{date_update},update_user_id=#{update_user_id},create_user_id=#{create_user_id} + where id = #{id} + + + + + + + + delete from role where id = #{id} + + + + + + + + diff --git a/codemaker-dubbo/dubbo-common/src/main/resources/mapper/SystemAuthorityMapper.xml b/codemaker-dubbo/dubbo-common/src/main/resources/mapper/SystemAuthorityMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..b0ff447a9a7d1b86261a5ff6a1bf648d3be5ec84 --- /dev/null +++ b/codemaker-dubbo/dubbo-common/src/main/resources/mapper/SystemAuthorityMapper.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id,auth_code,system_code,module_code,menu_code,date_create,create_user_id + + + + insert into system_authority( + auth_code,system_code,module_code,menu_code,date_create,create_user_id + ) + values( + #{auth_code},#{system_code},#{module_code},#{menu_code},#{date_create},#{create_user_id} + ) + + + + update system_authority + set + auth_code=#{auth_code},system_code=#{system_code},module_code=#{module_code},menu_code=#{menu_code},date_create=#{date_create},create_user_id=#{create_user_id} + where id = #{id} + + + + + + + + delete from system_authority where id = #{id} + + + + + + + + diff --git a/codemaker-dubbo/dubbo-common/src/main/resources/mapper/SystemMapper.xml b/codemaker-dubbo/dubbo-common/src/main/resources/mapper/SystemMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..c26b997ba5fe391c1737515e3ac001c4b65e89e5 --- /dev/null +++ b/codemaker-dubbo/dubbo-common/src/main/resources/mapper/SystemMapper.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id,system_name,system_code,system_url,system_picurl,tec_admin_user_id,bus_admin_user_id,department_id,date_create,create_user_id + + + + insert into system( + system_name,system_code,system_url,system_picurl,tec_admin_user_id,bus_admin_user_id,department_id,date_create,create_user_id + ) + values( + #{system_name},#{system_code},#{system_url},#{system_picurl},#{tec_admin_user_id},#{bus_admin_user_id},#{department_id},#{date_create},#{create_user_id} + ) + + + + update system + set + system_name=#{system_name},system_code=#{system_code},system_url=#{system_url},system_picurl=#{system_picurl},tec_admin_user_id=#{tec_admin_user_id},bus_admin_user_id=#{bus_admin_user_id},department_id=#{department_id},date_create=#{date_create},create_user_id=#{create_user_id} + where id = #{id} + + + + + + + + delete from system where id = #{id} + + + + + + + + diff --git a/codemaker-dubbo/dubbo-common/src/main/resources/mapper/UserGroupMapper.xml b/codemaker-dubbo/dubbo-common/src/main/resources/mapper/UserGroupMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..949ac0aec4f1d22df19e5845252d7ace56778bc9 --- /dev/null +++ b/codemaker-dubbo/dubbo-common/src/main/resources/mapper/UserGroupMapper.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id,group_name,group_code,status,user_list,date_create,date_update,update_user_id,create_user_id + + + + insert into user_group( + group_name,group_code,status,user_list,date_create,date_update,update_user_id,create_user_id + ) + values( + #{group_name},#{group_code},#{status},#{user_list},#{date_create},#{date_update},#{update_user_id},#{create_user_id} + ) + + + + update user_group + set + group_name=#{group_name},group_code=#{group_code},status=#{status},user_list=#{user_list},date_create=#{date_create},date_update=#{date_update},update_user_id=#{update_user_id},create_user_id=#{create_user_id} + where id = #{id} + + + + + + + + delete from user_group where id = #{id} + + + + + + + + diff --git a/codemaker-dubbo/dubbo-common/src/main/resources/mapper/UserRoleMappingMapper.xml b/codemaker-dubbo/dubbo-common/src/main/resources/mapper/UserRoleMappingMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..b19bc9aa7b96284ee6df9aafa55e6a46cf32b097 --- /dev/null +++ b/codemaker-dubbo/dubbo-common/src/main/resources/mapper/UserRoleMappingMapper.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + id,user_id,role_code + + + + insert into user_role_mapping( + user_id,role_code + ) + values( + #{user_id},#{role_code} + ) + + + + update user_role_mapping + set + user_id=#{user_id},role_code=#{role_code} + where id = #{id} + + + + + + + + delete from user_role_mapping where id = #{id} + + + + + + + + diff --git a/codemaker-dubbo/dubbo-core/pom.xml b/codemaker-dubbo/dubbo-core/pom.xml index 41a2bcd132d106bfa8665e42ba06382ad27822b4..794b43f0625a9410c0c1d25ef4d9f85d285a68df 100644 --- a/codemaker-dubbo/dubbo-core/pom.xml +++ b/codemaker-dubbo/dubbo-core/pom.xml @@ -48,7 +48,7 @@ com.coderman.utils coderman-utils - 1.0.2-SNAPSHOT + 1.0.4-SNAPSHOT diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/Application.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/Application.java similarity index 63% rename from codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/Application.java rename to codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/Application.java index 70febee700278a80aafd01bdd0bc19526a20dd77..2ea0edff714f7bcdafc8053553c33473c4449287 100644 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/Application.java +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/Application.java @@ -1,4 +1,4 @@ -package com.lightsnail.schoolmanager.core; +package com.coderman.infosys.auth; import org.apache.dubbo.config.spring.context.annotation.DubboComponentScan; @@ -9,14 +9,14 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; /** * @Description:应用启动入口 -* @Author:fanchunshuai -* @CreateTime:2021-06-25 16:19:52 +* @Author:shenshuai +* @CreateTime:2021-11-07 08:18:28 * @version v1.0 */ -@DubboComponentScan(basePackages = "com.lightsnail.schoolmanager.core") +@DubboComponentScan(basePackages = "com.coderman.infosys.auth") @EnableDubbo //开启Dubbo的注解支持 -@SpringBootApplication(scanBasePackages = {"com.lightsnail.schoolmanager"}) -@MapperScan(basePackages = "com.lightsnail.schoolmanager.common") +@SpringBootApplication(scanBasePackages = {"com.coderman.infosys.auth"}) +@MapperScan(basePackages = "com.coderman.infosys.auth.common.infrast") public class Application { public static void main(String[] args) { diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/aop/FacadeServiceAop.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/aop/FacadeServiceAop.java similarity index 89% rename from codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/aop/FacadeServiceAop.java rename to codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/aop/FacadeServiceAop.java index 79e09321d316c10172c799ee573ac692f3e938e7..158405f6964e6e7412437445854a3df8a2117e57 100644 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/aop/FacadeServiceAop.java +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/aop/FacadeServiceAop.java @@ -1,4 +1,4 @@ -package com.lightsnail.schoolmanager.core.aop; +package com.coderman.infosys.auth.aop; import com.alibaba.fastjson.JSON; @@ -21,7 +21,7 @@ import java.lang.reflect.Method; @Aspect @Slf4j public class FacadeServiceAop { - @Around(value = "execution( public * com.lightsnail.schoolmanager.core.facade.impl..*(..))") + @Around(value = "execution( public * com.coderman.infosys.auth.app.facadeimpl..*(..))") public Object transferException(ProceedingJoinPoint joinPoint) throws Exception { MethodSignature signature = (MethodSignature) joinPoint.getSignature(); Method method = signature.getMethod(); diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/command/AbstractCmd.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/command/AbstractCmd.java new file mode 100644 index 0000000000000000000000000000000000000000..542b9df2ebfe065b9c372adbde06a0eaef713e57 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/command/AbstractCmd.java @@ -0,0 +1,40 @@ +package com.coderman.infosys.auth.app.command; + +import java.util.Date; + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:抽象命令类类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:28 + * @version v1.0 + */ +@Data +@ToString +public class AbstractCmd { + + + /** + * 操作时 + */ + public Date operateTime; + + /** + * 操作人I + */ + public Long userId; + + /** + * 命令 + */ + public Class commandClass; + + /** + * 命令数 + */ + public String payLoad;; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/command/AddRoleAuthCmd.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/command/AddRoleAuthCmd.java new file mode 100644 index 0000000000000000000000000000000000000000..718f85298952365daaaf3664e3c518d68be28094 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/command/AddRoleAuthCmd.java @@ -0,0 +1,29 @@ +package com.coderman.infosys.auth.app.command; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:对角色权限类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:28 + * @version v1.0 + */ +@Data +@ToString +public class AddRoleAuthCmd extends AbstractCmd{ + + + /** + * 角色ID + */ + private Long roleId; + + /** + * 权限数据内容 + */ + private String json; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/command/AddUserAuthCmd.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/command/AddUserAuthCmd.java new file mode 100644 index 0000000000000000000000000000000000000000..153c8299c433c9d98dc3d50cc016c77402ddbc7c --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/command/AddUserAuthCmd.java @@ -0,0 +1,39 @@ +package com.coderman.infosys.auth.app.command; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:增加用户权限类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:28 + * @version v1.0 + */ +@Data +@ToString +public class AddUserAuthCmd extends AbstractCmd{ + + + /** + * 用户ID + */ + private Long userId; + + /** + * 角色ID + */ + private Long roleId; + + /** + * 权限类型 + */ + private int authorityType; + + /** + * 权限数据内容 + */ + private String json; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/command/AddUserCmd.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/command/AddUserCmd.java new file mode 100644 index 0000000000000000000000000000000000000000..4cc5fb351a71500a802f44bc0f6dd2ffffa49a0c --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/command/AddUserCmd.java @@ -0,0 +1,34 @@ +package com.coderman.infosys.auth.app.command; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:增加用户命令类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:28 + * @version v1.0 + */ +@Data +@ToString +public class AddUserCmd extends AbstractCmd{ + + + /** + * 用户名 + */ + private String userName; + + /** + * 用户ID + */ + private Long userId; + + /** + * 所属组织 + */ + private Long departmentId; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/command/AddUserGroupCmd.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/command/AddUserGroupCmd.java new file mode 100644 index 0000000000000000000000000000000000000000..c237bf48887d6b6672e0022d2a2ab997e525db64 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/command/AddUserGroupCmd.java @@ -0,0 +1,29 @@ +package com.coderman.infosys.auth.app.command; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:增加用户组命令类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:28 + * @version v1.0 + */ +@Data +@ToString +public class AddUserGroupCmd extends AbstractCmd{ + + + /** + * 组名 + */ + private String groupName; + + /** + * 用户ID + */ + private Long userId; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/command/UpdateRoleAuthCmd.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/command/UpdateRoleAuthCmd.java new file mode 100644 index 0000000000000000000000000000000000000000..d1540bd185268c618368209dd5d7295116c72e68 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/command/UpdateRoleAuthCmd.java @@ -0,0 +1,29 @@ +package com.coderman.infosys.auth.app.command; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:更新角色权限类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:28 + * @version v1.0 + */ +@Data +@ToString +public class UpdateRoleAuthCmd extends AbstractCmd{ + + + /** + * 角色ID + */ + private Long roleId; + + /** + * 权限数据内容 + */ + private String json; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/command/UpdateUserAuthCmd.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/command/UpdateUserAuthCmd.java new file mode 100644 index 0000000000000000000000000000000000000000..b89887535c0ab34586fa87ce3b400c62db398d14 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/command/UpdateUserAuthCmd.java @@ -0,0 +1,34 @@ +package com.coderman.infosys.auth.app.command; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:更新用户权限类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:28 + * @version v1.0 + */ +@Data +@ToString +public class UpdateUserAuthCmd extends AbstractCmd{ + + + /** + * 用户ID + */ + private Long userId; + + /** + * 角色ID + */ + private Long roleId; + + /** + * 权限数据内容 + */ + private String json; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/convert/AuthorityConvert.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/convert/AuthorityConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..96cd49872553196c9409a73c0cb3e3d2338eda83 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/convert/AuthorityConvert.java @@ -0,0 +1,60 @@ +package com.coderman.infosys.auth.app.convert; + +import com.coderman.infosys.auth.api.dto.UpdateAuthorityRequestDTO; +import com.coderman.infosys.auth.domain.bo.AuthorityBO; +import java.util.List; +import com.coderman.infosys.auth.api.dto.CreateAuthorityRequestDTO; +import com.coderman.infosys.auth.api.dto.AuthorityResponseDTO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:AuthorityConvert接口 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Mapper +public interface AuthorityConvert{ + AuthorityConvert INSTANCE = Mappers.getMapper(AuthorityConvert.class); + + /** + * + * @Description: + * @return AuthorityResponseDTO + */ + AuthorityResponseDTO bo2dto(AuthorityBO authorityBO); + /** + * + * @Description: + * @return List + */ + List authorityBOs2dtoList(List authorityBOList); + /** + * + * @Description: + * @return AuthorityBO + */ + AuthorityBO dto2bo(UpdateAuthorityRequestDTO updateAuthorityRequestDTO); + /** + * + * @Description: + * @return List + */ + List createAuthorityRequestDTOs2boList(List createAuthorityRequestDTOList); + /** + * + * @Description: + * @return AuthorityBO + */ + AuthorityBO dto2bo(CreateAuthorityRequestDTO createAuthorityRequestDTO); + /** + * + * @Description: + * @return List + */ + List updateAuthorityRequestDTOs2boList(List updateAuthorityRequestDTOList); +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/convert/DataAuthorityConvert.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/convert/DataAuthorityConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..86a7db2346a8eddc3f309444308ac5f24cb05c51 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/convert/DataAuthorityConvert.java @@ -0,0 +1,61 @@ +package com.coderman.infosys.auth.app.convert; + +import java.util.List; +import com.coderman.infosys.auth.domain.bo.AuthorityBO; +import com.coderman.infosys.auth.api.dto.UpdateDataAuthorityRequestDTO; +import com.coderman.infosys.auth.api.dto.CreateDataAuthorityRequestDTO; +import com.coderman.infosys.auth.api.dto.DataAuthorityResponseDTO; +import com.coderman.infosys.auth.domain.bo.DataAuthorityBO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:DataAuthorityConvert接口 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Mapper +public interface DataAuthorityConvert{ + DataAuthorityConvert INSTANCE = Mappers.getMapper(DataAuthorityConvert.class); + + /** + * + * @Description: + * @return List + */ + List createDataAuthorityRequestDTOs2boList(List createDataAuthorityRequestDTOList); + /** + * + * @Description: + * @return List + */ + List updateDataAuthorityRequestDTOs2boList(List updateDataAuthorityRequestDTOList); + /** + * + * @Description: + * @return DataAuthorityBO + */ + DataAuthorityBO dto2bo(CreateDataAuthorityRequestDTO createDataAuthorityRequestDTO); + /** + * + * @Description: + * @return DataAuthorityBO + */ + DataAuthorityBO dto2bo(UpdateDataAuthorityRequestDTO updateDataAuthorityRequestDTO); + /** + * + * @Description: + * @return DataAuthorityResponseDTO + */ + DataAuthorityResponseDTO bo2dto(DataAuthorityBO dataAuthorityBO); + /** + * + * @Description: + * @return List + */ + List dataAuthorityBOs2dtoList(List dataAuthorityBOList); +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/convert/MenuConvert.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/convert/MenuConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..a49b299134579dec6d9007a79f64ea088544d75f --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/convert/MenuConvert.java @@ -0,0 +1,60 @@ +package com.coderman.infosys.auth.app.convert; + +import com.coderman.infosys.auth.domain.bo.MenuBO; +import java.util.List; +import com.coderman.infosys.auth.api.dto.UpdateMenuRequestDTO; +import com.coderman.infosys.auth.api.dto.CreateMenuRequestDTO; +import com.coderman.infosys.auth.api.dto.MenuResponseDTO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:MenuConvert接口 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Mapper +public interface MenuConvert{ + MenuConvert INSTANCE = Mappers.getMapper(MenuConvert.class); + + /** + * + * @Description: + * @return MenuResponseDTO + */ + MenuResponseDTO bo2dto(MenuBO menuBO); + /** + * + * @Description: + * @return List + */ + List menuBOs2dtoList(List menuBOList); + /** + * + * @Description: + * @return MenuBO + */ + MenuBO dto2bo(UpdateMenuRequestDTO updateMenuRequestDTO); + /** + * + * @Description: + * @return List + */ + List updateMenuRequestDTOs2boList(List updateMenuRequestDTOList); + /** + * + * @Description: + * @return MenuBO + */ + MenuBO dto2bo(CreateMenuRequestDTO createMenuRequestDTO); + /** + * + * @Description: + * @return List + */ + List createMenuRequestDTOs2boList(List createMenuRequestDTOList); +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/convert/ModuleConvert.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/convert/ModuleConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..e02b48cd55f45377e490e33acd845ea822e46da2 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/convert/ModuleConvert.java @@ -0,0 +1,60 @@ +package com.coderman.infosys.auth.app.convert; + +import java.util.List; +import com.coderman.infosys.auth.api.dto.UpdateModuleRequestDTO; +import com.coderman.infosys.auth.api.dto.ModuleResponseDTO; +import com.coderman.infosys.auth.domain.bo.ModuleBO; +import com.coderman.infosys.auth.api.dto.CreateModuleRequestDTO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:ModuleConvert接口 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Mapper +public interface ModuleConvert{ + ModuleConvert INSTANCE = Mappers.getMapper(ModuleConvert.class); + + /** + * + * @Description: + * @return ModuleResponseDTO + */ + ModuleResponseDTO bo2dto(ModuleBO moduleBO); + /** + * + * @Description: + * @return List + */ + List moduleBOs2dtoList(List moduleBOList); + /** + * + * @Description: + * @return ModuleBO + */ + ModuleBO dto2bo(CreateModuleRequestDTO createModuleRequestDTO); + /** + * + * @Description: + * @return ModuleBO + */ + ModuleBO dto2bo(UpdateModuleRequestDTO updateModuleRequestDTO); + /** + * + * @Description: + * @return List + */ + List createModuleRequestDTOs2boList(List createModuleRequestDTOList); + /** + * + * @Description: + * @return List + */ + List updateModuleRequestDTOs2boList(List updateModuleRequestDTOList); +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/convert/RoleConvert.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/convert/RoleConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..7a075da01dcbb5801eaa86f5fbee198b1282ee8d --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/convert/RoleConvert.java @@ -0,0 +1,60 @@ +package com.coderman.infosys.auth.app.convert; + +import java.util.List; +import com.coderman.infosys.auth.domain.bo.RoleBO; +import com.coderman.infosys.auth.api.dto.CreateRoleRequestDTO; +import com.coderman.infosys.auth.api.dto.RoleResponseDTO; +import com.coderman.infosys.auth.api.dto.UpdateRoleRequestDTO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:RoleConvert接口 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Mapper +public interface RoleConvert{ + RoleConvert INSTANCE = Mappers.getMapper(RoleConvert.class); + + /** + * + * @Description: + * @return List + */ + List createRoleRequestDTOs2boList(List createRoleRequestDTOList); + /** + * + * @Description: + * @return RoleBO + */ + RoleBO dto2bo(UpdateRoleRequestDTO updateRoleRequestDTO); + /** + * + * @Description: + * @return RoleResponseDTO + */ + RoleResponseDTO bo2dto(RoleBO roleBO); + /** + * + * @Description: + * @return List + */ + List roleBOs2dtoList(List roleBOList); + /** + * + * @Description: + * @return List + */ + List updateRoleRequestDTOs2boList(List updateRoleRequestDTOList); + /** + * + * @Description: + * @return RoleBO + */ + RoleBO dto2bo(CreateRoleRequestDTO createRoleRequestDTO); +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/convert/RoleGroupConvert.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/convert/RoleGroupConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..f06dc524c6eff1fef7cd5226d232a768c0876e4e --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/convert/RoleGroupConvert.java @@ -0,0 +1,47 @@ +package com.coderman.infosys.auth.app.convert; + +import com.coderman.infosys.auth.api.dto.UpdateRoleGroupRequestDTO; +import java.util.List; +import com.coderman.infosys.auth.api.dto.RoleGroupResponseDTO; +import com.coderman.infosys.auth.domain.bo.RoleGroupBO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:RoleGroupConvert接口 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Mapper +public interface RoleGroupConvert{ + RoleGroupConvert INSTANCE = Mappers.getMapper(RoleGroupConvert.class); + + /** + * + * @Description: + * @return RoleGroupBO + */ + RoleGroupBO dto2bo(UpdateRoleGroupRequestDTO updateRoleGroupRequestDTO); + /** + * + * @Description: + * @return RoleGroupResponseDTO + */ + RoleGroupResponseDTO bo2dto(RoleGroupBO roleGroupBO); + /** + * + * @Description: + * @return List + */ + List roleGroupBOs2dtoList(List roleGroupBOList); + /** + * + * @Description: + * @return List + */ + List updateRoleGroupRequestDTOs2boList(List updateRoleGroupRequestDTOList); +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/convert/SystemAuthorityConvert.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/convert/SystemAuthorityConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..8c1204ed666d9a61caa327a0076e47f83422dc13 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/convert/SystemAuthorityConvert.java @@ -0,0 +1,61 @@ +package com.coderman.infosys.auth.app.convert; + +import com.coderman.infosys.auth.domain.bo.SystemAuthorityBO; +import com.coderman.infosys.auth.domain.bo.AuthorityBO; +import java.util.List; +import com.coderman.infosys.auth.api.dto.UpdateSystemAuthorityRequestDTO; +import com.coderman.infosys.auth.api.dto.SystemAuthorityResponseDTO; +import com.coderman.infosys.auth.api.dto.CreateSystemAuthorityRequestDTO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:SystemAuthorityConvert接口 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Mapper +public interface SystemAuthorityConvert{ + SystemAuthorityConvert INSTANCE = Mappers.getMapper(SystemAuthorityConvert.class); + + /** + * + * @Description: + * @return SystemAuthorityResponseDTO + */ + SystemAuthorityResponseDTO bo2dto(SystemAuthorityBO systemAuthorityBO); + /** + * + * @Description: + * @return SystemAuthorityBO + */ + SystemAuthorityBO dto2bo(CreateSystemAuthorityRequestDTO createSystemAuthorityRequestDTO); + /** + * + * @Description: + * @return List + */ + List createSystemAuthorityRequestDTOs2boList(List createSystemAuthorityRequestDTOList); + /** + * + * @Description: + * @return List + */ + List updateSystemAuthorityRequestDTOs2boList(List updateSystemAuthorityRequestDTOList); + /** + * + * @Description: + * @return SystemAuthorityBO + */ + SystemAuthorityBO dto2bo(UpdateSystemAuthorityRequestDTO updateSystemAuthorityRequestDTO); + /** + * + * @Description: + * @return List + */ + List systemAuthorityBOs2dtoList(List systemAuthorityBOList); +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/convert/SystemConvert.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/convert/SystemConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..c3048655b50bbb32a4033388bd40c2f1e2ffcda6 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/convert/SystemConvert.java @@ -0,0 +1,72 @@ +package com.coderman.infosys.auth.app.convert; + +import java.util.List; +import com.coderman.infosys.auth.api.dto.UpdateSystemRequestDTO; +import com.coderman.infosys.auth.domain.bo.SystemBO; +import com.coderman.infosys.auth.api.dto.CreateSystemRequestDTO; +import com.coderman.infosys.auth.api.dto.SystemDTO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:SystemConvert接口 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Mapper +public interface SystemConvert{ + SystemConvert INSTANCE = Mappers.getMapper(SystemConvert.class); + + /** + * + * @Description: + * @return List + */ + List systemDTOs2boList(List systemDTOList); + /** + * + * @Description: + * @return SystemBO + */ + SystemBO dto2bo(CreateSystemRequestDTO createSystemRequestDTO); + /** + * + * @Description: + * @return List + */ + List createSystemRequestDTOs2boList(List createSystemRequestDTOList); + /** + * + * @Description: + * @return SystemBO + */ + SystemBO dto2bo(UpdateSystemRequestDTO updateSystemRequestDTO); + /** + * + * @Description: + * @return SystemBO + */ + SystemBO dto2bo(SystemDTO systemDTO); + /** + * + * @Description: + * @return SystemDTO + */ + SystemDTO bo2dto(SystemBO systemBO); + /** + * + * @Description: + * @return List + */ + List systemBOs2dtoList(List systemBOList); + /** + * + * @Description: + * @return List + */ + List updateSystemRequestDTOs2boList(List updateSystemRequestDTOList); +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/convert/UserGroupConvert.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/convert/UserGroupConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..a04ab037c093befac71816f5a2b9286620460c82 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/convert/UserGroupConvert.java @@ -0,0 +1,60 @@ +package com.coderman.infosys.auth.app.convert; + +import com.coderman.infosys.auth.api.dto.UserGroupResponseDTO; +import java.util.List; +import com.coderman.infosys.auth.api.dto.CreateUserGroupRequestDTO; +import com.coderman.infosys.auth.domain.bo.UserGroupBO; +import com.coderman.infosys.auth.api.dto.UpdateUserGroupRequestDTO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:UserGroupConvert接口 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Mapper +public interface UserGroupConvert{ + UserGroupConvert INSTANCE = Mappers.getMapper(UserGroupConvert.class); + + /** + * + * @Description: + * @return List + */ + List updateUserGroupRequestDTOs2boList(List updateUserGroupRequestDTOList); + /** + * + * @Description: + * @return UserGroupResponseDTO + */ + UserGroupResponseDTO bo2dto(UserGroupBO userGroupBO); + /** + * + * @Description: + * @return UserGroupBO + */ + UserGroupBO dto2bo(UpdateUserGroupRequestDTO updateUserGroupRequestDTO); + /** + * + * @Description: + * @return List + */ + List userGroupBOs2dtoList(List userGroupBOList); + /** + * + * @Description: + * @return UserGroupBO + */ + UserGroupBO dto2bo(CreateUserGroupRequestDTO createUserGroupRequestDTO); + /** + * + * @Description: + * @return List + */ + List createUserGroupRequestDTOs2boList(List createUserGroupRequestDTOList); +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/exe/CmdExeService.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/exe/CmdExeService.java new file mode 100644 index 0000000000000000000000000000000000000000..fe6da3b47388c2b0d6f77e56e61a2dcac68b7890 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/exe/CmdExeService.java @@ -0,0 +1,19 @@ +package com.coderman.infosys.auth.app.exe; + +import com.coderman.infosys.auth.app.command.AbstractCmd; + + +/** + * @Description:命令执行接口接口 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:28 + * @version v1.0 + */ +public interface CmdExeService{ + /** + * + * @Description:命令执行入口 + * @return String + */ + String exe(AbstractCmd abstractCmd); +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/exe/RoleAuthCmdExe.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/exe/RoleAuthCmdExe.java new file mode 100644 index 0000000000000000000000000000000000000000..1f47429df5e9013f5587052acf6f0dc70c423361 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/exe/RoleAuthCmdExe.java @@ -0,0 +1,29 @@ +package com.coderman.infosys.auth.app.exe; + +import com.coderman.infosys.auth.app.command.AbstractCmd; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import com.coderman.infosys.auth.app.exe.RoleAuthCmdExe; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * @Description:角色权限cmd处理类接口实现类 + * @Author：shenshuai + * @CreateTime：2021-11-07 08:18:28 + * @version v1.0 + */ +@Service +public class RoleAuthCmdExe implements CmdExeService{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + @Override + public String exe(AbstractCmd abstractCmd){ + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/exe/UserAuthCmdExe.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/exe/UserAuthCmdExe.java new file mode 100644 index 0000000000000000000000000000000000000000..7b24f1ef5f840ce8b754c11d3298b11cc5504090 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/exe/UserAuthCmdExe.java @@ -0,0 +1,29 @@ +package com.coderman.infosys.auth.app.exe; + +import com.coderman.infosys.auth.app.command.AbstractCmd; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import com.coderman.infosys.auth.app.exe.UserAuthCmdExe; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * @Description:用户权限cmd处理类接口实现类 + * @Author：shenshuai + * @CreateTime：2021-11-07 08:18:28 + * @version v1.0 + */ +@Service +public class UserAuthCmdExe implements CmdExeService{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + @Override + public String exe(AbstractCmd abstractCmd){ + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/exe/UserCmdExe.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/exe/UserCmdExe.java new file mode 100644 index 0000000000000000000000000000000000000000..65f2452c210a147deabcadbdc16adff9101f2c27 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/exe/UserCmdExe.java @@ -0,0 +1,29 @@ +package com.coderman.infosys.auth.app.exe; + +import com.coderman.infosys.auth.app.command.AbstractCmd; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import com.coderman.infosys.auth.app.exe.UserCmdExe; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * @Description:用户cmd处理类接口实现类 + * @Author：shenshuai + * @CreateTime：2021-11-07 08:18:28 + * @version v1.0 + */ +@Service +public class UserCmdExe implements CmdExeService{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + @Override + public String exe(AbstractCmd abstractCmd){ + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/exe/UserGroupCmdExe.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/exe/UserGroupCmdExe.java new file mode 100644 index 0000000000000000000000000000000000000000..166c035ef4a988c2fdc69659849ed591e15383c4 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/exe/UserGroupCmdExe.java @@ -0,0 +1,29 @@ +package com.coderman.infosys.auth.app.exe; + +import com.coderman.infosys.auth.app.command.AbstractCmd; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import com.coderman.infosys.auth.app.exe.UserGroupCmdExe; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * @Description:用户组cmd处理类接口实现类 + * @Author：shenshuai + * @CreateTime：2021-11-07 08:18:28 + * @version v1.0 + */ +@Service +public class UserGroupCmdExe implements CmdExeService{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + @Override + public String exe(AbstractCmd abstractCmd){ + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/facadeimpl/AuthorityFacadeImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/facadeimpl/AuthorityFacadeImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..2e8b3d18f4cc1343338a84e060267b500ae123f7 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/facadeimpl/AuthorityFacadeImpl.java @@ -0,0 +1,49 @@ +package com.coderman.infosys.auth.app.facadeimpl; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.apache.dubbo.config.annotation.Service; +import org.springframework.beans.factory.annotation.Autowired; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.api.dto.CreateAuthorityRequestDTO; +import com.coderman.infosys.auth.api.facade.AuthorityFacade; +import com.coderman.infosys.auth.api.dto.AuthorityResponseDTO; +/** + * @Description:接口实现类 + * @Author： + * @CreateTime：2021-11-07 08:18:28 + * @version v1.0 + */ +@Service +public class AuthorityFacadeImpl implements AuthorityFacade{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + + @Override + public ResultDataDto checkUserSystemAuth(Long userId,String systemCode){ + + return null; + } + + @Override + public ResultDataDto getUserSystemAuth(Long userId,String systemCode){ + + return null; + } + + @Override + public ResultDataDto getByCode(String authCode){ + + return null; + } + + @Override + public ResultDataDto saveAuthority(CreateAuthorityRequestDTO createAuthorityRequestDTO){ + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/facadeimpl/DataAuthorityFacadeImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/facadeimpl/DataAuthorityFacadeImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..60a1029aba612b0b32bae6279781ead1606aa34d --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/facadeimpl/DataAuthorityFacadeImpl.java @@ -0,0 +1,39 @@ +package com.coderman.infosys.auth.app.facadeimpl; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.apache.dubbo.config.annotation.Service; +import org.springframework.beans.factory.annotation.Autowired; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.api.dto.CreateDataAuthorityRequestDTO; +import com.coderman.infosys.auth.api.facade.DataAuthorityFacade; +import com.coderman.infosys.auth.api.facade.AuthorityFacade; +import com.coderman.infosys.auth.api.dto.DataAuthorityResponseDTO; +import com.coderman.infosys.auth.api.dto.AuthorityResponseDTO; +/** + * @Description:接口实现类 + * @Author： + * @CreateTime：2021-11-07 08:18:28 + * @version v1.0 + */ +@Service +public class DataAuthorityFacadeImpl implements DataAuthorityFacade{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + + @Override + public ResultDataDto getByCode(String authCode){ + + return null; + } + + @Override + public ResultDataDto saveAuthority(CreateDataAuthorityRequestDTO createDataAuthorityRequestDTO){ + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/facadeimpl/MenuFacadeImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/facadeimpl/MenuFacadeImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..53074831f4a03b8d2a95827b10b7a164f96eefce --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/facadeimpl/MenuFacadeImpl.java @@ -0,0 +1,22 @@ +package com.coderman.infosys.auth.app.facadeimpl; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.apache.dubbo.config.annotation.Service; +import org.springframework.beans.factory.annotation.Autowired; + +import com.coderman.infosys.auth.api.facade.MenuFacade; +/** + * @Description:接口实现类 + * @Author： + * @CreateTime：2021-11-07 08:18:28 + * @version v1.0 + */ +@Service +public class MenuFacadeImpl implements MenuFacade{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/facadeimpl/ModuleFacadeImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/facadeimpl/ModuleFacadeImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..a7f36d88eb0f1f75f4cf794096ae3e878c171158 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/facadeimpl/ModuleFacadeImpl.java @@ -0,0 +1,22 @@ +package com.coderman.infosys.auth.app.facadeimpl; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.apache.dubbo.config.annotation.Service; +import org.springframework.beans.factory.annotation.Autowired; + +import com.coderman.infosys.auth.api.facade.ModuleFacade; +/** + * @Description:接口实现类 + * @Author： + * @CreateTime：2021-11-07 08:18:28 + * @version v1.0 + */ +@Service +public class ModuleFacadeImpl implements ModuleFacade{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/facadeimpl/RoleFacadeImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/facadeimpl/RoleFacadeImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..e1b0e3ea79021e347deeae35c5ed7a579740f89f --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/facadeimpl/RoleFacadeImpl.java @@ -0,0 +1,30 @@ +package com.coderman.infosys.auth.app.facadeimpl; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.apache.dubbo.config.annotation.Service; +import org.springframework.beans.factory.annotation.Autowired; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.api.dto.RoleResponseDTO; +import com.coderman.infosys.auth.api.facade.RoleFacade; +/** + * @Description:接口实现类 + * @Author： + * @CreateTime：2021-11-07 08:18:28 + * @version v1.0 + */ +@Service +public class RoleFacadeImpl implements RoleFacade{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + + @Override + public ResultDataDto getByRoleCode(String roleCode){ + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/facadeimpl/RoleGroupFacadeImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/facadeimpl/RoleGroupFacadeImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..a2a18a96dd0aa0b73e3152a01de8a7ce8010382f --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/facadeimpl/RoleGroupFacadeImpl.java @@ -0,0 +1,30 @@ +package com.coderman.infosys.auth.app.facadeimpl; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.apache.dubbo.config.annotation.Service; +import org.springframework.beans.factory.annotation.Autowired; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.api.dto.RoleGroupResponseDTO; +import com.coderman.infosys.auth.api.facade.RoleGroupFacade; +/** + * @Description:接口实现类 + * @Author： + * @CreateTime：2021-11-07 08:18:28 + * @version v1.0 + */ +@Service +public class RoleGroupFacadeImpl implements RoleGroupFacade{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + + @Override + public ResultDataDto getByNumber(String number){ + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/facadeimpl/SystemAuthorityFacadeImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/facadeimpl/SystemAuthorityFacadeImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..7e9fda147e50e709cccb3e4bc69b80e9a151444f --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/facadeimpl/SystemAuthorityFacadeImpl.java @@ -0,0 +1,32 @@ +package com.coderman.infosys.auth.app.facadeimpl; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.apache.dubbo.config.annotation.Service; +import org.springframework.beans.factory.annotation.Autowired; + +import com.coderman.infosys.auth.api.facade.SystemAuthorityFacade; +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.api.facade.AuthorityFacade; +import com.coderman.infosys.auth.api.dto.SystemAuthorityResponseDTO; +import com.coderman.infosys.auth.api.dto.AuthorityResponseDTO; +/** + * @Description:接口实现类 + * @Author： + * @CreateTime：2021-11-07 08:18:28 + * @version v1.0 + */ +@Service +public class SystemAuthorityFacadeImpl implements SystemAuthorityFacade{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + + @Override + public ResultDataDto getByCode(String authCode){ + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/facadeimpl/SystemFacadeImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/facadeimpl/SystemFacadeImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..da48ce25f989908f06b3879ac3f9a3d8a461afee --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/facadeimpl/SystemFacadeImpl.java @@ -0,0 +1,77 @@ +package com.coderman.infosys.auth.app.facadeimpl; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.apache.dubbo.config.annotation.Service; +import org.springframework.beans.factory.annotation.Autowired; + +import com.coderman.utils.response.PageDTO; +import java.util.List; +import com.coderman.infosys.auth.api.facade.SystemFacade; +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.api.dto.UpdateSystemRequestDTO; +import com.coderman.infosys.auth.api.dto.SystemDTO; +import com.coderman.infosys.auth.domain.gataway.SystemModuleRepository; +import com.coderman.infosys.auth.domain.bo.SystemBO; +import com.coderman.infosys.auth.domain.gataway.SystemModuleQueryGataWay; +import com.coderman.infosys.auth.app.convert.SystemConvert; +/** + * @Description:接口实现类 + * @Author： + * @CreateTime：2021-11-07 08:18:28 + * @version v1.0 + */ +@Service +public class SystemFacadeImpl implements SystemFacade{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + private SystemModuleQueryGataWay systemModuleQueryGataWay; + + @Autowired + private SystemModuleRepository systemModuleRepository; + + + + @Override + public ResultDataDto registSystem(SystemDTO systemDTO){ + SystemBO systemBO = SystemConvert.INSTANCE.dto2bo(systemDTO); + List systemBOList = systemModuleQueryGataWay.getSystemByName(systemBO.getSystemName()); + + return null; + } + + @Override + public ResultDataDto> getPageList(PageDTO pageDto){ + List systemBOList = systemModuleQueryGataWay.querySystemPage(null); + List systemDTOList = SystemConvert.INSTANCE.systemBOs2dtoList(systemBOList); + + return null; + } + + @Override + public ResultDataDto getBySystemCode(String systemCode){ + SystemBO systemBO = systemModuleQueryGataWay.queryBySystemCode(systemCode); + SystemDTO systemDTO = SystemConvert.INSTANCE.bo2dto(systemBO); + + return ResultDataDto.success(systemDTO); + } + + @Override + public ResultDataDto updateSystem(UpdateSystemRequestDTO dto){ + SystemBO systemBO = SystemConvert.INSTANCE.dto2bo(dto); + Integer intVar = systemModuleRepository.updateSystem(systemBO); + + return null; + } + + @Override + public ResultDataDto> getSearchList(String search){ + List systemBOList = systemModuleQueryGataWay.queryByCondition(search); + List systemDTOList = SystemConvert.INSTANCE.systemBOs2dtoList(systemBOList); + + return ResultDataDto.success(systemDTOList); + } + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/facadeimpl/UserGroupFacadeImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/facadeimpl/UserGroupFacadeImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..b74f6c06529c89be7b56de62ea33ba6a97e6a353 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/facadeimpl/UserGroupFacadeImpl.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.app.facadeimpl; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.apache.dubbo.config.annotation.Service; +import org.springframework.beans.factory.annotation.Autowired; + +import com.coderman.infosys.auth.api.dto.UserGroupResponseDTO; +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.api.dto.CreateUserGroupRequestDTO; +import com.coderman.infosys.auth.api.facade.UserGroupFacade; +/** + * @Description:接口实现类 + * @Author： + * @CreateTime：2021-11-07 08:18:28 + * @version v1.0 + */ +@Service +public class UserGroupFacadeImpl implements UserGroupFacade{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + + @Override + public ResultDataDto createUserGroup(CreateUserGroupRequestDTO createUserGroupRequestDTO){ + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/facadeimpl/UserGroupQueryFacadeImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/facadeimpl/UserGroupQueryFacadeImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..f05b67aa344c4ddd27cf49eaad152dfda3248e43 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/facadeimpl/UserGroupQueryFacadeImpl.java @@ -0,0 +1,30 @@ +package com.coderman.infosys.auth.app.facadeimpl; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.apache.dubbo.config.annotation.Service; +import org.springframework.beans.factory.annotation.Autowired; + +import com.coderman.infosys.auth.api.dto.UserGroupResponseDTO; +import com.coderman.infosys.auth.api.facade.UserGroupQueryFacade; +import com.coderman.utils.response.ResultDataDto; +/** + * @Description:接口实现类 + * @Author： + * @CreateTime：2021-11-07 08:18:28 + * @version v1.0 + */ +@Service +public class UserGroupQueryFacadeImpl implements UserGroupQueryFacade{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + + @Override + public ResultDataDto getByGroupCode(String groupCode){ + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/AdminAuthorityBO.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/AdminAuthorityBO.java new file mode 100644 index 0000000000000000000000000000000000000000..fec8b49ea785cd41a3a341df475899226390d9df --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/AdminAuthorityBO.java @@ -0,0 +1,39 @@ +package com.coderman.infosys.auth.domain.bo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:行政权限类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:27 + * @version v1.0 + */ +@Data +@ToString +public class AdminAuthorityBO extends AuthorityBO{ + + + /** + * 权限编码标示 + */ + private String authCode; + + /** + * 组织部门 + */ + private Long departmentId; + + /** + * 城市 + */ + private Long cityId; + + /** + * 职位 + */ + private Long jobId; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/AuthAggregateBO.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/AuthAggregateBO.java new file mode 100644 index 0000000000000000000000000000000000000000..3a6e90c9b64d86e443f7970c3adf0bf1d40071b8 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/AuthAggregateBO.java @@ -0,0 +1,50 @@ +package com.coderman.infosys.auth.domain.bo; + +import java.util.List; + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:权限聚合根类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:27 + * @version v1.0 + */ +@Data +@ToString +public class AuthAggregateBO { + + + /** + * 系统权 + */ + public List systemBOList; + + /** + * 菜单权 + */ + public List moduleBOList; + + /** + * 按钮权 + */ + public List menuBOList; + + /** + * 城市权 + */ + public List cityIdList; + + /** + * 部门权 + */ + public List departmentIdList; + + /** + * 数据字段权 + */ + public List dataColumnBOList; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/AuthorityBO.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/AuthorityBO.java new file mode 100644 index 0000000000000000000000000000000000000000..61784a6d8be45fb4db786b33678bd57bb6b5343a --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/AuthorityBO.java @@ -0,0 +1,65 @@ +package com.coderman.infosys.auth.domain.bo; + +import java.util.List; + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:权限类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:27 + * @version v1.0 + */ +@Data +@ToString +public class AuthorityBO { + + + /** + * 主键ID + */ + private Long id; + + /** + * 权限编码标示 + */ + private String authCode; + + /** + * 权限类型 + */ + private Integer authorityType; + + /** + * 关联角色 + */ + private String roleCode; + + /** + * 关联角色组 + */ + private String roleGroupCode; + + /** + * 数据字段权限列表 + */ + private List dataAuthorityBOList; + + /** + * 系统菜单权限列表 + */ + private List systemAuthorityBOList; + + /** + * 行政权限列表 + */ + private List adminAuthorityBOList; + + /** + * 权限状态 + */ + private Integer status; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/AuthorityUpdateRequestBO.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/AuthorityUpdateRequestBO.java new file mode 100644 index 0000000000000000000000000000000000000000..405487a088ea8a240908ce60b4d1c2cd03ce6bb9 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/AuthorityUpdateRequestBO.java @@ -0,0 +1,24 @@ +package com.coderman.infosys.auth.domain.bo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:权限更新请求实体类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:27 + * @version v1.0 + */ +@Data +@ToString +public class AuthorityUpdateRequestBO { + + + /** + * 权限编码标示 + */ + private String authCode; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/BasicOperateBO.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/BasicOperateBO.java new file mode 100644 index 0000000000000000000000000000000000000000..eae97fd4f65ddb85e2d29ed95e247ca0bb4be258 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/BasicOperateBO.java @@ -0,0 +1,40 @@ +package com.coderman.infosys.auth.domain.bo; + +import java.util.Date; + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:数据操作信息类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:27 + * @version v1.0 + */ +@Data +@ToString +public class BasicOperateBO { + + + /** + * 修改时 + */ + public Date dateUpdate; + + /** + * 创建时 + */ + public Date dateCreate; + + /** + * 修改 + */ + public Long updateUserId; + + /** + * 创建 + */ + public Long createUserId; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/DataAuthorityBO.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/DataAuthorityBO.java new file mode 100644 index 0000000000000000000000000000000000000000..b475d38052853d40054cd0467469ed21c693dbd4 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/DataAuthorityBO.java @@ -0,0 +1,34 @@ +package com.coderman.infosys.auth.domain.bo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:数据字段权限类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:27 + * @version v1.0 + */ +@Data +@ToString +public class DataAuthorityBO extends AuthorityBO { + + + /** + * 主键ID + */ + private Long id; + + /** + * 权限编码标示 + */ + private String authCode; + + /** + * 数据字段ID + */ + private Long dataColumnId; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/DataColumnBO.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/DataColumnBO.java new file mode 100644 index 0000000000000000000000000000000000000000..115e2b3d5d207218db257d65584698f09e689da1 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/DataColumnBO.java @@ -0,0 +1,59 @@ +package com.coderman.infosys.auth.domain.bo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:数据字段实体类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:27 + * @version v1.0 + */ +@Data +@ToString +public class DataColumnBO { + + + /** + * 主键ID + */ + private Long id; + + /** + * 主键ID + */ + private Long id; + + /** + * 数据库业务系统名称 + */ + private String busDataBase; + + /** + * 数据库表名称 + */ + private String tableName; + + /** + * 数据库表描述 + */ + private String tableDesc; + + /** + * 数据库字段名称 + */ + private String columnName; + + /** + * 数据库字段描述 + */ + private String columnDesc; + + /** + * 业务字段名称 + */ + private String fieldName; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/MenuBO.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/MenuBO.java new file mode 100644 index 0000000000000000000000000000000000000000..c7f0001d1552d8816796d68210f6ea6a47dd2cff --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/MenuBO.java @@ -0,0 +1,49 @@ +package com.coderman.infosys.auth.domain.bo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:按钮管理类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:27 + * @version v1.0 + */ +@Data +@ToString +public class MenuBO { + + + /** + * 主键ID + */ + private Long id; + + /** + * 按钮名称 + */ + private String menuName; + + /** + * 按钮编码 + */ + private String menuCode; + + /** + * 按钮链接 + */ + private String menuUrl; + + /** + * 系统编码 + */ + private String systemCode; + + /** + * 菜单编码 + */ + private String moduleCode; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/ModuleBO.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/ModuleBO.java new file mode 100644 index 0000000000000000000000000000000000000000..a4e591141a7158614ca97398c63fb7c1e9e687da --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/ModuleBO.java @@ -0,0 +1,50 @@ +package com.coderman.infosys.auth.domain.bo; + +import java.util.List; + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:菜单/模块管理类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:27 + * @version v1.0 + */ +@Data +@ToString +public class ModuleBO { + + + /** + * 主键ID + */ + private Long id; + + /** + * 菜单名称 + */ + private String moduleName; + + /** + * 菜单编码 + */ + private String moduleCode; + + /** + * 菜单链接 + */ + private String moduleUrl; + + /** + * 系统标示 + */ + private String systemCode; + + /** + * 按钮列表 + */ + private List menuBOList; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/OperateDateBO.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/OperateDateBO.java new file mode 100644 index 0000000000000000000000000000000000000000..cac1a438fd959732a49c98c62f01af9790bb1f73 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/OperateDateBO.java @@ -0,0 +1,30 @@ +package com.coderman.infosys.auth.domain.bo; + +import java.util.Date; + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:操作时间信息类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:27 + * @version v1.0 + */ +@Data +@ToString +public class OperateDateBO { + + + /** + * 修改时 + */ + public Date dateUpdate; + + /** + * 修改 + */ + public Long updateUserId; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/OperatorBO.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/OperatorBO.java new file mode 100644 index 0000000000000000000000000000000000000000..3c420e5fd8bb6fe65f665ce2cfe472b6cf7af6bf --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/OperatorBO.java @@ -0,0 +1,30 @@ +package com.coderman.infosys.auth.domain.bo; + +import java.util.Date; + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:操作人信息类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:27 + * @version v1.0 + */ +@Data +@ToString +public class OperatorBO { + + + /** + * 创建时 + */ + public Date dateCreate; + + /** + * 创建 + */ + public Long createUserId; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/RoleAuthAggregateBO.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/RoleAuthAggregateBO.java new file mode 100644 index 0000000000000000000000000000000000000000..98c6fdece67a4b45f5917fbcede8fbb36a4d7f80 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/RoleAuthAggregateBO.java @@ -0,0 +1,24 @@ +package com.coderman.infosys.auth.domain.bo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:角色权限聚合根类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:27 + * @version v1.0 + */ +@Data +@ToString +public class RoleAuthAggregateBO extends AuthAggregateBO{ + + + /** + * 角色ID + */ + private Long roleId; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/RoleBO.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/RoleBO.java new file mode 100644 index 0000000000000000000000000000000000000000..8467615919ecb930872daa5da88c101706679486 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/RoleBO.java @@ -0,0 +1,45 @@ +package com.coderman.infosys.auth.domain.bo; + +import java.util.List; + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:角色类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:27 + * @version v1.0 + */ +@Data +@ToString +public class RoleBO { + + + /** + * 主键ID + */ + private Long id; + + /** + * 角色名称 + */ + private String roleName; + + /** + * 角色编码 + */ + private String roleCode; + + /** + * 角色对应用户列表 + */ + private List userList; + + /** + * 角色状态 + */ + private Integer status; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/RoleGroupBO.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/RoleGroupBO.java new file mode 100644 index 0000000000000000000000000000000000000000..4929938839c0cfabeed6b74c0cae11085c558a4a --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/RoleGroupBO.java @@ -0,0 +1,45 @@ +package com.coderman.infosys.auth.domain.bo; + +import java.util.List; + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:角色组类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:27 + * @version v1.0 + */ +@Data +@ToString +public class RoleGroupBO { + + + /** + * 主键ID + */ + private Long id; + + /** + * 角色组名称 + */ + private String roleName; + + /** + * 角色组编码 + */ + private String roleCode; + + /** + * 组内角色列表 + */ + private List roleList; + + /** + * 角色状态 + */ + private Integer status; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/SystemAuthorityBO.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/SystemAuthorityBO.java new file mode 100644 index 0000000000000000000000000000000000000000..73f8fcfefa5c51cc78d89257e861795c6983af44 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/SystemAuthorityBO.java @@ -0,0 +1,49 @@ +package com.coderman.infosys.auth.domain.bo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:系统菜单权限类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:27 + * @version v1.0 + */ +@Data +@ToString +public class SystemAuthorityBO extends AuthorityBO{ + + + /** + * 主键ID + */ + private Long id; + + /** + * 权限编码标示 + */ + private String authCode; + + /** + * 业务数据系统标示 + */ + private String systemName; + + /** + * 功能 + */ + private String funcName; + + /** + * 菜单 + */ + private String categoryName; + + /** + * 按钮 + */ + private String menuName; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/SystemBO.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/SystemBO.java new file mode 100644 index 0000000000000000000000000000000000000000..1ecdf240891e4defd623822f4e1e342eb36130c1 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/SystemBO.java @@ -0,0 +1,65 @@ +package com.coderman.infosys.auth.domain.bo; + +import java.util.List; + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:系统管理类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:27 + * @version v1.0 + */ +@Data +@ToString +public class SystemBO { + + + /** + * 主键ID + */ + private Long id; + + /** + * 系统名称 + */ + private String systemName; + + /** + * 系统标示 + */ + private String systemCode; + + /** + * 系统域名 + */ + private String systemUrl; + + /** + * 系统图标 + */ + private String systemPicUrl; + + /** + * 系统技术负责人 + */ + private Long tecAdminUserId; + + /** + * 系统业务负责人 + */ + private Long busAdminUserId; + + /** + * 系统当前所在部门 + */ + private Long departmentId; + + /** + * 系统模块列表 + */ + private List moduleBOList; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/SystemConfig.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/SystemConfig.java new file mode 100644 index 0000000000000000000000000000000000000000..4d3be92a4dda89bcb60f56b6b528a7e06b9e7eca --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/SystemConfig.java @@ -0,0 +1,25 @@ +package com.coderman.infosys.auth.domain.bo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:系统设置类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:27 + * @version v1.0 + */ +@Data +@ToString +public class SystemConfig { + + /** 变量名 **/ + private String varName; + /** 变量描述 **/ + private String varDesc; + /** 变量值 **/ + private String value; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/UserAuthAggregateBO.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/UserAuthAggregateBO.java new file mode 100644 index 0000000000000000000000000000000000000000..a517d753113e8925c26813d89f547cd76aaa0ed5 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/UserAuthAggregateBO.java @@ -0,0 +1,24 @@ +package com.coderman.infosys.auth.domain.bo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:用户权限聚合根类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:27 + * @version v1.0 + */ +@Data +@ToString +public class UserAuthAggregateBO extends AuthAggregateBO{ + + + /** + * 用户ID + */ + private Long userId; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/UserBO.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/UserBO.java new file mode 100644 index 0000000000000000000000000000000000000000..a93b20933c563fead260cbf37d81e5f4da3b18f8 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/UserBO.java @@ -0,0 +1,40 @@ +package com.coderman.infosys.auth.domain.bo; + +import java.util.List; + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:用户信息类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:27 + * @version v1.0 + */ +@Data +@ToString +public class UserBO { + + + /** + * 用户名 + */ + private String userName; + + /** + * 用户ID + */ + private Long userId; + + /** + * 用户对应角色列表 + */ + private List userList; + + /** + * 用户对应角色组列表 + */ + private List userList; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/UserGroupBO.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/UserGroupBO.java new file mode 100644 index 0000000000000000000000000000000000000000..75ba43d8869119e5221a1e5aa6c51c45db6056e2 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/UserGroupBO.java @@ -0,0 +1,55 @@ +package com.coderman.infosys.auth.domain.bo; + +import java.util.List; + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:用户组类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:27 + * @version v1.0 + */ +@Data +@ToString +public class UserGroupBO { + + + /** + * 主键ID + */ + private Long id; + + /** + * 组名 + */ + private String groupName; + + /** + * 组编码 + */ + private String groupCode; + + /** + * 组内用户列表 + */ + private List userList; + + /** + * 用户组状态 + */ + private Integer status; + + /** + * 用户组对应的角色列表 + */ + private List roleList; + + /** + * 用户组对应角色组列表 + */ + private List roleGroupList; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/enums/AuthorityTypeEnum.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/enums/AuthorityTypeEnum.java new file mode 100644 index 0000000000000000000000000000000000000000..1a42b40af1bc723e1472273a998bfc5a0691278a --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/enums/AuthorityTypeEnum.java @@ -0,0 +1,45 @@ +package com.coderman.infosys.auth.domain.enums; + +import lombok.Getter; + + /** + * @Description:权限类型类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:28 + * @version v1.0 + */ +@Getter +public enum AuthorityTypeEnum{ + + /** + * + */ + DATA(1,"数据字段权限"), + FUNCATION(2,"菜单功能权限"), + ADMINISTRATION(3,"行政权限"), + CUSTOMIZE(4,"自定义权限"), + ; + + /** 权限类型code **/ + private Integer code; + /** 权限类型描述 **/ + private String desc; + + + AuthorityTypeEnum(Integer code,String desc){ + this.code = code; + this.desc = desc; + } + + + + /** + * + * @Description:static + * @return AuthorityTypeEnum + */ + public static AuthorityTypeEnum getByCode(Integer code){ + return null; + } + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/event/BaseEvent.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/event/BaseEvent.java new file mode 100644 index 0000000000000000000000000000000000000000..35f17cc14e03c3c326db7b1fd15c8e31fd8fee2f --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/event/BaseEvent.java @@ -0,0 +1,18 @@ +package com.coderman.infosys.auth.domain.event; + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:事件基类类 + * @Author: + * @CreateTime:2021-11-07 08:18:28 + * @version v1.0 + */ +@Data +@ToString +public class BaseEvent{ + + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/event/MenuChangeEvent.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/event/MenuChangeEvent.java new file mode 100644 index 0000000000000000000000000000000000000000..baf5a04249bdf643a1a728beb4e872fc2e140799 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/event/MenuChangeEvent.java @@ -0,0 +1,25 @@ +package com.coderman.infosys.auth.domain.event; + +import com.coderman.infosys.auth.domain.bo.MenuBO; +import lombok.Data; +import lombok.ToString; + + /** + * @Description:按钮信息变更事件类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:28 + * @version v1.0 + */ +@Data +@ToString +public class MenuChangeEvent{ + + /** 按钮code **/ + private String menuCode; + /** 变更事件类型 **/ + private Integer changeEventType; + /** 按钮内容 **/ + private MenuBO menuBO; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/event/RoleAuthChangeEvent.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/event/RoleAuthChangeEvent.java new file mode 100644 index 0000000000000000000000000000000000000000..5732f498a75f1c21e7b37f5d6d4127176b4e8838 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/event/RoleAuthChangeEvent.java @@ -0,0 +1,27 @@ +package com.coderman.infosys.auth.domain.event; + +import com.coderman.infosys.auth.domain.bo.RoleBO; +import lombok.Data; +import lombok.ToString; + + /** + * @Description:角色授权变更事件类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:28 + * @version v1.0 + */ +@Data +@ToString +public class RoleAuthChangeEvent{ + + /** 角色code **/ + private String roleCode; + /** 权限code **/ + private String authCode; + /** 变更事件类型 **/ + private Integer changeEventType; + /** 角色内容 **/ + private RoleBO roleBO; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/event/RoleChangeEvent.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/event/RoleChangeEvent.java new file mode 100644 index 0000000000000000000000000000000000000000..b647e7328389f77cb84c296f97dc7b830d240c13 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/event/RoleChangeEvent.java @@ -0,0 +1,25 @@ +package com.coderman.infosys.auth.domain.event; + +import com.coderman.infosys.auth.domain.bo.RoleBO; +import lombok.Data; +import lombok.ToString; + + /** + * @Description:角色变更事件类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:28 + * @version v1.0 + */ +@Data +@ToString +public class RoleChangeEvent{ + + /** 角色code **/ + private String roleCode; + /** 变更事件类型 **/ + private Integer changeEventType; + /** 角色内容 **/ + private RoleBO roleBO; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/factory/AuthorityFactory.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/factory/AuthorityFactory.java new file mode 100644 index 0000000000000000000000000000000000000000..5962ff54a3ef7d0b951297baf441cd7b6d06629f --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/factory/AuthorityFactory.java @@ -0,0 +1,43 @@ +package com.coderman.infosys.auth.domain.factory; + +import com.coderman.infosys.auth.domain.bo.AuthorityBO; +import com.coderman.infosys.auth.domain.bo.UserAuthAggregateBO; +import com.coderman.infosys.auth.domain.bo.AuthAggregateBO; + +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; + + /** + * @Description:AuthorityFactory类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:28 + * @version v1.0 + */ +@Service +public class AuthorityFactory{ + + + + /** + * + * @Description 基于权限本身的维度-权限编码构建权限模 + * @param authorityCode + * @return AuthorityBO + */ + public AuthorityBO buildAuthorityByCode(String authorityCode){ + + return null; + } + + /** + * + * @Description 基于用户的维度构建权限模 + * @param roleCode + * @return UserAuthAggregateBO + */ + public UserAuthAggregateBO buildAuthorityWithRoleCode(String roleCode){ + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/gataway/AuthorityRepository.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/gataway/AuthorityRepository.java new file mode 100644 index 0000000000000000000000000000000000000000..d78223d00019b8d23cd33f5428ac1c0fe63d6b60 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/gataway/AuthorityRepository.java @@ -0,0 +1,44 @@ +package com.coderman.infosys.auth.domain.gataway; + +import com.coderman.infosys.auth.domain.bo.AuthorityBO; +import com.coderman.infosys.auth.domain.bo.AuthorityUpdateRequestBO; + + +/** + * @Description:权限管理仓库接口 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:28 + * @version v1.0 + */ +public interface AuthorityRepository{ + /** + * + * @Description:给角色构建权限 + * @return Boolean + */ + Boolean buildAuthority(AuthorityBO authorityBO); + /** + * + * @Description:给角色更新权限 + * @return Boolean + */ + Boolean updateAuthority(AuthorityUpdateRequestBO authorityUpdateRequestBO); + /** + * + * @Description:根据权限code禁用权限资源 + * @return Boolean + */ + Boolean disableAuthority(String authorityCode); + /** + * + * @Description:根据权限code查询权限资源 + * @return AuthorityBO + */ + AuthorityBO getByCode(String authorityCode); + /** + * + * @Description:根据角色code查询权限资源 + * @return AuthorityBO + */ + AuthorityBO getByRoleCode(String roleCode); +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/gataway/DataColumnGataWay.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/gataway/DataColumnGataWay.java new file mode 100644 index 0000000000000000000000000000000000000000..0b7dec8dff0871cc3e2df3345c198270d8484946 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/gataway/DataColumnGataWay.java @@ -0,0 +1,51 @@ +package com.coderman.infosys.auth.domain.gataway; + +import java.util.List; +import com.coderman.utils.commonbo.PageBO; +import com.coderman.infosys.auth.domain.bo.DataColumnBO; + + +/** + * @Description:数据字段管理网关接口 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:28 + * @version v1.0 + */ +public interface DataColumnGataWay{ + /** + * + * @Description:保存数据字段 + * @return Long + */ + Long saveDataColumn(DataColumnBO dataColumnBO); + /** + * + * @Description:批量保存保存数据字段 + * @return Boolean + */ + Boolean saveBatchDataColumn(List list); + /** + * + * @Description:更新数据字段 + * @return Long + */ + Long updateDataColumn(DataColumnBO dataColumnBO); + /** + * + * @Description:根据ID查询数据字段详情 + * @return DataColumnBO + */ + DataColumnBO getById(Long id); + /** + * + * @Description:根据数据库名称获取字段元数据内容 + * @return List + */ + List getByDBCode(String busDataBase); + /** + * + * @Description:分页查询数据字段内容 + * @return List + */ + List getPageList(PageBO pageBO); +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/gataway/SystemModuleQueryGataWay.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/gataway/SystemModuleQueryGataWay.java new file mode 100644 index 0000000000000000000000000000000000000000..c5ba07c544df9dd63d8fd358fe8cfd146d96f044 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/gataway/SystemModuleQueryGataWay.java @@ -0,0 +1,71 @@ +package com.coderman.infosys.auth.domain.gataway; + +import java.util.List; +import com.coderman.infosys.auth.domain.bo.MenuBO; +import com.coderman.utils.commonbo.PageBO; +import com.coderman.infosys.auth.domain.bo.SystemBO; +import com.coderman.infosys.auth.domain.bo.ModuleBO; + + +/** + * @Description:系统菜单按钮查询服务接口 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:28 + * @version v1.0 + */ +public interface SystemModuleQueryGataWay{ + /** + * + * @Description:分页查询系统列表 + * @return List + */ + List querySystemPage(PageBO pageBO); + /** + * + * @Description:分页查询菜单列表 + * @return List + */ + List queryModulePage(); + /** + * + * @Description:基于系统code查询菜单和按钮 + * @return SystemBO + */ + SystemBO queryBySystemCode(String systemCode); + /** + * + * @Description:根据条件查询系统 + * @return List + */ + List queryByCondition(String search); + /** + * + * @Description:查询所有系统菜单和按钮 + * @return List + */ + List queryWithAll(String search); + /** + * + * @Description:根据code查询系统详情 + * @return SystemBO + */ + SystemBO getSystemByCode(String systemCode); + /** + * + * @Description:根据code查询菜单详情 + * @return ModuleBO + */ + ModuleBO getModuleByCode(String moduleCode); + /** + * + * @Description:根据code查询按钮详情 + * @return MenuBO + */ + MenuBO getMenu(String menuCode); + /** + * + * @Description:根据系统名称查询 + * @return List + */ + List getSystemByName(String systemName); +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/gataway/SystemModuleRepository.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/gataway/SystemModuleRepository.java new file mode 100644 index 0000000000000000000000000000000000000000..0995b18466c19a82790ab42e5bfaa2f7d4bc3a4f --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/gataway/SystemModuleRepository.java @@ -0,0 +1,51 @@ +package com.coderman.infosys.auth.domain.gataway; + +import com.coderman.infosys.auth.domain.bo.MenuBO; +import com.coderman.infosys.auth.domain.bo.SystemBO; +import com.coderman.infosys.auth.domain.bo.ModuleBO; + + +/** + * @Description:系统菜单按钮仓库服务接口 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:28 + * @version v1.0 + */ +public interface SystemModuleRepository{ + /** + * + * @Description:创建系统信息 + * @return Long + */ + Long saveSystem(SystemBO systemBO); + /** + * + * @Description:更新系统信息 + * @return Integer + */ + Integer updateSystem(SystemBO systemBO); + /** + * + * @Description:创建菜单信息 + * @return Long + */ + Long saveModule(ModuleBO moduleBO); + /** + * + * @Description:更新菜单信息 + * @return Integer + */ + Integer updateModule(ModuleBO moduleBO); + /** + * + * @Description:创建按钮信息 + * @return Long + */ + Long saveMenu(MenuBO moduleBO); + /** + * + * @Description:更新按钮信息 + * @return Integer + */ + Integer updateMenu(MenuBO moduleBO); +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/gataway/UserRoleRepository.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/gataway/UserRoleRepository.java new file mode 100644 index 0000000000000000000000000000000000000000..2bf784c96b6c0497a97efb1edb5eec28090ceefd --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/gataway/UserRoleRepository.java @@ -0,0 +1,77 @@ +package com.coderman.infosys.auth.domain.gataway; + +import java.util.List; +import com.coderman.infosys.auth.domain.bo.UserGroupBO; +import com.coderman.utils.commonbo.PageBO; +import com.coderman.infosys.auth.domain.bo.RoleBO; +import com.coderman.infosys.auth.domain.bo.RoleGroupBO; + + +/** + * @Description:用户和角色管理仓库接口 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:28 + * @version v1.0 + */ +public interface UserRoleRepository{ + /** + * + * @Description:保存用户组并尝试关联用户 + * @return Long + */ + Long saveUserGroup(UserGroupBO userGroupBO); + /** + * + * @Description:更新用户组 + * @return Integer + */ + Integer updateUserGroup(UserGroupBO userGroupBO); + /** + * + * @Description:保存角色组并尝试关联角色 + * @return Long + */ + Long saveRoleGroup(RoleGroupBO roleGroupBO); + /** + * + * @Description:更新角色组 + * @return Integer + */ + Integer updateRoleGroup(RoleGroupBO roleGroupBO); + /** + * + * @Description:保存角色 + * @return Long + */ + Long saveRole(RoleBO roleBO); + /** + * + * @Description:更新角色 + * @return Integer + */ + Integer updateRole(RoleBO roleBO); + /** + * + * @Description:分页获取角色 + * @return List + */ + List getPageList(PageBO pageBO); + /** + * + * @Description:根据code查询用户组详情 + * @return UserGroupBO + */ + UserGroupBO getByUserGroupCode(String userGroupCode); + /** + * + * @Description:根据code查询角色详情 + * @return RoleBO + */ + RoleBO getByRoleCode(String roleCode); + /** + * + * @Description:根据code查询角色组详情 + * @return RoleGroupBO + */ + RoleGroupBO getByRoleGroupCode(String roleGroupCode); +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/msgbody/UserStatusChangeMsgBody.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/msgbody/UserStatusChangeMsgBody.java new file mode 100644 index 0000000000000000000000000000000000000000..9c560e71be6379cea95fa006873b330ef349f292 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/msgbody/UserStatusChangeMsgBody.java @@ -0,0 +1,23 @@ +package com.coderman.infosys.auth.domain.msgbody; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:接收用户状态变更消息类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:28 + * @version v1.0 + */ +@Data +@ToString +public class UserStatusChangeMsgBody{ + + /** 用户ID **/ + private Long userId; + /** 状态类型 **/ + private Integer statusType; + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/acl/AreaServiceAdapter.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/acl/AreaServiceAdapter.java new file mode 100644 index 0000000000000000000000000000000000000000..dedb22816bc2d66e1e94829e1ac4cf68eb610ca2 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/acl/AreaServiceAdapter.java @@ -0,0 +1,27 @@ +package com.coderman.infosys.auth.infrast.acl; + +import java.util.List; +import com.coderman.infosys.auth.infrast.acl.res.dto.CityResponseDTO; +import com.coderman.infosys.auth.infrast.acl.res.dto.ProvinceResponseDTO; + + +/** + * @Description:省份城市查询服务适配器接口 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:28 + * @version v1.0 + */ +public interface AreaServiceAdapter{ + /** + * + * @Description:查询所有的省份 + * @return List + */ + List queryAllProvince(); + /** + * + * @Description:查询省份下所有城市 + * @return List + */ + List queryCityByProvinceid(Long provinceId); +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/acl/DepartmentServiceAdapter.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/acl/DepartmentServiceAdapter.java new file mode 100644 index 0000000000000000000000000000000000000000..572e180b348d2e03c8b2b1b3da54e22521d427c2 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/acl/DepartmentServiceAdapter.java @@ -0,0 +1,27 @@ +package com.coderman.infosys.auth.infrast.acl; + +import java.util.List; +import com.coderman.infosys.auth.infrast.acl.req.dto.DepartmentQueryDTO; +import com.coderman.infosys.auth.infrast.acl.res.dto.DepartmentResponseDTO; + + +/** + * @Description:部门查询服务适配器接口 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:28 + * @version v1.0 + */ +public interface DepartmentServiceAdapter{ + /** + * + * @Description:查询所有有效的部门 + * @return List + */ + List queryAllDepartment(DepartmentQueryDTO queryDto); + /** + * + * @Description:查询子部门 + * @return List + */ + List queryDepartmentsList(Long pId); +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/acl/impl/AreaServiceAdapterImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/acl/impl/AreaServiceAdapterImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..fc903e2cc6363c92450527de81a2f8ef1b9b1436 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/acl/impl/AreaServiceAdapterImpl.java @@ -0,0 +1,39 @@ +package com.coderman.infosys.auth.infrast.acl.impl; + +import java.util.List; +import com.coderman.infosys.auth.infrast.acl.res.dto.CityResponseDTO; +import com.coderman.infosys.auth.infrast.acl.AreaServiceAdapter; +import com.coderman.infosys.auth.infrast.acl.res.dto.ProvinceResponseDTO; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; + + +/** + * @Description:接口实现类 + * @Author： + * @CreateTime：2021-11-07 08:18:28 + * @version v1.0 + */ +@Service +public class AreaServiceAdapterImpl implements AreaServiceAdapter{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + + @Override + public List queryAllProvince(){ + + return null; + } + + @Override + public List queryCityByProvinceid(Long provinceId){ + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/acl/impl/DepartmentServiceAdapterImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/acl/impl/DepartmentServiceAdapterImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..839a585866e864e19c51c499a46783a4305b44c4 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/acl/impl/DepartmentServiceAdapterImpl.java @@ -0,0 +1,39 @@ +package com.coderman.infosys.auth.infrast.acl.impl; + +import java.util.List; +import com.coderman.infosys.auth.infrast.acl.req.dto.DepartmentQueryDTO; +import com.coderman.infosys.auth.infrast.acl.DepartmentServiceAdapter; +import com.coderman.infosys.auth.infrast.acl.res.dto.DepartmentResponseDTO; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; + + +/** + * @Description:接口实现类 + * @Author： + * @CreateTime：2021-11-07 08:18:28 + * @version v1.0 + */ +@Service +public class DepartmentServiceAdapterImpl implements DepartmentServiceAdapter{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + + @Override + public List queryAllDepartment(DepartmentQueryDTO queryDto){ + + return null; + } + + @Override + public List queryDepartmentsList(Long pId){ + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/acl/req/dto/DepartmentQueryDTO.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/acl/req/dto/DepartmentQueryDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..daaca7832a8b1ccb6157882c66392e2ca3499ca7 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/acl/req/dto/DepartmentQueryDTO.java @@ -0,0 +1,19 @@ +package com.coderman.infosys.auth.infrast.acl.req.dto; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:28 + * @version v1.0 + */ +@Data +@ToString +public class DepartmentQueryDTO { + + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/acl/res/dto/CityResponseDTO.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/acl/res/dto/CityResponseDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..d6dea7b346a9270aa07933a15277bf3b7d453dc2 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/acl/res/dto/CityResponseDTO.java @@ -0,0 +1,19 @@ +package com.coderman.infosys.auth.infrast.acl.res.dto; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:28 + * @version v1.0 + */ +@Data +@ToString +public class CityResponseDTO { + + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/acl/res/dto/DepartmentResponseDTO.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/acl/res/dto/DepartmentResponseDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..f69b545beb769fec74bee1d950b10319d870f81d --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/acl/res/dto/DepartmentResponseDTO.java @@ -0,0 +1,19 @@ +package com.coderman.infosys.auth.infrast.acl.res.dto; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:28 + * @version v1.0 + */ +@Data +@ToString +public class DepartmentResponseDTO { + + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/acl/res/dto/ProvinceResponseDTO.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/acl/res/dto/ProvinceResponseDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..f06811ba46cf19fb7a9eb6a609dc5e87fa335c24 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/acl/res/dto/ProvinceResponseDTO.java @@ -0,0 +1,19 @@ +package com.coderman.infosys.auth.infrast.acl.res.dto; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:28 + * @version v1.0 + */ +@Data +@ToString +public class ProvinceResponseDTO { + + + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/AuthorityConvert.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/AuthorityConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..36a59e8bc00649c13359834303034f103d5f97f0 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/AuthorityConvert.java @@ -0,0 +1,46 @@ +package com.coderman.infosys.auth.infrast.dataconvert; + +import com.coderman.infosys.auth.domain.bo.AuthorityBO; +import java.util.List; +import com.coderman.infosys.auth.infrast.dao.dataobject.AuthorityDO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:权限接口 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Mapper +public interface AuthorityConvert{ + AuthorityConvert INSTANCE = Mappers.getMapper(AuthorityConvert.class); + + /** + * + * @Description: + * @return AuthorityBO + */ + AuthorityBO do2bo(AuthorityDO authorityDO); + /** + * + * @Description: + * @return List + */ + List doList2boList(List authorityDOList); + /** + * + * @Description: + * @return AuthorityDO + */ + AuthorityDO bo2do(AuthorityBO authorityBO); + /** + * + * @Description: + * @return List + */ + List boList2doList(List authorityBOList); +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/DataAuthorityConvert.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/DataAuthorityConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..2bf6e7608c5bdf2593896b439a657b5cf8c3c427 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/DataAuthorityConvert.java @@ -0,0 +1,48 @@ +package com.coderman.infosys.auth.infrast.dataconvert; + +import com.coderman.infosys.auth.domain.bo.AuthorityBO; +import java.util.List; +import com.coderman.infosys.auth.infrast.dao.dataobject.DataAuthorityDO; +import com.coderman.infosys.auth.infrast.dao.dataobject.AuthorityDO; +import com.coderman.infosys.auth.domain.bo.DataAuthorityBO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:数据字段权限接口 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Mapper +public interface DataAuthorityConvert{ + DataAuthorityConvert INSTANCE = Mappers.getMapper(DataAuthorityConvert.class); + + /** + * + * @Description: + * @return DataAuthorityBO + */ + DataAuthorityBO do2bo(DataAuthorityDO dataAuthorityDO); + /** + * + * @Description: + * @return List + */ + List doList2boList(List dataAuthorityDOList); + /** + * + * @Description: + * @return DataAuthorityDO + */ + DataAuthorityDO bo2do(DataAuthorityBO dataAuthorityBO); + /** + * + * @Description: + * @return List + */ + List boList2doList(List dataAuthorityBOList); +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/DataColumnConvert.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/DataColumnConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..98ba351f120852a53ef1da5bcc65f6ad09bbc18a --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/DataColumnConvert.java @@ -0,0 +1,46 @@ +package com.coderman.infosys.auth.infrast.dataconvert; + +import com.coderman.infosys.auth.infrast.dao.dataobject.DataColumnConfigDO; +import java.util.List; +import com.coderman.infosys.auth.domain.bo.DataColumnBO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:数据字段实体接口 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Mapper +public interface DataColumnConvert{ + DataColumnConvert INSTANCE = Mappers.getMapper(DataColumnConvert.class); + + /** + * + * @Description: + * @return DataColumnBO + */ + DataColumnBO do2bo(DataColumnConfigDO dataColumnConfigDO); + /** + * + * @Description: + * @return List + */ + List doList2boList(List dataColumnConfigDOList); + /** + * + * @Description: + * @return DataColumnConfigDO + */ + DataColumnConfigDO bo2do(DataColumnBO dataColumnBO); + /** + * + * @Description: + * @return List + */ + List boList2doList(List dataColumnBOList); +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/MenuConvert.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/MenuConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..e555558072a5719368e756f6e5a04da72a6d9871 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/MenuConvert.java @@ -0,0 +1,46 @@ +package com.coderman.infosys.auth.infrast.dataconvert; + +import com.coderman.infosys.auth.domain.bo.MenuBO; +import java.util.List; +import com.coderman.infosys.auth.infrast.dao.dataobject.MenuDO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:按钮管理接口 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Mapper +public interface MenuConvert{ + MenuConvert INSTANCE = Mappers.getMapper(MenuConvert.class); + + /** + * + * @Description: + * @return MenuBO + */ + MenuBO do2bo(MenuDO menuDO); + /** + * + * @Description: + * @return List + */ + List doList2boList(List menuDOList); + /** + * + * @Description: + * @return MenuDO + */ + MenuDO bo2do(MenuBO menuBO); + /** + * + * @Description: + * @return List + */ + List boList2doList(List menuBOList); +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/ModuleConvert.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/ModuleConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..48dd853cb33b3318ddd92ca13db93d334887b4d1 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/ModuleConvert.java @@ -0,0 +1,46 @@ +package com.coderman.infosys.auth.infrast.dataconvert; + +import com.coderman.infosys.auth.infrast.dao.dataobject.ModuleDO; +import java.util.List; +import com.coderman.infosys.auth.domain.bo.ModuleBO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:菜单/模块管理接口 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Mapper +public interface ModuleConvert{ + ModuleConvert INSTANCE = Mappers.getMapper(ModuleConvert.class); + + /** + * + * @Description: + * @return ModuleBO + */ + ModuleBO do2bo(ModuleDO moduleDO); + /** + * + * @Description: + * @return List + */ + List doList2boList(List moduleDOList); + /** + * + * @Description: + * @return ModuleDO + */ + ModuleDO bo2do(ModuleBO moduleBO); + /** + * + * @Description: + * @return List + */ + List boList2doList(List moduleBOList); +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/RoleConvert.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/RoleConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..71047a38c640152992182a5d8b3005ae38d41d3f --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/RoleConvert.java @@ -0,0 +1,46 @@ +package com.coderman.infosys.auth.infrast.dataconvert; + +import java.util.List; +import com.coderman.infosys.auth.domain.bo.RoleBO; +import com.coderman.infosys.auth.infrast.dao.dataobject.RoleDO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:角色接口 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Mapper +public interface RoleConvert{ + RoleConvert INSTANCE = Mappers.getMapper(RoleConvert.class); + + /** + * + * @Description: + * @return RoleBO + */ + RoleBO do2bo(RoleDO roleDO); + /** + * + * @Description: + * @return List + */ + List doList2boList(List roleDOList); + /** + * + * @Description: + * @return RoleDO + */ + RoleDO bo2do(RoleBO roleBO); + /** + * + * @Description: + * @return List + */ + List boList2doList(List roleBOList); +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/RoleGroupConvert.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/RoleGroupConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..361f13473c071424ace50914e632fbdc9451687e --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/RoleGroupConvert.java @@ -0,0 +1,46 @@ +package com.coderman.infosys.auth.infrast.dataconvert; + +import java.util.List; +import com.coderman.infosys.auth.domain.bo.RoleGroupBO; +import com.coderman.infosys.auth.infrast.dao.dataobject.RoleGroupDO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:角色组接口 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Mapper +public interface RoleGroupConvert{ + RoleGroupConvert INSTANCE = Mappers.getMapper(RoleGroupConvert.class); + + /** + * + * @Description: + * @return RoleGroupBO + */ + RoleGroupBO do2bo(RoleGroupDO roleGroupDO); + /** + * + * @Description: + * @return List + */ + List doList2boList(List roleGroupDOList); + /** + * + * @Description: + * @return RoleGroupDO + */ + RoleGroupDO bo2do(RoleGroupBO roleGroupBO); + /** + * + * @Description: + * @return List + */ + List boList2doList(List roleGroupBOList); +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/SystemAuthorityConvert.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/SystemAuthorityConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..8bd6607f8ad9e4edf693e35b50db9d3f6c36a322 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/SystemAuthorityConvert.java @@ -0,0 +1,48 @@ +package com.coderman.infosys.auth.infrast.dataconvert; + +import com.coderman.infosys.auth.domain.bo.SystemAuthorityBO; +import com.coderman.infosys.auth.domain.bo.AuthorityBO; +import java.util.List; +import com.coderman.infosys.auth.infrast.dao.dataobject.AuthorityDO; +import com.coderman.infosys.auth.infrast.dao.dataobject.SystemAuthorityDO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:系统菜单权限接口 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Mapper +public interface SystemAuthorityConvert{ + SystemAuthorityConvert INSTANCE = Mappers.getMapper(SystemAuthorityConvert.class); + + /** + * + * @Description: + * @return SystemAuthorityBO + */ + SystemAuthorityBO do2bo(SystemAuthorityDO systemAuthorityDO); + /** + * + * @Description: + * @return List + */ + List doList2boList(List systemAuthorityDOList); + /** + * + * @Description: + * @return SystemAuthorityDO + */ + SystemAuthorityDO bo2do(SystemAuthorityBO systemAuthorityBO); + /** + * + * @Description: + * @return List + */ + List boList2doList(List systemAuthorityBOList); +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/SystemConvert.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/SystemConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..10f6c1c0a726c5fef839ce05649741dd3b8d3f67 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/SystemConvert.java @@ -0,0 +1,46 @@ +package com.coderman.infosys.auth.infrast.dataconvert; + +import java.util.List; +import com.coderman.infosys.auth.domain.bo.SystemBO; +import com.coderman.infosys.auth.infrast.dao.dataobject.SystemDO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:系统管理接口 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Mapper +public interface SystemConvert{ + SystemConvert INSTANCE = Mappers.getMapper(SystemConvert.class); + + /** + * + * @Description: + * @return SystemBO + */ + SystemBO do2bo(SystemDO systemDO); + /** + * + * @Description: + * @return List + */ + List doList2boList(List systemDOList); + /** + * + * @Description: + * @return SystemDO + */ + SystemDO bo2do(SystemBO systemBO); + /** + * + * @Description: + * @return List + */ + List boList2doList(List systemBOList); +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/UserGroupConvert.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/UserGroupConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..99757d7feba9cfb695b20e0c9db45680743d1f7e --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/UserGroupConvert.java @@ -0,0 +1,46 @@ +package com.coderman.infosys.auth.infrast.dataconvert; + +import java.util.List; +import com.coderman.infosys.auth.domain.bo.UserGroupBO; +import com.coderman.infosys.auth.infrast.dao.dataobject.UserGroupDO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:用户组接口 +* @Author: +* @CreateTime:2021-11-07 08:18:28 +* @version v1.0 +*/ +@Mapper +public interface UserGroupConvert{ + UserGroupConvert INSTANCE = Mappers.getMapper(UserGroupConvert.class); + + /** + * + * @Description: + * @return UserGroupBO + */ + UserGroupBO do2bo(UserGroupDO userGroupDO); + /** + * + * @Description: + * @return List + */ + List doList2boList(List userGroupDOList); + /** + * + * @Description: + * @return UserGroupDO + */ + UserGroupDO bo2do(UserGroupBO userGroupBO); + /** + * + * @Description: + * @return List + */ + List boList2doList(List userGroupBOList); +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/gatawayimpl/DataColumnGataWayImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/gatawayimpl/DataColumnGataWayImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..550c0fb87cdf6ea1e25a51c707cf04b43c0ae94c --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/gatawayimpl/DataColumnGataWayImpl.java @@ -0,0 +1,63 @@ +package com.coderman.infosys.auth.infrast.gatawayimpl; + +import java.util.List; +import com.coderman.utils.commonbo.PageBO; +import com.coderman.infosys.auth.domain.gataway.DataColumnGataWay; +import com.coderman.infosys.auth.domain.bo.DataColumnBO; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; + + +/** + * @Description:接口实现类 + * @Author： + * @CreateTime：2021-11-07 08:18:28 + * @version v1.0 + */ +@Service +public class DataColumnGataWayImpl implements DataColumnGataWay{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + + @Override + public Long saveDataColumn(DataColumnBO dataColumnBO){ + + return null; + } + + @Override + public Boolean saveBatchDataColumn(List list){ + + return null; + } + + @Override + public Long updateDataColumn(DataColumnBO dataColumnBO){ + + return null; + } + + @Override + public DataColumnBO getById(Long id){ + + return null; + } + + @Override + public List getByDBCode(String busDataBase){ + + return null; + } + + @Override + public List getPageList(PageBO pageBO){ + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/gatawayimpl/SystemModuleQueryGataWayImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/gatawayimpl/SystemModuleQueryGataWayImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..867b71a24de2a9ff15f925c70c7eab6df1bfafcc --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/gatawayimpl/SystemModuleQueryGataWayImpl.java @@ -0,0 +1,113 @@ +package com.coderman.infosys.auth.infrast.gatawayimpl; + +import java.util.List; +import com.coderman.infosys.auth.domain.bo.MenuBO; +import com.coderman.utils.commonbo.PageBO; +import com.coderman.infosys.auth.domain.bo.SystemBO; +import com.coderman.infosys.auth.domain.bo.ModuleBO; +import com.coderman.infosys.auth.domain.gataway.SystemModuleQueryGataWay; +import com.coderman.infosys.auth.infrast.dao.dataobject.ModuleDO; +import com.coderman.infosys.auth.infrast.dao.mapper.ModuleMapper; +import com.coderman.infosys.auth.infrast.dao.dataobject.MenuDO; +import com.coderman.infosys.auth.infrast.dataconvert.ModuleConvert; +import com.coderman.infosys.auth.infrast.dataconvert.MenuConvert; +import com.coderman.infosys.auth.infrast.dataconvert.SystemConvert; +import com.coderman.infosys.auth.infrast.dao.mapper.SystemMapper; +import com.coderman.infosys.auth.infrast.dao.dataobject.SystemDO; +import com.coderman.infosys.auth.infrast.dao.mapper.MenuMapper; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; + + +/** + * @Description:接口实现类 + * @Author： + * @CreateTime：2021-11-07 08:18:28 + * @version v1.0 + */ +@Service +public class SystemModuleQueryGataWayImpl implements SystemModuleQueryGataWay{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + @Autowired + private SystemMapper systemMapper; + + @Autowired + private ModuleMapper moduleMapper; + + @Autowired + private MenuMapper menuMapper; + + + @Override + public List querySystemPage(PageBO pageBO){ + List systemDOList = systemMapper.getPageList(pageBO); + List systemBOList = SystemConvert.INSTANCE.doList2boList(systemDOList); + + return systemBOList; + } + + @Override + public List queryModulePage(){ + + return null; + } + + @Override + public SystemBO queryBySystemCode(String systemCode){ + List systemDOList = systemMapper.queryBySystemCode(systemCode); + SystemBO systemBO = SystemConvert.INSTANCE.do2bo(null); + + return systemBO; + } + + @Override + public List queryByCondition(String search){ + List systemDOList = systemMapper.queryByCondition(); + List systemBOList = SystemConvert.INSTANCE.doList2boList(systemDOList); + + return systemBOList; + } + + @Override + public List queryWithAll(String search){ + + return null; + } + + @Override + public SystemBO getSystemByCode(String systemCode){ + + return null; + } + + @Override + public ModuleBO getModuleByCode(String moduleCode){ + List moduleDOList = moduleMapper.getByName(null); + ModuleBO moduleBO = ModuleConvert.INSTANCE.do2bo(null); + List menuDOList = menuMapper.getListByModuleCode(null); + List menuBOList = MenuConvert.INSTANCE.doList2boList(menuDOList); + + return moduleBO; + } + + @Override + public MenuBO getMenu(String menuCode){ + + return null; + } + + @Override + public List getSystemByName(String systemName){ + List systemDOList = systemMapper.getByName(systemName); + List systemBOList = SystemConvert.INSTANCE.doList2boList(systemDOList); + + return systemBOList; + } + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/mq/consumer/DepartmentMqConsumer.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/mq/consumer/DepartmentMqConsumer.java new file mode 100644 index 0000000000000000000000000000000000000000..62db3953c77207db7e9951df051319778f67ff69 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/mq/consumer/DepartmentMqConsumer.java @@ -0,0 +1,25 @@ +package com.coderman.infosys.auth.infrast.mq.consumer; + + +import org.springframework.stereotype.Service; + + /** + * @Description:DepartmentMqConsumer类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:28 + * @version v1.0 + */ +@Service +public class DepartmentMqConsumer{ + + + /** + * + * @Description:监听组织状态变 + * @return void + */ + public void consumeDepartmentStatusChange(String mqBody){ + + } + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/mq/consumer/UserMqConsumer.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/mq/consumer/UserMqConsumer.java new file mode 100644 index 0000000000000000000000000000000000000000..7a95e38322a4d45fd5d41437c87d138786e152b3 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/mq/consumer/UserMqConsumer.java @@ -0,0 +1,25 @@ +package com.coderman.infosys.auth.infrast.mq.consumer; + + +import org.springframework.stereotype.Service; + + /** + * @Description:UserMqConsumer类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:28 + * @version v1.0 + */ +@Service +public class UserMqConsumer{ + + + /** + * + * @Description:监听用户状态变 + * @return void + */ + public void consumeUserStatusChange(String mqBody){ + + } + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/mq/handler/UserMqHandler.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/mq/handler/UserMqHandler.java new file mode 100644 index 0000000000000000000000000000000000000000..118b8fd0763b6f35104c102a03e1a21d6958f442 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/mq/handler/UserMqHandler.java @@ -0,0 +1,25 @@ +package com.coderman.infosys.auth.infrast.mq.handler; + + +import org.springframework.stereotype.Service; + + /** + * @Description:UserMqHandler类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:28 + * @version v1.0 + */ +@Service +public class UserMqHandler{ + + + /** + * + * @Description:处理用户状态变更的权限信 + * @return void + */ + public void handleUserStatusChange(String mqBody){ + + } + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/mq/producer/AuthorityMqProducer.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/mq/producer/AuthorityMqProducer.java new file mode 100644 index 0000000000000000000000000000000000000000..c20976edfa59c5caaf546c4ea32b0141f9be768e --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/mq/producer/AuthorityMqProducer.java @@ -0,0 +1,33 @@ +package com.coderman.infosys.auth.infrast.mq.producer; + + +import org.springframework.stereotype.Service; + + /** + * @Description:AuthorityMqProducer类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:28 + * @version v1.0 + */ +@Service +public class AuthorityMqProducer{ + + + /** + * + * @Description:权限创 + * @return void + */ + public void authorityCreate(String authCode){ + + } + /** + * + * @Description:权限更 + * @return void + */ + public void authorityUpdate(String authCode){ + + } + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/mq/producer/SystemMqProducer.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/mq/producer/SystemMqProducer.java new file mode 100644 index 0000000000000000000000000000000000000000..d352a89a319b5fbf91c71497348f9f8f666162ea --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/mq/producer/SystemMqProducer.java @@ -0,0 +1,26 @@ +package com.coderman.infosys.auth.infrast.mq.producer; + +import com.coderman.infosys.auth.domain.event.MenuChangeEvent; + +import org.springframework.stereotype.Service; + + /** + * @Description:SystemMqProducer类 + * @Author:shenshuai + * @CreateTime:2021-11-07 08:18:28 + * @version v1.0 + */ +@Service +public class SystemMqProducer{ + + + /** + * + * @Description:事务提交后权限变更监 + * @return void + */ + public void systemChange(MenuChangeEvent event){ + + } + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/repositoryimpl/AuthorityRepositoryImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/repositoryimpl/AuthorityRepositoryImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..8557cdc7389fe889f2d4610dfb8bbcef7efaa4e2 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/repositoryimpl/AuthorityRepositoryImpl.java @@ -0,0 +1,56 @@ +package com.coderman.infosys.auth.infrast.repositoryimpl; + +import com.coderman.infosys.auth.domain.bo.AuthorityBO; +import com.coderman.infosys.auth.domain.bo.AuthorityUpdateRequestBO; +import com.coderman.infosys.auth.domain.gataway.AuthorityRepository; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; + + +/** + * @Description:接口实现类 + * @Author： + * @CreateTime：2021-11-07 08:18:28 + * @version v1.0 + */ +@Service +public class AuthorityRepositoryImpl implements AuthorityRepository{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + + @Override + public Boolean buildAuthority(AuthorityBO authorityBO){ + + return null; + } + + @Override + public Boolean updateAuthority(AuthorityUpdateRequestBO authorityUpdateRequestBO){ + + return null; + } + + @Override + public Boolean disableAuthority(String authorityCode){ + + return null; + } + + @Override + public AuthorityBO getByCode(String authorityCode){ + + return null; + } + + @Override + public AuthorityBO getByRoleCode(String roleCode){ + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/repositoryimpl/SystemModuleRepositoryImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/repositoryimpl/SystemModuleRepositoryImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..c9c407cc9a7f7ca7b10eb47640579680a22266a8 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/repositoryimpl/SystemModuleRepositoryImpl.java @@ -0,0 +1,98 @@ +package com.coderman.infosys.auth.infrast.repositoryimpl; + +import com.coderman.infosys.auth.domain.bo.MenuBO; +import com.coderman.infosys.auth.domain.gataway.SystemModuleRepository; +import com.coderman.infosys.auth.domain.bo.SystemBO; +import com.coderman.infosys.auth.domain.bo.ModuleBO; +import com.coderman.infosys.auth.infrast.dao.dataobject.ModuleDO; +import com.coderman.infosys.auth.infrast.dao.mapper.ModuleMapper; +import com.coderman.infosys.auth.infrast.dao.dataobject.MenuDO; +import com.coderman.infosys.auth.infrast.dataconvert.ModuleConvert; +import com.coderman.infosys.auth.infrast.dataconvert.MenuConvert; +import com.coderman.infosys.auth.infrast.mq.producer.SystemMqProducer; +import com.coderman.infosys.auth.infrast.dataconvert.SystemConvert; +import com.coderman.infosys.auth.infrast.dao.mapper.SystemMapper; +import com.coderman.infosys.auth.infrast.dao.dataobject.SystemDO; +import com.coderman.infosys.auth.infrast.dao.mapper.MenuMapper; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; + + +/** + * @Description:接口实现类 + * @Author： + * @CreateTime：2021-11-07 08:18:28 + * @version v1.0 + */ +@Service +public class SystemModuleRepositoryImpl implements SystemModuleRepository{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + @Autowired + private SystemMapper systemMapper; + + @Autowired + private SystemMqProducer systemMqProducer; + + @Autowired + private ModuleMapper moduleMapper; + + @Autowired + private MenuMapper menuMapper; + + + @Override + public Long saveSystem(SystemBO systemBO){ + SystemDO systemDO = SystemConvert.INSTANCE.bo2do(systemBO); + long longVar = systemMapper.insert(systemDO); + systemMqProducer.systemChange(null); + + return null; + } + + @Override + public Integer updateSystem(SystemBO systemBO){ + SystemDO systemDO = SystemConvert.INSTANCE.bo2do(systemBO); + int intVar = systemMapper.updateSystem(); + + return null; + } + + @Override + public Long saveModule(ModuleBO moduleBO){ + ModuleDO moduleDO = ModuleConvert.INSTANCE.bo2do(moduleBO); + long longVar = moduleMapper.insert(moduleDO); + + return null; + } + + @Override + public Integer updateModule(ModuleBO moduleBO){ + ModuleDO moduleDO = ModuleConvert.INSTANCE.bo2do(moduleBO); + int intVar = moduleMapper.update(moduleDO); + + return null; + } + + @Override + public Long saveMenu(MenuBO moduleBO){ + MenuDO menuDO = MenuConvert.INSTANCE.bo2do(moduleBO); + long longVar = menuMapper.insert(menuDO); + + return null; + } + + @Override + public Integer updateMenu(MenuBO moduleBO){ + MenuDO menuDO = MenuConvert.INSTANCE.bo2do(moduleBO); + int intVar = menuMapper.update(menuDO); + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/repositoryimpl/UserRoleRepositoryImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/repositoryimpl/UserRoleRepositoryImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..184beddda6eb9ebd4c05368bcc7ce619ae41d99b --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/repositoryimpl/UserRoleRepositoryImpl.java @@ -0,0 +1,89 @@ +package com.coderman.infosys.auth.infrast.repositoryimpl; + +import java.util.List; +import com.coderman.infosys.auth.domain.bo.UserGroupBO; +import com.coderman.utils.commonbo.PageBO; +import com.coderman.infosys.auth.domain.gataway.UserRoleRepository; +import com.coderman.infosys.auth.domain.bo.RoleBO; +import com.coderman.infosys.auth.domain.bo.RoleGroupBO; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; + + +/** + * @Description:接口实现类 + * @Author： + * @CreateTime：2021-11-07 08:18:28 + * @version v1.0 + */ +@Service +public class UserRoleRepositoryImpl implements UserRoleRepository{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + + @Override + public Long saveUserGroup(UserGroupBO userGroupBO){ + + return null; + } + + @Override + public Integer updateUserGroup(UserGroupBO userGroupBO){ + + return null; + } + + @Override + public Long saveRoleGroup(RoleGroupBO roleGroupBO){ + + return null; + } + + @Override + public Integer updateRoleGroup(RoleGroupBO roleGroupBO){ + + return null; + } + + @Override + public Long saveRole(RoleBO roleBO){ + + return null; + } + + @Override + public Integer updateRole(RoleBO roleBO){ + + return null; + } + + @Override + public List getPageList(PageBO pageBO){ + + return null; + } + + @Override + public UserGroupBO getByUserGroupCode(String userGroupCode){ + + return null; + } + + @Override + public RoleBO getByRoleCode(String roleCode){ + + return null; + } + + @Override + public RoleGroupBO getByRoleGroupCode(String roleGroupCode){ + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/utils/SpringApplicationContext.java b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/utils/SpringApplicationContext.java similarity index 93% rename from codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/utils/SpringApplicationContext.java rename to codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/utils/SpringApplicationContext.java index 185335fd584e8f5f70c6b9a4d3c971fc8d60816e..e25418a7467d95c4381890295d4139c3b914d044 100644 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/utils/SpringApplicationContext.java +++ b/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/utils/SpringApplicationContext.java @@ -1,4 +1,4 @@ -package com.lightsnail.schoolmanager.core.utils; +package com.coderman.infosys.auth.core.utils; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/facade.impl/ClassFacadeImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/facade.impl/ClassFacadeImpl.java deleted file mode 100644 index d69896dc0179fbd884498e3a983ead3190782eeb..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/facade.impl/ClassFacadeImpl.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.lightsnail.schoolmanager.core.facade.impl; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.apache.dubbo.config.annotation.Service; - -import com.coderman.utils.response.ResultDataDto; -import com.coderman.utils.response.ResultDto; - -import com.lightsnail.schoolmanager.api.facade.ClassFacade; -import com.lightsnail.schoolmanager.api.dto.ClassDTO; - -import java.util.List; - -/** - * @Description:Facade接口实现类 - * @Author：fanchunshuai - * @CreateTime：2021-06-25 16:19:52 - * @version v1.0 - */ -@Service -public class ClassFacadeImpl implements ClassFacade{ - - private Logger logger = LoggerFactory.getLogger(this.getClass()); - - - @Override - public ResultDto save(ClassDTO dto) { - ResultDto resultDto = new ResultDto(); - //todo impl code - return resultDto; - } - - @Override - public ResultDto delete(Long id) { - ResultDto resultDto = new ResultDto(); - logger.info("classService.delete,id="+id); - //todo impl code - return resultDto; - } - - @Override - public ResultDataDto getById(Long id) { - ResultDataDto resultDataDto = new ResultDataDto(); - logger.info("classService.getById,id="+id); - //todo impl code - return resultDataDto; - } - - @Override - public ResultDataDto> getAll() { - ResultDataDto> resultDataDto = new ResultDataDto>(); - //todo impl code - return resultDataDto; - } - - @Override - public ResultDto update(ClassDTO dto) { - ResultDto resultDto = new ResultDto(); - //todo impl code - return resultDto; - } - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/facade.impl/ClassTeacherFacadeImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/facade.impl/ClassTeacherFacadeImpl.java deleted file mode 100644 index 2eba9539864b56da6b7742697291cb41ab339e60..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/facade.impl/ClassTeacherFacadeImpl.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.lightsnail.schoolmanager.core.facade.impl; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.apache.dubbo.config.annotation.Service; - -import com.coderman.utils.response.ResultDataDto; -import com.coderman.utils.response.ResultDto; - -import com.lightsnail.schoolmanager.api.facade.ClassTeacherFacade; -import com.lightsnail.schoolmanager.api.dto.ClassTeacherDTO; - -import java.util.List; - -/** - * @Description:Facade接口实现类 - * @Author：fanchunshuai - * @CreateTime：2021-06-25 16:19:51 - * @version v1.0 - */ -@Service -public class ClassTeacherFacadeImpl implements ClassTeacherFacade{ - - private Logger logger = LoggerFactory.getLogger(this.getClass()); - - - @Override - public ResultDto save(ClassTeacherDTO dto) { - ResultDto resultDto = new ResultDto(); - //todo impl code - return resultDto; - } - - @Override - public ResultDto delete(Long id) { - ResultDto resultDto = new ResultDto(); - logger.info("classTeacherService.delete,id="+id); - //todo impl code - return resultDto; - } - - @Override - public ResultDataDto getById(Long id) { - ResultDataDto resultDataDto = new ResultDataDto(); - logger.info("classTeacherService.getById,id="+id); - //todo impl code - return resultDataDto; - } - - @Override - public ResultDataDto> getAll() { - ResultDataDto> resultDataDto = new ResultDataDto>(); - //todo impl code - return resultDataDto; - } - - @Override - public ResultDto update(ClassTeacherDTO dto) { - ResultDto resultDto = new ResultDto(); - //todo impl code - return resultDto; - } - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/facade.impl/StudentFacadeImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/facade.impl/StudentFacadeImpl.java deleted file mode 100644 index 3fe0ce8bdfe403df6393d5285672c8bf4fd3d0fe..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/facade.impl/StudentFacadeImpl.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.lightsnail.schoolmanager.core.facade.impl; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.apache.dubbo.config.annotation.Service; - -import com.coderman.utils.response.ResultDataDto; -import com.coderman.utils.response.ResultDto; - -import com.lightsnail.schoolmanager.api.facade.StudentFacade; -import com.lightsnail.schoolmanager.api.dto.StudentDTO; - -import java.util.List; - -/** - * @Description:Facade接口实现类 - * @Author：fanchunshuai - * @CreateTime：2021-06-25 16:19:51 - * @version v1.0 - */ -@Service -public class StudentFacadeImpl implements StudentFacade{ - - private Logger logger = LoggerFactory.getLogger(this.getClass()); - - - @Override - public ResultDto save(StudentDTO dto) { - ResultDto resultDto = new ResultDto(); - //todo impl code - return resultDto; - } - - @Override - public ResultDto delete(Long id) { - ResultDto resultDto = new ResultDto(); - logger.info("studentService.delete,id="+id); - //todo impl code - return resultDto; - } - - @Override - public ResultDataDto getById(Long id) { - ResultDataDto resultDataDto = new ResultDataDto(); - logger.info("studentService.getById,id="+id); - //todo impl code - return resultDataDto; - } - - @Override - public ResultDataDto> getAll() { - ResultDataDto> resultDataDto = new ResultDataDto>(); - //todo impl code - return resultDataDto; - } - - @Override - public ResultDto update(StudentDTO dto) { - ResultDto resultDto = new ResultDto(); - //todo impl code - return resultDto; - } - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/facade.impl/TeacherFacadeImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/facade.impl/TeacherFacadeImpl.java deleted file mode 100644 index 54861d4be931bf390c645426f62ccae7eb17a007..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/facade.impl/TeacherFacadeImpl.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.lightsnail.schoolmanager.core.facade.impl; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.apache.dubbo.config.annotation.Service; - -import com.coderman.utils.response.ResultDataDto; -import com.coderman.utils.response.ResultDto; - -import com.lightsnail.schoolmanager.api.facade.TeacherFacade; -import com.lightsnail.schoolmanager.api.dto.TeacherDTO; - -import java.util.List; - -/** - * @Description:Facade接口实现类 - * @Author：fanchunshuai - * @CreateTime：2021-06-25 16:19:51 - * @version v1.0 - */ -@Service -public class TeacherFacadeImpl implements TeacherFacade{ - - private Logger logger = LoggerFactory.getLogger(this.getClass()); - - - @Override - public ResultDto save(TeacherDTO dto) { - ResultDto resultDto = new ResultDto(); - //todo impl code - return resultDto; - } - - @Override - public ResultDto delete(Long id) { - ResultDto resultDto = new ResultDto(); - logger.info("teacherService.delete,id="+id); - //todo impl code - return resultDto; - } - - @Override - public ResultDataDto getById(Long id) { - ResultDataDto resultDataDto = new ResultDataDto(); - logger.info("teacherService.getById,id="+id); - //todo impl code - return resultDataDto; - } - - @Override - public ResultDataDto> getAll() { - ResultDataDto> resultDataDto = new ResultDataDto>(); - //todo impl code - return resultDataDto; - } - - @Override - public ResultDto update(TeacherDTO dto) { - ResultDto resultDto = new ResultDto(); - //todo impl code - return resultDto; - } - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/model.bo/ClassBO.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/model.bo/ClassBO.java deleted file mode 100644 index 0d83fde254d7332d0b7442a7db888b845dd5e4db..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/model.bo/ClassBO.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.lightsnail.schoolmanager.core.model.bo; - -import java.util.Date; -import java.math.BigDecimal; -import lombok.Data; -import lombok.ToString; - - /** - * @Description:BO类 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 16:19:52 - * @version v1.0 - */ -@Data -@ToString -public class ClassBO{ - - - /** **/ - private Long id; - - /** **/ - private String manager; - - /** **/ - private Integer studentCount; - - /** 年级 **/ - private Integer gradeNum; - - /** 班级 **/ - private Integer classNum; - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/model.bo/StudentBO.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/model.bo/StudentBO.java deleted file mode 100644 index ad3d3837a03987c95fcc037427040933b22dd442..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/model.bo/StudentBO.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.lightsnail.schoolmanager.core.model.bo; - -import java.util.Date; -import java.math.BigDecimal; -import lombok.Data; -import lombok.ToString; - - /** - * @Description:BO类 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 16:19:51 - * @version v1.0 - */ -@Data -@ToString -public class StudentBO{ - - - /** **/ - private Long id; - - /** **/ - private String studentName; - - /** **/ - private String studentCode; - - /** **/ - private String sex; - - /** **/ - private Integer age; - - /** 班级ID **/ - private Long classId; - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/service.impl/ClassServiceImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/service.impl/ClassServiceImpl.java deleted file mode 100644 index 0868d15cef5a11de94007dee8957aaf4874b5353..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/service.impl/ClassServiceImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.lightsnail.schoolmanager.core.service.impl; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import javax.annotation.Resource; - -import com.lightsnail.schoolmanager.common.mapper.ClassMapper; -import com.lightsnail.schoolmanager.core.service.ClassService; -import com.lightsnail.schoolmanager.core.model.bo.ClassBO; - -import java.util.List; - - -/** - * @Description:Service接口实现类 - * @Author：fanchunshuai - * @CreateTime：2021-06-25 16:19:51 - * @version v1.0 - */ -@Service -@Slf4j -public class ClassServiceImpl implements ClassService{ - - - @Resource - private ClassMapper classMapper; - - - @Override - public ClassBO save(ClassBO classBO) throws Exception{ - return classBO; - } - - @Override - public Boolean delete(Long id) { - return false; - } - - @Override - public ClassBO getById(Long id) throws Exception { - return null; - } - - @Override - public List getAll() throws Exception { - return null; - } - - @Override - public ClassBO update(ClassBO classBO) throws Exception { - return classBO; - } - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/service.impl/ClassTeacherServiceImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/service.impl/ClassTeacherServiceImpl.java deleted file mode 100644 index 15739f2d35930072b7708fa1c70b211832d02966..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/service.impl/ClassTeacherServiceImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.lightsnail.schoolmanager.core.service.impl; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import javax.annotation.Resource; - -import com.lightsnail.schoolmanager.common.mapper.ClassTeacherMapper; -import com.lightsnail.schoolmanager.core.service.ClassTeacherService; -import com.lightsnail.schoolmanager.core.model.bo.ClassTeacherBO; - -import java.util.List; - - -/** - * @Description:Service接口实现类 - * @Author：fanchunshuai - * @CreateTime：2021-06-25 16:19:51 - * @version v1.0 - */ -@Service -@Slf4j -public class ClassTeacherServiceImpl implements ClassTeacherService{ - - - @Resource - private ClassTeacherMapper classTeacherMapper; - - - @Override - public ClassTeacherBO save(ClassTeacherBO classTeacherBO) throws Exception{ - return classTeacherBO; - } - - @Override - public Boolean delete(Long id) { - return false; - } - - @Override - public ClassTeacherBO getById(Long id) throws Exception { - return null; - } - - @Override - public List getAll() throws Exception { - return null; - } - - @Override - public ClassTeacherBO update(ClassTeacherBO classTeacherBO) throws Exception { - return classTeacherBO; - } - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/service.impl/StudentServiceImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/service.impl/StudentServiceImpl.java deleted file mode 100644 index a91ad082549373f22853cd98498165d58786efbd..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/service.impl/StudentServiceImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.lightsnail.schoolmanager.core.service.impl; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import javax.annotation.Resource; - -import com.lightsnail.schoolmanager.common.mapper.StudentMapper; -import com.lightsnail.schoolmanager.core.service.StudentService; -import com.lightsnail.schoolmanager.core.model.bo.StudentBO; - -import java.util.List; - - -/** - * @Description:Service接口实现类 - * @Author：fanchunshuai - * @CreateTime：2021-06-25 16:19:51 - * @version v1.0 - */ -@Service -@Slf4j -public class StudentServiceImpl implements StudentService{ - - - @Resource - private StudentMapper studentMapper; - - - @Override - public StudentBO save(StudentBO studentBO) throws Exception{ - return studentBO; - } - - @Override - public Boolean delete(Long id) { - return false; - } - - @Override - public StudentBO getById(Long id) throws Exception { - return null; - } - - @Override - public List getAll() throws Exception { - return null; - } - - @Override - public StudentBO update(StudentBO studentBO) throws Exception { - return studentBO; - } - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/service.impl/TeacherServiceImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/service.impl/TeacherServiceImpl.java deleted file mode 100644 index 9fa48241d8fc5a9784b3f98be12fd9f282f1985d..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/service.impl/TeacherServiceImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.lightsnail.schoolmanager.core.service.impl; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import javax.annotation.Resource; - -import com.lightsnail.schoolmanager.common.mapper.TeacherMapper; -import com.lightsnail.schoolmanager.core.service.TeacherService; -import com.lightsnail.schoolmanager.core.model.bo.TeacherBO; - -import java.util.List; - - -/** - * @Description:Service接口实现类 - * @Author：fanchunshuai - * @CreateTime：2021-06-25 16:19:51 - * @version v1.0 - */ -@Service -@Slf4j -public class TeacherServiceImpl implements TeacherService{ - - - @Resource - private TeacherMapper teacherMapper; - - - @Override - public TeacherBO save(TeacherBO teacherBO) throws Exception{ - return teacherBO; - } - - @Override - public Boolean delete(Long id) { - return false; - } - - @Override - public TeacherBO getById(Long id) throws Exception { - return null; - } - - @Override - public List getAll() throws Exception { - return null; - } - - @Override - public TeacherBO update(TeacherBO teacherBO) throws Exception { - return teacherBO; - } - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/service/ClassService.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/service/ClassService.java deleted file mode 100644 index d60c3bf67d6b24d7067104ed03807f9c1e4707e7..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/service/ClassService.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.lightsnail.schoolmanager.core.service; - -import java.util.List; - -import com.lightsnail.schoolmanager.core.model.bo.ClassBO; - -/** - * @Description:Service接口 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 16:19:51 - * @version v1.0 - */ -public interface ClassService{ - - /** - * - * @Title: save - * @Description:新增 - * @author: - * @param @param dto - * @param @param userId - * @return ClassBO 返回类型 - * @throws - */ - public ClassBO save(ClassBO classBO) throws Exception; - - /** - * - * @Title: delete - * @Description: 通过id删除数据 - * @author: - * @param @param id - * @return ResultDto 返回类型 - * @throws - */ - public Boolean delete(Long id); - - /** - * - * @Title: getById - * @Description: 通过id查询 - * @author: - * @param @param id - * @return ClassBO - * @throws - */ - public ClassBO getById(Long id) throws Exception; - - /** - * - * @Title: getAll - * @Description:查询所有数据 - * @author: - * @return List - * @throws - */ - public List getAll() throws Exception; - - /** - * - * @Title: update - * @Description:修改 - * @author: - * @param @param classBO - * @return ClassBO - * @throws - */ - public ClassBO update(ClassBO classBO) throws Exception; - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/service/ClassTeacherService.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/service/ClassTeacherService.java deleted file mode 100644 index 1096923ee839cf62adc638b8629fbfe067d3cb7d..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/service/ClassTeacherService.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.lightsnail.schoolmanager.core.service; - -import java.util.List; - -import com.lightsnail.schoolmanager.core.model.bo.ClassTeacherBO; - -/** - * @Description:Service接口 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 16:19:51 - * @version v1.0 - */ -public interface ClassTeacherService{ - - /** - * - * @Title: save - * @Description:新增 - * @author: - * @param @param dto - * @param @param userId - * @return ClassTeacherBO 返回类型 - * @throws - */ - public ClassTeacherBO save(ClassTeacherBO classTeacherBO) throws Exception; - - /** - * - * @Title: delete - * @Description: 通过id删除数据 - * @author: - * @param @param id - * @return ResultDto 返回类型 - * @throws - */ - public Boolean delete(Long id); - - /** - * - * @Title: getById - * @Description: 通过id查询 - * @author: - * @param @param id - * @return ClassTeacherBO - * @throws - */ - public ClassTeacherBO getById(Long id) throws Exception; - - /** - * - * @Title: getAll - * @Description:查询所有数据 - * @author: - * @return List - * @throws - */ - public List getAll() throws Exception; - - /** - * - * @Title: update - * @Description:修改 - * @author: - * @param @param classTeacherBO - * @return ClassTeacherBO - * @throws - */ - public ClassTeacherBO update(ClassTeacherBO classTeacherBO) throws Exception; - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/service/StudentService.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/service/StudentService.java deleted file mode 100644 index 3c6e956708aa3c1520c6974f9fee0de9a4b1c388..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/service/StudentService.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.lightsnail.schoolmanager.core.service; - -import java.util.List; - -import com.lightsnail.schoolmanager.core.model.bo.StudentBO; - -/** - * @Description:Service接口 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 16:19:51 - * @version v1.0 - */ -public interface StudentService{ - - /** - * - * @Title: save - * @Description:新增 - * @author: - * @param @param dto - * @param @param userId - * @return StudentBO 返回类型 - * @throws - */ - public StudentBO save(StudentBO studentBO) throws Exception; - - /** - * - * @Title: delete - * @Description: 通过id删除数据 - * @author: - * @param @param id - * @return ResultDto 返回类型 - * @throws - */ - public Boolean delete(Long id); - - /** - * - * @Title: getById - * @Description: 通过id查询 - * @author: - * @param @param id - * @return StudentBO - * @throws - */ - public StudentBO getById(Long id) throws Exception; - - /** - * - * @Title: getAll - * @Description:查询所有数据 - * @author: - * @return List - * @throws - */ - public List getAll() throws Exception; - - /** - * - * @Title: update - * @Description:修改 - * @author: - * @param @param studentBO - * @return StudentBO - * @throws - */ - public StudentBO update(StudentBO studentBO) throws Exception; - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/service/TeacherService.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/service/TeacherService.java deleted file mode 100644 index 9489612da8850216de48429754521c08d1f06eb3..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/schoolmanager/core/service/TeacherService.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.lightsnail.schoolmanager.core.service; - -import java.util.List; - -import com.lightsnail.schoolmanager.core.model.bo.TeacherBO; - -/** - * @Description:Service接口 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 16:19:51 - * @version v1.0 - */ -public interface TeacherService{ - - /** - * - * @Title: save - * @Description:新增 - * @author: - * @param @param dto - * @param @param userId - * @return TeacherBO 返回类型 - * @throws - */ - public TeacherBO save(TeacherBO teacherBO) throws Exception; - - /** - * - * @Title: delete - * @Description: 通过id删除数据 - * @author: - * @param @param id - * @return ResultDto 返回类型 - * @throws - */ - public Boolean delete(Long id); - - /** - * - * @Title: getById - * @Description: 通过id查询 - * @author: - * @param @param id - * @return TeacherBO - * @throws - */ - public TeacherBO getById(Long id) throws Exception; - - /** - * - * @Title: getAll - * @Description:查询所有数据 - * @author: - * @return List - * @throws - */ - public List getAll() throws Exception; - - /** - * - * @Title: update - * @Description:修改 - * @author: - * @param @param teacherBO - * @return TeacherBO - * @throws - */ - public TeacherBO update(TeacherBO teacherBO) throws Exception; - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/Application.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/Application.java deleted file mode 100644 index a0ad0a17b4695b0c6834c67255b96786396f6e8b..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/Application.java +++ /dev/null @@ -1,30 +0,0 @@ -/* -package com.lightsnail.schoolmanager.core; - - -import org.apache.dubbo.config.spring.context.annotation.DubboComponentScan; -import org.apache.dubbo.config.spring.context.annotation.EnableDubbo; -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -*/ -/** -* @Description:应用启动入口 -* @Author:fanchunshuai -* @CreateTime:2021-06-25 23:24:09 -* @version v1.0 -*//* - -@DubboComponentScan(basePackages = "com.lightsnail.schoolmanager.core") -@EnableDubbo //开启Dubbo的注解支持 -@SpringBootApplication(scanBasePackages = {"com.lightsnail.schoolmanager"}) -@MapperScan(basePackages = "com.lightsnail.schoolmanager.common") -public class Application { - - public static void main(String[] args) { - SpringApplication.run(Application.class, args); - } - -} -*/ diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/facade.impl/AccountFacadeImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/facade.impl/AccountFacadeImpl.java deleted file mode 100644 index 81a9b51559903807765904c6c136e43cdc0c144b..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/facade.impl/AccountFacadeImpl.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.lightsnail.schoolmanager.core.facade.impl; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.apache.dubbo.config.annotation.Service; - -import com.coderman.utils.response.ResultDataDto; -import com.coderman.utils.response.ResultDto; - -import com.lightsnail.schoolmanager.api.facade.AccountFacade; -import com.lightsnail.schoolmanager.api.dto.AccountDTO; - -import java.util.List; - -/** - * @Description:合作用户表Facade接口实现类 - * @Author：fanchunshuai - * @CreateTime：2021-06-25 23:24:09 - * @version v1.0 - */ -@Service -public class AccountFacadeImpl implements AccountFacade{ - - private Logger logger = LoggerFactory.getLogger(this.getClass()); - - - @Override - public ResultDto save(AccountDTO dto) { - ResultDto resultDto = new ResultDto(); - //todo impl code - return resultDto; - } - - @Override - public ResultDto delete(Long id) { - ResultDto resultDto = new ResultDto(); - logger.info("accountService.delete,id="+id); - //todo impl code - return resultDto; - } - - @Override - public ResultDataDto getById(Long id) { - ResultDataDto resultDataDto = new ResultDataDto(); - logger.info("accountService.getById,id="+id); - //todo impl code - return resultDataDto; - } - - @Override - public ResultDataDto> getAll() { - ResultDataDto> resultDataDto = new ResultDataDto>(); - //todo impl code - return resultDataDto; - } - - @Override - public ResultDto update(AccountDTO dto) { - ResultDto resultDto = new ResultDto(); - //todo impl code - return resultDto; - } - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/facade.impl/AttractInvestmentFacadeImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/facade.impl/AttractInvestmentFacadeImpl.java deleted file mode 100644 index 325320fd542ac93a3f064a589729645227a0fc02..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/facade.impl/AttractInvestmentFacadeImpl.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.lightsnail.schoolmanager.core.facade.impl; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.apache.dubbo.config.annotation.Service; - -import com.coderman.utils.response.ResultDataDto; -import com.coderman.utils.response.ResultDto; - -import com.lightsnail.schoolmanager.api.facade.AttractInvestmentFacade; -import com.lightsnail.schoolmanager.api.dto.AttractInvestmentDTO; - -import java.util.List; - -/** - * @Description:招商服务注册表Facade接口实现类 - * @Author：fanchunshuai - * @CreateTime：2021-06-25 23:24:09 - * @version v1.0 - */ -@Service -public class AttractInvestmentFacadeImpl implements AttractInvestmentFacade{ - - private Logger logger = LoggerFactory.getLogger(this.getClass()); - - - @Override - public ResultDto save(AttractInvestmentDTO dto) { - ResultDto resultDto = new ResultDto(); - //todo impl code - return resultDto; - } - - @Override - public ResultDto delete(Long id) { - ResultDto resultDto = new ResultDto(); - logger.info("attractInvestmentService.delete,id="+id); - //todo impl code - return resultDto; - } - - @Override - public ResultDataDto getById(Long id) { - ResultDataDto resultDataDto = new ResultDataDto(); - logger.info("attractInvestmentService.getById,id="+id); - //todo impl code - return resultDataDto; - } - - @Override - public ResultDataDto> getAll() { - ResultDataDto> resultDataDto = new ResultDataDto>(); - //todo impl code - return resultDataDto; - } - - @Override - public ResultDto update(AttractInvestmentDTO dto) { - ResultDto resultDto = new ResultDto(); - //todo impl code - return resultDto; - } - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/facade.impl/LandlordContractTemplateFacadeImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/facade.impl/LandlordContractTemplateFacadeImpl.java deleted file mode 100644 index 0600a4f3e6c3be9e798f5413beec5e7b7214bd03..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/facade.impl/LandlordContractTemplateFacadeImpl.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.lightsnail.schoolmanager.core.facade.impl; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.apache.dubbo.config.annotation.Service; - -import com.coderman.utils.response.ResultDataDto; -import com.coderman.utils.response.ResultDto; - -import com.lightsnail.schoolmanager.api.facade.LandlordContractTemplateFacade; -import com.lightsnail.schoolmanager.api.dto.LandlordContractTemplateDTO; - -import java.util.List; - -/** - * @Description:房东合同模板表Facade接口实现类 - * @Author：fanchunshuai - * @CreateTime：2021-06-25 23:24:09 - * @version v1.0 - */ -@Service -public class LandlordContractTemplateFacadeImpl implements LandlordContractTemplateFacade{ - - private Logger logger = LoggerFactory.getLogger(this.getClass()); - - - @Override - public ResultDto save(LandlordContractTemplateDTO dto) { - ResultDto resultDto = new ResultDto(); - //todo impl code - return resultDto; - } - - @Override - public ResultDto delete(Long id) { - ResultDto resultDto = new ResultDto(); - logger.info("landlordContractTemplateService.delete,id="+id); - //todo impl code - return resultDto; - } - - @Override - public ResultDataDto getById(Long id) { - ResultDataDto resultDataDto = new ResultDataDto(); - logger.info("landlordContractTemplateService.getById,id="+id); - //todo impl code - return resultDataDto; - } - - @Override - public ResultDataDto> getAll() { - ResultDataDto> resultDataDto = new ResultDataDto>(); - //todo impl code - return resultDataDto; - } - - @Override - public ResultDto update(LandlordContractTemplateDTO dto) { - ResultDto resultDto = new ResultDto(); - //todo impl code - return resultDto; - } - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/facade.impl/LandlordRoomRentRecordFacadeImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/facade.impl/LandlordRoomRentRecordFacadeImpl.java deleted file mode 100644 index 39de7e17bcfe6d7d24f503edf40c04a4d0c79fa3..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/facade.impl/LandlordRoomRentRecordFacadeImpl.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.lightsnail.schoolmanager.core.facade.impl; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.apache.dubbo.config.annotation.Service; - -import com.coderman.utils.response.ResultDataDto; -import com.coderman.utils.response.ResultDto; - -import com.lightsnail.schoolmanager.api.facade.LandlordRoomRentRecordFacade; -import com.lightsnail.schoolmanager.api.dto.LandlordRoomRentRecordDTO; - -import java.util.List; - -/** - * @Description:房源出租记录表Facade接口实现类 - * @Author：fanchunshuai - * @CreateTime：2021-06-25 23:24:09 - * @version v1.0 - */ -@Service -public class LandlordRoomRentRecordFacadeImpl implements LandlordRoomRentRecordFacade{ - - private Logger logger = LoggerFactory.getLogger(this.getClass()); - - - @Override - public ResultDto save(LandlordRoomRentRecordDTO dto) { - ResultDto resultDto = new ResultDto(); - //todo impl code - return resultDto; - } - - @Override - public ResultDto delete(Long id) { - ResultDto resultDto = new ResultDto(); - logger.info("landlordRoomRentRecordService.delete,id="+id); - //todo impl code - return resultDto; - } - - @Override - public ResultDataDto getById(Long id) { - ResultDataDto resultDataDto = new ResultDataDto(); - logger.info("landlordRoomRentRecordService.getById,id="+id); - //todo impl code - return resultDataDto; - } - - @Override - public ResultDataDto> getAll() { - ResultDataDto> resultDataDto = new ResultDataDto>(); - //todo impl code - return resultDataDto; - } - - @Override - public ResultDto update(LandlordRoomRentRecordDTO dto) { - ResultDto resultDto = new ResultDto(); - //todo impl code - return resultDto; - } - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/facade.impl/LandlordRoomSourceFacadeImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/facade.impl/LandlordRoomSourceFacadeImpl.java deleted file mode 100644 index bb5a586a3f2bceb2fb32782da0c128e5b3cb838f..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/facade.impl/LandlordRoomSourceFacadeImpl.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.lightsnail.schoolmanager.core.facade.impl; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.apache.dubbo.config.annotation.Service; - -import com.coderman.utils.response.ResultDataDto; -import com.coderman.utils.response.ResultDto; - -import com.lightsnail.schoolmanager.api.facade.LandlordRoomSourceFacade; -import com.lightsnail.schoolmanager.api.dto.LandlordRoomSourceDTO; - -import java.util.List; - -/** - * @Description:房东-房源表Facade接口实现类 - * @Author：fanchunshuai - * @CreateTime：2021-06-25 23:24:09 - * @version v1.0 - */ -@Service -public class LandlordRoomSourceFacadeImpl implements LandlordRoomSourceFacade{ - - private Logger logger = LoggerFactory.getLogger(this.getClass()); - - - @Override - public ResultDto save(LandlordRoomSourceDTO dto) { - ResultDto resultDto = new ResultDto(); - //todo impl code - return resultDto; - } - - @Override - public ResultDto delete(Long id) { - ResultDto resultDto = new ResultDto(); - logger.info("landlordRoomSourceService.delete,id="+id); - //todo impl code - return resultDto; - } - - @Override - public ResultDataDto getById(Long id) { - ResultDataDto resultDataDto = new ResultDataDto(); - logger.info("landlordRoomSourceService.getById,id="+id); - //todo impl code - return resultDataDto; - } - - @Override - public ResultDataDto> getAll() { - ResultDataDto> resultDataDto = new ResultDataDto>(); - //todo impl code - return resultDataDto; - } - - @Override - public ResultDto update(LandlordRoomSourceDTO dto) { - ResultDto resultDto = new ResultDto(); - //todo impl code - return resultDto; - } - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/facade.impl/RealRoomSourceFacadeImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/facade.impl/RealRoomSourceFacadeImpl.java deleted file mode 100644 index c071bd04badc65a97f6e0ad666bc781452a699eb..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/facade.impl/RealRoomSourceFacadeImpl.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.lightsnail.schoolmanager.core.facade.impl; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.apache.dubbo.config.annotation.Service; - -import com.coderman.utils.response.ResultDataDto; -import com.coderman.utils.response.ResultDto; - -import com.lightsnail.schoolmanager.api.facade.RealRoomSourceFacade; -import com.lightsnail.schoolmanager.api.dto.RealRoomSourceDTO; - -import java.util.List; - -/** - * @Description:房东-房源表Facade接口实现类 - * @Author：fanchunshuai - * @CreateTime：2021-06-25 23:24:09 - * @version v1.0 - */ -@Service -public class RealRoomSourceFacadeImpl implements RealRoomSourceFacade{ - - private Logger logger = LoggerFactory.getLogger(this.getClass()); - - - @Override - public ResultDto save(RealRoomSourceDTO dto) { - ResultDto resultDto = new ResultDto(); - //todo impl code - return resultDto; - } - - @Override - public ResultDto delete(Long id) { - ResultDto resultDto = new ResultDto(); - logger.info("realRoomSourceService.delete,id="+id); - //todo impl code - return resultDto; - } - - @Override - public ResultDataDto getById(Long id) { - ResultDataDto resultDataDto = new ResultDataDto(); - logger.info("realRoomSourceService.getById,id="+id); - //todo impl code - return resultDataDto; - } - - @Override - public ResultDataDto> getAll() { - ResultDataDto> resultDataDto = new ResultDataDto>(); - //todo impl code - return resultDataDto; - } - - @Override - public ResultDto update(RealRoomSourceDTO dto) { - ResultDto resultDto = new ResultDto(); - //todo impl code - return resultDto; - } - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/facade.impl/RoomAgentFacadeImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/facade.impl/RoomAgentFacadeImpl.java deleted file mode 100644 index 8cb916d5ea027e2aa67b3350c0be5570b6fd7ba8..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/facade.impl/RoomAgentFacadeImpl.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.lightsnail.schoolmanager.core.facade.impl; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.apache.dubbo.config.annotation.Service; - -import com.coderman.utils.response.ResultDataDto; -import com.coderman.utils.response.ResultDto; - -import com.lightsnail.schoolmanager.api.facade.RoomAgentFacade; -import com.lightsnail.schoolmanager.api.dto.RoomAgentDTO; - -import java.util.List; - -/** - * @Description:代理人表Facade接口实现类 - * @Author：fanchunshuai - * @CreateTime：2021-06-25 23:24:09 - * @version v1.0 - */ -@Service -public class RoomAgentFacadeImpl implements RoomAgentFacade{ - - private Logger logger = LoggerFactory.getLogger(this.getClass()); - - - @Override - public ResultDto save(RoomAgentDTO dto) { - ResultDto resultDto = new ResultDto(); - //todo impl code - return resultDto; - } - - @Override - public ResultDto delete(Long id) { - ResultDto resultDto = new ResultDto(); - logger.info("roomAgentService.delete,id="+id); - //todo impl code - return resultDto; - } - - @Override - public ResultDataDto getById(Long id) { - ResultDataDto resultDataDto = new ResultDataDto(); - logger.info("roomAgentService.getById,id="+id); - //todo impl code - return resultDataDto; - } - - @Override - public ResultDataDto> getAll() { - ResultDataDto> resultDataDto = new ResultDataDto>(); - //todo impl code - return resultDataDto; - } - - @Override - public ResultDto update(RoomAgentDTO dto) { - ResultDto resultDto = new ResultDto(); - //todo impl code - return resultDto; - } - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/facade.impl/RoomAgentOrderFacadeImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/facade.impl/RoomAgentOrderFacadeImpl.java deleted file mode 100644 index 75a7a27263ea21d52d48ac5976a67a06bb252119..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/facade.impl/RoomAgentOrderFacadeImpl.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.lightsnail.schoolmanager.core.facade.impl; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.apache.dubbo.config.annotation.Service; - -import com.coderman.utils.response.ResultDataDto; -import com.coderman.utils.response.ResultDto; - -import com.lightsnail.schoolmanager.api.facade.RoomAgentOrderFacade; -import com.lightsnail.schoolmanager.api.dto.RoomAgentOrderDTO; - -import java.util.List; - -/** - * @Description:代理人-签单表Facade接口实现类 - * @Author：fanchunshuai - * @CreateTime：2021-06-25 23:24:09 - * @version v1.0 - */ -@Service -public class RoomAgentOrderFacadeImpl implements RoomAgentOrderFacade{ - - private Logger logger = LoggerFactory.getLogger(this.getClass()); - - - @Override - public ResultDto save(RoomAgentOrderDTO dto) { - ResultDto resultDto = new ResultDto(); - //todo impl code - return resultDto; - } - - @Override - public ResultDto delete(Long id) { - ResultDto resultDto = new ResultDto(); - logger.info("roomAgentOrderService.delete,id="+id); - //todo impl code - return resultDto; - } - - @Override - public ResultDataDto getById(Long id) { - ResultDataDto resultDataDto = new ResultDataDto(); - logger.info("roomAgentOrderService.getById,id="+id); - //todo impl code - return resultDataDto; - } - - @Override - public ResultDataDto> getAll() { - ResultDataDto> resultDataDto = new ResultDataDto>(); - //todo impl code - return resultDataDto; - } - - @Override - public ResultDto update(RoomAgentOrderDTO dto) { - ResultDto resultDto = new ResultDto(); - //todo impl code - return resultDto; - } - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/facade.impl/RoomLandlordFacadeImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/facade.impl/RoomLandlordFacadeImpl.java deleted file mode 100644 index 950e2df83bd20402a899628bf335881492b0455f..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/facade.impl/RoomLandlordFacadeImpl.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.lightsnail.schoolmanager.core.facade.impl; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.apache.dubbo.config.annotation.Service; - -import com.coderman.utils.response.ResultDataDto; -import com.coderman.utils.response.ResultDto; - -import com.lightsnail.schoolmanager.api.facade.RoomLandlordFacade; -import com.lightsnail.schoolmanager.api.dto.RoomLandlordDTO; - -import java.util.List; - -/** - * @Description:房东表Facade接口实现类 - * @Author：fanchunshuai - * @CreateTime：2021-06-25 23:24:09 - * @version v1.0 - */ -@Service -public class RoomLandlordFacadeImpl implements RoomLandlordFacade{ - - private Logger logger = LoggerFactory.getLogger(this.getClass()); - - - @Override - public ResultDto save(RoomLandlordDTO dto) { - ResultDto resultDto = new ResultDto(); - //todo impl code - return resultDto; - } - - @Override - public ResultDto delete(Long id) { - ResultDto resultDto = new ResultDto(); - logger.info("roomLandlordService.delete,id="+id); - //todo impl code - return resultDto; - } - - @Override - public ResultDataDto getById(Long id) { - ResultDataDto resultDataDto = new ResultDataDto(); - logger.info("roomLandlordService.getById,id="+id); - //todo impl code - return resultDataDto; - } - - @Override - public ResultDataDto> getAll() { - ResultDataDto> resultDataDto = new ResultDataDto>(); - //todo impl code - return resultDataDto; - } - - @Override - public ResultDto update(RoomLandlordDTO dto) { - ResultDto resultDto = new ResultDto(); - //todo impl code - return resultDto; - } - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/facade.impl/RoomPublishFacadeImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/facade.impl/RoomPublishFacadeImpl.java deleted file mode 100644 index 15332c152849b3f6f4f17bb90f8e60ddfcdc4204..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/facade.impl/RoomPublishFacadeImpl.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.lightsnail.schoolmanager.core.facade.impl; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.apache.dubbo.config.annotation.Service; - -import com.coderman.utils.response.ResultDataDto; -import com.coderman.utils.response.ResultDto; - -import com.lightsnail.schoolmanager.api.facade.RoomPublishFacade; -import com.lightsnail.schoolmanager.api.dto.RoomPublishDTO; - -import java.util.List; - -/** - * @Description:代理人-房源发布表Facade接口实现类 - * @Author：fanchunshuai - * @CreateTime：2021-06-25 23:24:09 - * @version v1.0 - */ -@Service -public class RoomPublishFacadeImpl implements RoomPublishFacade{ - - private Logger logger = LoggerFactory.getLogger(this.getClass()); - - - @Override - public ResultDto save(RoomPublishDTO dto) { - ResultDto resultDto = new ResultDto(); - //todo impl code - return resultDto; - } - - @Override - public ResultDto delete(Long id) { - ResultDto resultDto = new ResultDto(); - logger.info("roomPublishService.delete,id="+id); - //todo impl code - return resultDto; - } - - @Override - public ResultDataDto getById(Long id) { - ResultDataDto resultDataDto = new ResultDataDto(); - logger.info("roomPublishService.getById,id="+id); - //todo impl code - return resultDataDto; - } - - @Override - public ResultDataDto> getAll() { - ResultDataDto> resultDataDto = new ResultDataDto>(); - //todo impl code - return resultDataDto; - } - - @Override - public ResultDto update(RoomPublishDTO dto) { - ResultDto resultDto = new ResultDto(); - //todo impl code - return resultDto; - } - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/facade.impl/RoomSubscribeFacadeImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/facade.impl/RoomSubscribeFacadeImpl.java deleted file mode 100644 index 93a803190ae9a0ad47a8d180dde184dd57f1e09a..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/facade.impl/RoomSubscribeFacadeImpl.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.lightsnail.schoolmanager.core.facade.impl; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.apache.dubbo.config.annotation.Service; - -import com.coderman.utils.response.ResultDataDto; -import com.coderman.utils.response.ResultDto; - -import com.lightsnail.schoolmanager.api.facade.RoomSubscribeFacade; -import com.lightsnail.schoolmanager.api.dto.RoomSubscribeDTO; - -import java.util.List; - -/** - * @Description:代理人-预约看房记录表Facade接口实现类 - * @Author：fanchunshuai - * @CreateTime：2021-06-25 23:24:09 - * @version v1.0 - */ -@Service -public class RoomSubscribeFacadeImpl implements RoomSubscribeFacade{ - - private Logger logger = LoggerFactory.getLogger(this.getClass()); - - - @Override - public ResultDto save(RoomSubscribeDTO dto) { - ResultDto resultDto = new ResultDto(); - //todo impl code - return resultDto; - } - - @Override - public ResultDto delete(Long id) { - ResultDto resultDto = new ResultDto(); - logger.info("roomSubscribeService.delete,id="+id); - //todo impl code - return resultDto; - } - - @Override - public ResultDataDto getById(Long id) { - ResultDataDto resultDataDto = new ResultDataDto(); - logger.info("roomSubscribeService.getById,id="+id); - //todo impl code - return resultDataDto; - } - - @Override - public ResultDataDto> getAll() { - ResultDataDto> resultDataDto = new ResultDataDto>(); - //todo impl code - return resultDataDto; - } - - @Override - public ResultDto update(RoomSubscribeDTO dto) { - ResultDto resultDto = new ResultDto(); - //todo impl code - return resultDto; - } - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/model.bo/AccountBO.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/model.bo/AccountBO.java deleted file mode 100644 index 14e70749b4c3faf068094c68bdf1a8bf3b4a5f55..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/model.bo/AccountBO.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.lightsnail.schoolmanager.core.model.bo; - -import java.util.Date; -import java.math.BigDecimal; -import lombok.Data; -import lombok.ToString; - - /** - * @Description:合作用户表BO类 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 23:24:09 - * @version v1.0 - */ -@Data -@ToString -public class AccountBO{ - - - /** 账号id **/ - private Long id; - - /** 账号昵称 **/ - private String nickName; - - /** 密码 **/ - private String passWord; - - /** 账号类型（代理人，房东，招商用户） **/ - private Integer accountType; - - /** 代理人，房东，招商用户id **/ - private Long memberId; - - /** 账号状态 **/ - private Integer status; - - /** 电话号码 **/ - private String handphone; - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/model.bo/AttractInvestmentBO.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/model.bo/AttractInvestmentBO.java deleted file mode 100644 index bc7b5f56edcac9a1e5857bf96e6711897424ccfb..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/model.bo/AttractInvestmentBO.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.lightsnail.schoolmanager.core.model.bo; - -import java.util.Date; -import java.math.BigDecimal; -import lombok.Data; -import lombok.ToString; - - /** - * @Description:招商服务注册表BO类 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 23:24:09 - * @version v1.0 - */ -@Data -@ToString -public class AttractInvestmentBO{ - - - /** 主键id **/ - private Long id; - - /** 招商对象名称 **/ - private String chineseName; - - /** 联系电话 **/ - private String handphone; - - /** 招商类型 **/ - private Integer investmentType; - - /** 公司地址 **/ - private String companyAddress; - - /** 合作开始时间 **/ - private Date startTime; - - /** 合作结束时间 **/ - private Date endTime; - - /** 是否开通账号 **/ - private Integer isOpenaccount; - - /** 会员账号id **/ - private Long accountId; - - /** 记录创建时间 **/ - private Date createTime; - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/model.bo/LandlordContractTemplateBO.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/model.bo/LandlordContractTemplateBO.java deleted file mode 100644 index 513af700dc4a3ad9f2c1815e3631ea28c227ad6c..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/model.bo/LandlordContractTemplateBO.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.lightsnail.schoolmanager.core.model.bo; - -import java.util.Date; -import java.math.BigDecimal; -import lombok.Data; -import lombok.ToString; - - /** - * @Description:房东合同模板表BO类 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 23:24:09 - * @version v1.0 - */ -@Data -@ToString -public class LandlordContractTemplateBO{ - - - /** 房源表id **/ - private Long id; - - /** 房东账号id **/ - private Long landlordAccountId; - - /** 合同模板id **/ - private Long contractTemplateId; - - /** 记录创建时间 **/ - private Date createTime; - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/model.bo/LandlordRoomRentRecordBO.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/model.bo/LandlordRoomRentRecordBO.java deleted file mode 100644 index ce27c9107f52d54b19cb5e1532ff6d1c9ac35813..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/model.bo/LandlordRoomRentRecordBO.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.lightsnail.schoolmanager.core.model.bo; - -import java.util.Date; -import java.math.BigDecimal; -import lombok.Data; -import lombok.ToString; - - /** - * @Description:房源出租记录表BO类 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 23:24:09 - * @version v1.0 - */ -@Data -@ToString -public class LandlordRoomRentRecordBO{ - - - /** 主键id **/ - private Long id; - - /** 房东账号id **/ - private Long landlordAccountId; - - /** 房源id **/ - private Long roomSourceId; - - /** 代理人账号id **/ - private Long agentAccountId; - - /** 房源房屋序号索引 **/ - private Integer roomSourceIndex; - - /** 用户id **/ - private Long userId; - - /** 合同ID **/ - private Long contractId; - - /** 出租开始时间 **/ - private Date rentStartTime; - - /** 出租结束时间 **/ - private Date rentEndTime; - - /** 出租实际结束时间 **/ - private Date realEndTime; - - /** 记录创建时间 **/ - private Date createTime; - - /** 记录修改时间 **/ - private Date updateTime; - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/model.bo/LandlordRoomSourceBO.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/model.bo/LandlordRoomSourceBO.java deleted file mode 100644 index d0dc137eb5925c727207d968f3bb1bae9adfc760..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/model.bo/LandlordRoomSourceBO.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.lightsnail.schoolmanager.core.model.bo; - -import java.util.Date; -import java.math.BigDecimal; -import lombok.Data; -import lombok.ToString; - - /** - * @Description:房东-房源表BO类 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 23:24:09 - * @version v1.0 - */ -@Data -@ToString -public class LandlordRoomSourceBO{ - - - /** 房源表id **/ - private Long id; - - /** 房东账号id **/ - private Long landlordAccountId; - - /** 房源所属行政区域id **/ - private Integer areaId; - - /** 房源所属小区 **/ - private String areaCode; - - /** 房源所在楼层单元地址 **/ - private String floorAddress; - - /** 房东电话 **/ - private String handphone; - - /** 账号创建时间 **/ - private Date createTime; - - /** 户型类型 **/ - private Integer roomFormType; - - /** 可出租房间数量 **/ - private Integer sourceNumbers; - - /** 房屋面积 **/ - private BigDecimal sizeInfo; - - /** 客厅数目 **/ - private Integer livingRoomNum; - - /** 厨房数目 **/ - private Integer kitchenNum; - - /** 卫生间数目 **/ - private Integer toiletNum; - - /** 出租要求 **/ - private String requireInfo; - - /** 装修情况，精装修，简装修，毛坯房 **/ - private Integer decorateInfo; - - /** 支持的房屋设备 **/ - private String supportEquipments; - - /** 水费/吨 **/ - private BigDecimal moneyWater; - - /** 电费/度 **/ - private BigDecimal moneyThunder; - - /** 网费/月 **/ - private BigDecimal moneyInternet; - - /** 物业费/月 **/ - private BigDecimal moneyManage; - - /** 停车费/月 **/ - private BigDecimal moneyCarPark; - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/model.bo/RealRoomSourceBO.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/model.bo/RealRoomSourceBO.java deleted file mode 100644 index 6e2640b7e38c658efe07d81676d436a503221a34..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/model.bo/RealRoomSourceBO.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.lightsnail.schoolmanager.core.model.bo; - -import java.util.Date; -import java.math.BigDecimal; -import lombok.Data; -import lombok.ToString; - - /** - * @Description:房东-房源表BO类 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 23:24:09 - * @version v1.0 - */ -@Data -@ToString -public class RealRoomSourceBO{ - - - /** 出租房源表id **/ - private Long id; - - /** 房东账号id **/ - private Long landlordAccountId; - - /** 房源表主表id **/ - private Long landlordRoomSourceId; - - /** 房屋状态 **/ - private Integer roomStatus; - - /** 出租开始时间 **/ - private Date rentStartTime; - - /** 出租结束时间 **/ - private Date rentEndTime; - - /** 房屋类型，主卧，次卧，客厅，阳台,一居室,两居室,开间 **/ - private Integer roomFormType; - - /** 房屋编号 **/ - private String roomIndex; - - /** 房屋出租描述 **/ - private String roomDesc; - - /** 出租价格/月 **/ - private BigDecimal roomPrice; - - /** 出租形式(整租,合租) **/ - private Integer roomRentForm; - - /** 租金形式(月付,季度付,半年付,整年付) **/ - private Integer roomPayForm; - - /** 服务费（中介房源，与押金类似） **/ - private BigDecimal servicePrice; - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/model.bo/RoomAgentBO.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/model.bo/RoomAgentBO.java deleted file mode 100644 index 9b3b7543868bd81c5215a3bb831c7a515b970d84..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/model.bo/RoomAgentBO.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.lightsnail.schoolmanager.core.model.bo; - -import java.util.Date; -import java.math.BigDecimal; -import lombok.Data; -import lombok.ToString; - - /** - * @Description:代理人表BO类 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 23:24:09 - * @version v1.0 - */ -@Data -@ToString -public class RoomAgentBO{ - - - /** 代理人id，主键id **/ - private Long id; - - /** 代理人姓名 **/ - private String chineseName; - - /** 代理人身份证号 **/ - private String cardNumber; - - /** 代理人身份证图片(正反面) **/ - private String cardNumberUrls; - - /** 代理人电话 **/ - private String handphone; - - /** 代理小区列表 **/ - private String areaCodes; - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/model.bo/RoomAgentOrderBO.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/model.bo/RoomAgentOrderBO.java deleted file mode 100644 index 0255425542bd84c4f71697a210f746e26176a0f3..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/model.bo/RoomAgentOrderBO.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.lightsnail.schoolmanager.core.model.bo; - -import java.util.Date; -import java.math.BigDecimal; -import lombok.Data; -import lombok.ToString; - - /** - * @Description:代理人-签单表BO类 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 23:24:09 - * @version v1.0 - */ -@Data -@ToString -public class RoomAgentOrderBO{ - - - /** 主键id **/ - private Long id; - - /** 代理人账号id **/ - private Long agentAccountId; - - /** 房东账号id **/ - private Long landlordAccountId; - - /** 房源id **/ - private Long roomSourceId; - - /** 记录创建时间 **/ - private Date createTime; - - /** 签单时间 **/ - private Date orderTime; - - /** 佣金额度/元 **/ - private Integer tipMoney; - - /** 结算形式/一单一结，月结 **/ - private Integer settlementForm; - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/model.bo/RoomLandlordBO.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/model.bo/RoomLandlordBO.java deleted file mode 100644 index fda68b9ca631dda608f001a81314ae87855d6bf3..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/model.bo/RoomLandlordBO.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.lightsnail.schoolmanager.core.model.bo; - -import java.util.Date; -import java.math.BigDecimal; -import lombok.Data; -import lombok.ToString; - - /** - * @Description:房东表BO类 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 23:24:09 - * @version v1.0 - */ -@Data -@ToString -public class RoomLandlordBO{ - - - /** 房东id，主键id **/ - private Long id; - - /** 房东姓名 **/ - private String chineseName; - - /** 房东身份证号 **/ - private String cardNumber; - - /** 房东人身份证图片(正反面) **/ - private String cardNumberUrls; - - /** 房东电话 **/ - private String handphone; - - /** 审核状态 **/ - private Integer checkStatus; - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/model.bo/RoomPublishBO.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/model.bo/RoomPublishBO.java deleted file mode 100644 index 8cc4c8f7bc31b14da605f0e0035d8c1706206afe..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/model.bo/RoomPublishBO.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.lightsnail.schoolmanager.core.model.bo; - -import java.util.Date; -import java.math.BigDecimal; -import lombok.Data; -import lombok.ToString; - - /** - * @Description:代理人-房源发布表BO类 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 23:24:09 - * @version v1.0 - */ -@Data -@ToString -public class RoomPublishBO{ - - - /** 代理人id，主键id **/ - private Long id; - - /** 发布人账号id **/ - private Long publisherAccountId; - - /** 真实房源id **/ - private Long roomSourceId; - - /** 发布的房源id **/ - private Long publishSourceId; - - /** 记录创建时间/发布时间 **/ - private Date createTime; - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/model.bo/RoomSubscribeBO.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/model.bo/RoomSubscribeBO.java deleted file mode 100644 index 7137ea7e9cbcdc88c0dca41a5c7f39b413784582..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/model.bo/RoomSubscribeBO.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.lightsnail.schoolmanager.core.model.bo; - -import java.util.Date; -import java.math.BigDecimal; -import lombok.Data; -import lombok.ToString; - - /** - * @Description:代理人-预约看房记录表BO类 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 23:24:09 - * @version v1.0 - */ -@Data -@ToString -public class RoomSubscribeBO{ - - - /** 主键id **/ - private Long id; - - /** 代理人账号id **/ - private Long agentAccountId; - - /** 代理人类型0:房东,1:代理人,2:中介 **/ - private Integer roomAgentType; - - /** 用户id **/ - private Long userId; - - /** 房源所属小区/看房小区 **/ - private String areaCode; - - /** 房源所在楼层单元地址 **/ - private String floorAddress; - - /** 提前N小时提醒 **/ - private Integer mindHourseBefore; - - /** 用户电话 **/ - private String handphone; - - /** 是否进行预约提醒 **/ - private Integer isMind; - - /** 预约时间 **/ - private Date subscribeTime; - - /** 看房结果 **/ - private String subscribeResult; - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service.impl/AccountServiceImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service.impl/AccountServiceImpl.java deleted file mode 100644 index 754f4c15852533f70424fcc55aff3e9cdcc1b334..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service.impl/AccountServiceImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.lightsnail.schoolmanager.core.service.impl; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import javax.annotation.Resource; - -import com.lightsnail.schoolmanager.common.mapper.AccountMapper; -import com.lightsnail.schoolmanager.core.service.AccountService; -import com.lightsnail.schoolmanager.core.model.bo.AccountBO; - -import java.util.List; - - -/** - * @Description:合作用户表Service接口实现类 - * @Author：fanchunshuai - * @CreateTime：2021-06-25 23:24:09 - * @version v1.0 - */ -@Service -@Slf4j -public class AccountServiceImpl implements AccountService{ - - - @Resource - private AccountMapper accountMapper; - - - @Override - public AccountBO save(AccountBO accountBO) throws Exception{ - return accountBO; - } - - @Override - public Boolean delete(Long id) { - return false; - } - - @Override - public AccountBO getById(Long id) throws Exception { - return null; - } - - @Override - public List getAll() throws Exception { - return null; - } - - @Override - public AccountBO update(AccountBO accountBO) throws Exception { - return accountBO; - } - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service.impl/AttractInvestmentServiceImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service.impl/AttractInvestmentServiceImpl.java deleted file mode 100644 index f767cb7e515db1cbf1a4124c1c005ebce0549320..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service.impl/AttractInvestmentServiceImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.lightsnail.schoolmanager.core.service.impl; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import javax.annotation.Resource; - -import com.lightsnail.schoolmanager.common.mapper.AttractInvestmentMapper; -import com.lightsnail.schoolmanager.core.service.AttractInvestmentService; -import com.lightsnail.schoolmanager.core.model.bo.AttractInvestmentBO; - -import java.util.List; - - -/** - * @Description:招商服务注册表Service接口实现类 - * @Author：fanchunshuai - * @CreateTime：2021-06-25 23:24:09 - * @version v1.0 - */ -@Service -@Slf4j -public class AttractInvestmentServiceImpl implements AttractInvestmentService{ - - - @Resource - private AttractInvestmentMapper attractInvestmentMapper; - - - @Override - public AttractInvestmentBO save(AttractInvestmentBO attractInvestmentBO) throws Exception{ - return attractInvestmentBO; - } - - @Override - public Boolean delete(Long id) { - return false; - } - - @Override - public AttractInvestmentBO getById(Long id) throws Exception { - return null; - } - - @Override - public List getAll() throws Exception { - return null; - } - - @Override - public AttractInvestmentBO update(AttractInvestmentBO attractInvestmentBO) throws Exception { - return attractInvestmentBO; - } - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service.impl/LandlordContractTemplateServiceImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service.impl/LandlordContractTemplateServiceImpl.java deleted file mode 100644 index c321d61aaa1c42ff515837a31d09f688b7c5dc3d..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service.impl/LandlordContractTemplateServiceImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.lightsnail.schoolmanager.core.service.impl; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import javax.annotation.Resource; - -import com.lightsnail.schoolmanager.common.mapper.LandlordContractTemplateMapper; -import com.lightsnail.schoolmanager.core.service.LandlordContractTemplateService; -import com.lightsnail.schoolmanager.core.model.bo.LandlordContractTemplateBO; - -import java.util.List; - - -/** - * @Description:房东合同模板表Service接口实现类 - * @Author：fanchunshuai - * @CreateTime：2021-06-25 23:24:09 - * @version v1.0 - */ -@Service -@Slf4j -public class LandlordContractTemplateServiceImpl implements LandlordContractTemplateService{ - - - @Resource - private LandlordContractTemplateMapper landlordContractTemplateMapper; - - - @Override - public LandlordContractTemplateBO save(LandlordContractTemplateBO landlordContractTemplateBO) throws Exception{ - return landlordContractTemplateBO; - } - - @Override - public Boolean delete(Long id) { - return false; - } - - @Override - public LandlordContractTemplateBO getById(Long id) throws Exception { - return null; - } - - @Override - public List getAll() throws Exception { - return null; - } - - @Override - public LandlordContractTemplateBO update(LandlordContractTemplateBO landlordContractTemplateBO) throws Exception { - return landlordContractTemplateBO; - } - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service.impl/LandlordRoomRentRecordServiceImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service.impl/LandlordRoomRentRecordServiceImpl.java deleted file mode 100644 index 05d16e4db569fc10db226e310c62e5a62cae8eaf..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service.impl/LandlordRoomRentRecordServiceImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.lightsnail.schoolmanager.core.service.impl; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import javax.annotation.Resource; - -import com.lightsnail.schoolmanager.common.mapper.LandlordRoomRentRecordMapper; -import com.lightsnail.schoolmanager.core.service.LandlordRoomRentRecordService; -import com.lightsnail.schoolmanager.core.model.bo.LandlordRoomRentRecordBO; - -import java.util.List; - - -/** - * @Description:房源出租记录表Service接口实现类 - * @Author：fanchunshuai - * @CreateTime：2021-06-25 23:24:09 - * @version v1.0 - */ -@Service -@Slf4j -public class LandlordRoomRentRecordServiceImpl implements LandlordRoomRentRecordService{ - - - @Resource - private LandlordRoomRentRecordMapper landlordRoomRentRecordMapper; - - - @Override - public LandlordRoomRentRecordBO save(LandlordRoomRentRecordBO landlordRoomRentRecordBO) throws Exception{ - return landlordRoomRentRecordBO; - } - - @Override - public Boolean delete(Long id) { - return false; - } - - @Override - public LandlordRoomRentRecordBO getById(Long id) throws Exception { - return null; - } - - @Override - public List getAll() throws Exception { - return null; - } - - @Override - public LandlordRoomRentRecordBO update(LandlordRoomRentRecordBO landlordRoomRentRecordBO) throws Exception { - return landlordRoomRentRecordBO; - } - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service.impl/LandlordRoomSourceServiceImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service.impl/LandlordRoomSourceServiceImpl.java deleted file mode 100644 index 9f32821bbd1a3860477b862c85cdb824a2844523..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service.impl/LandlordRoomSourceServiceImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.lightsnail.schoolmanager.core.service.impl; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import javax.annotation.Resource; - -import com.lightsnail.schoolmanager.common.mapper.LandlordRoomSourceMapper; -import com.lightsnail.schoolmanager.core.service.LandlordRoomSourceService; -import com.lightsnail.schoolmanager.core.model.bo.LandlordRoomSourceBO; - -import java.util.List; - - -/** - * @Description:房东-房源表Service接口实现类 - * @Author：fanchunshuai - * @CreateTime：2021-06-25 23:24:09 - * @version v1.0 - */ -@Service -@Slf4j -public class LandlordRoomSourceServiceImpl implements LandlordRoomSourceService{ - - - @Resource - private LandlordRoomSourceMapper landlordRoomSourceMapper; - - - @Override - public LandlordRoomSourceBO save(LandlordRoomSourceBO landlordRoomSourceBO) throws Exception{ - return landlordRoomSourceBO; - } - - @Override - public Boolean delete(Long id) { - return false; - } - - @Override - public LandlordRoomSourceBO getById(Long id) throws Exception { - return null; - } - - @Override - public List getAll() throws Exception { - return null; - } - - @Override - public LandlordRoomSourceBO update(LandlordRoomSourceBO landlordRoomSourceBO) throws Exception { - return landlordRoomSourceBO; - } - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service.impl/RealRoomSourceServiceImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service.impl/RealRoomSourceServiceImpl.java deleted file mode 100644 index 31c71e4d8021383d9a94e66e2e76a0ddaafd8e3e..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service.impl/RealRoomSourceServiceImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.lightsnail.schoolmanager.core.service.impl; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import javax.annotation.Resource; - -import com.lightsnail.schoolmanager.common.mapper.RealRoomSourceMapper; -import com.lightsnail.schoolmanager.core.service.RealRoomSourceService; -import com.lightsnail.schoolmanager.core.model.bo.RealRoomSourceBO; - -import java.util.List; - - -/** - * @Description:房东-房源表Service接口实现类 - * @Author：fanchunshuai - * @CreateTime：2021-06-25 23:24:09 - * @version v1.0 - */ -@Service -@Slf4j -public class RealRoomSourceServiceImpl implements RealRoomSourceService{ - - - @Resource - private RealRoomSourceMapper realRoomSourceMapper; - - - @Override - public RealRoomSourceBO save(RealRoomSourceBO realRoomSourceBO) throws Exception{ - return realRoomSourceBO; - } - - @Override - public Boolean delete(Long id) { - return false; - } - - @Override - public RealRoomSourceBO getById(Long id) throws Exception { - return null; - } - - @Override - public List getAll() throws Exception { - return null; - } - - @Override - public RealRoomSourceBO update(RealRoomSourceBO realRoomSourceBO) throws Exception { - return realRoomSourceBO; - } - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service.impl/RoomAgentOrderServiceImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service.impl/RoomAgentOrderServiceImpl.java deleted file mode 100644 index 76d80684d35846061dab6e48d9848ba36597ffe0..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service.impl/RoomAgentOrderServiceImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.lightsnail.schoolmanager.core.service.impl; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import javax.annotation.Resource; - -import com.lightsnail.schoolmanager.common.mapper.RoomAgentOrderMapper; -import com.lightsnail.schoolmanager.core.service.RoomAgentOrderService; -import com.lightsnail.schoolmanager.core.model.bo.RoomAgentOrderBO; - -import java.util.List; - - -/** - * @Description:代理人-签单表Service接口实现类 - * @Author：fanchunshuai - * @CreateTime：2021-06-25 23:24:09 - * @version v1.0 - */ -@Service -@Slf4j -public class RoomAgentOrderServiceImpl implements RoomAgentOrderService{ - - - @Resource - private RoomAgentOrderMapper roomAgentOrderMapper; - - - @Override - public RoomAgentOrderBO save(RoomAgentOrderBO roomAgentOrderBO) throws Exception{ - return roomAgentOrderBO; - } - - @Override - public Boolean delete(Long id) { - return false; - } - - @Override - public RoomAgentOrderBO getById(Long id) throws Exception { - return null; - } - - @Override - public List getAll() throws Exception { - return null; - } - - @Override - public RoomAgentOrderBO update(RoomAgentOrderBO roomAgentOrderBO) throws Exception { - return roomAgentOrderBO; - } - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service.impl/RoomAgentServiceImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service.impl/RoomAgentServiceImpl.java deleted file mode 100644 index 473127720a28fc9ba6de3397a267d6bc859295d0..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service.impl/RoomAgentServiceImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.lightsnail.schoolmanager.core.service.impl; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import javax.annotation.Resource; - -import com.lightsnail.schoolmanager.common.mapper.RoomAgentMapper; -import com.lightsnail.schoolmanager.core.service.RoomAgentService; -import com.lightsnail.schoolmanager.core.model.bo.RoomAgentBO; - -import java.util.List; - - -/** - * @Description:代理人表Service接口实现类 - * @Author：fanchunshuai - * @CreateTime：2021-06-25 23:24:09 - * @version v1.0 - */ -@Service -@Slf4j -public class RoomAgentServiceImpl implements RoomAgentService{ - - - @Resource - private RoomAgentMapper roomAgentMapper; - - - @Override - public RoomAgentBO save(RoomAgentBO roomAgentBO) throws Exception{ - return roomAgentBO; - } - - @Override - public Boolean delete(Long id) { - return false; - } - - @Override - public RoomAgentBO getById(Long id) throws Exception { - return null; - } - - @Override - public List getAll() throws Exception { - return null; - } - - @Override - public RoomAgentBO update(RoomAgentBO roomAgentBO) throws Exception { - return roomAgentBO; - } - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service.impl/RoomLandlordServiceImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service.impl/RoomLandlordServiceImpl.java deleted file mode 100644 index cecaf99d92db5d4e2e352ea512292d234a7593e6..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service.impl/RoomLandlordServiceImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.lightsnail.schoolmanager.core.service.impl; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import javax.annotation.Resource; - -import com.lightsnail.schoolmanager.common.mapper.RoomLandlordMapper; -import com.lightsnail.schoolmanager.core.service.RoomLandlordService; -import com.lightsnail.schoolmanager.core.model.bo.RoomLandlordBO; - -import java.util.List; - - -/** - * @Description:房东表Service接口实现类 - * @Author：fanchunshuai - * @CreateTime：2021-06-25 23:24:09 - * @version v1.0 - */ -@Service -@Slf4j -public class RoomLandlordServiceImpl implements RoomLandlordService{ - - - @Resource - private RoomLandlordMapper roomLandlordMapper; - - - @Override - public RoomLandlordBO save(RoomLandlordBO roomLandlordBO) throws Exception{ - return roomLandlordBO; - } - - @Override - public Boolean delete(Long id) { - return false; - } - - @Override - public RoomLandlordBO getById(Long id) throws Exception { - return null; - } - - @Override - public List getAll() throws Exception { - return null; - } - - @Override - public RoomLandlordBO update(RoomLandlordBO roomLandlordBO) throws Exception { - return roomLandlordBO; - } - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service.impl/RoomPublishServiceImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service.impl/RoomPublishServiceImpl.java deleted file mode 100644 index 00aba32505930277016211d7efa954fe98d859d6..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service.impl/RoomPublishServiceImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.lightsnail.schoolmanager.core.service.impl; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import javax.annotation.Resource; - -import com.lightsnail.schoolmanager.common.mapper.RoomPublishMapper; -import com.lightsnail.schoolmanager.core.service.RoomPublishService; -import com.lightsnail.schoolmanager.core.model.bo.RoomPublishBO; - -import java.util.List; - - -/** - * @Description:代理人-房源发布表Service接口实现类 - * @Author：fanchunshuai - * @CreateTime：2021-06-25 23:24:09 - * @version v1.0 - */ -@Service -@Slf4j -public class RoomPublishServiceImpl implements RoomPublishService{ - - - @Resource - private RoomPublishMapper roomPublishMapper; - - - @Override - public RoomPublishBO save(RoomPublishBO roomPublishBO) throws Exception{ - return roomPublishBO; - } - - @Override - public Boolean delete(Long id) { - return false; - } - - @Override - public RoomPublishBO getById(Long id) throws Exception { - return null; - } - - @Override - public List getAll() throws Exception { - return null; - } - - @Override - public RoomPublishBO update(RoomPublishBO roomPublishBO) throws Exception { - return roomPublishBO; - } - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service.impl/RoomSubscribeServiceImpl.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service.impl/RoomSubscribeServiceImpl.java deleted file mode 100644 index e279cb154fa5405b3e7dff6c22cac19953e7f752..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service.impl/RoomSubscribeServiceImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.lightsnail.schoolmanager.core.service.impl; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import javax.annotation.Resource; - -import com.lightsnail.schoolmanager.common.mapper.RoomSubscribeMapper; -import com.lightsnail.schoolmanager.core.service.RoomSubscribeService; -import com.lightsnail.schoolmanager.core.model.bo.RoomSubscribeBO; - -import java.util.List; - - -/** - * @Description:代理人-预约看房记录表Service接口实现类 - * @Author：fanchunshuai - * @CreateTime：2021-06-25 23:24:09 - * @version v1.0 - */ -@Service -@Slf4j -public class RoomSubscribeServiceImpl implements RoomSubscribeService{ - - - @Resource - private RoomSubscribeMapper roomSubscribeMapper; - - - @Override - public RoomSubscribeBO save(RoomSubscribeBO roomSubscribeBO) throws Exception{ - return roomSubscribeBO; - } - - @Override - public Boolean delete(Long id) { - return false; - } - - @Override - public RoomSubscribeBO getById(Long id) throws Exception { - return null; - } - - @Override - public List getAll() throws Exception { - return null; - } - - @Override - public RoomSubscribeBO update(RoomSubscribeBO roomSubscribeBO) throws Exception { - return roomSubscribeBO; - } - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service/AccountService.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service/AccountService.java deleted file mode 100644 index ace2f5b9b1b857a929f1be5320837ca6018abe98..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service/AccountService.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.lightsnail.schoolmanager.core.service; - -import java.util.List; - -import com.lightsnail.schoolmanager.core.model.bo.AccountBO; - -/** - * @Description:合作用户表Service接口 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 23:24:09 - * @version v1.0 - */ -public interface AccountService{ - - /** - * - * @Title: save - * @Description:新增 - * @author: - * @param @param dto - * @param @param userId - * @return AccountBO 返回类型 - * @throws - */ - public AccountBO save(AccountBO accountBO) throws Exception; - - /** - * - * @Title: delete - * @Description: 通过id删除数据 - * @author: - * @param @param id - * @return ResultDto 返回类型 - * @throws - */ - public Boolean delete(Long id); - - /** - * - * @Title: getById - * @Description: 通过id查询 - * @author: - * @param @param id - * @return AccountBO - * @throws - */ - public AccountBO getById(Long id) throws Exception; - - /** - * - * @Title: getAll - * @Description:查询所有数据 - * @author: - * @return List - * @throws - */ - public List getAll() throws Exception; - - /** - * - * @Title: update - * @Description:修改 - * @author: - * @param @param accountBO - * @return AccountBO - * @throws - */ - public AccountBO update(AccountBO accountBO) throws Exception; - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service/AttractInvestmentService.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service/AttractInvestmentService.java deleted file mode 100644 index 7d6113970338a028291ac71552af0c475610d000..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service/AttractInvestmentService.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.lightsnail.schoolmanager.core.service; - -import java.util.List; - -import com.lightsnail.schoolmanager.core.model.bo.AttractInvestmentBO; - -/** - * @Description:招商服务注册表Service接口 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 23:24:09 - * @version v1.0 - */ -public interface AttractInvestmentService{ - - /** - * - * @Title: save - * @Description:新增 - * @author: - * @param @param dto - * @param @param userId - * @return AttractInvestmentBO 返回类型 - * @throws - */ - public AttractInvestmentBO save(AttractInvestmentBO attractInvestmentBO) throws Exception; - - /** - * - * @Title: delete - * @Description: 通过id删除数据 - * @author: - * @param @param id - * @return ResultDto 返回类型 - * @throws - */ - public Boolean delete(Long id); - - /** - * - * @Title: getById - * @Description: 通过id查询 - * @author: - * @param @param id - * @return AttractInvestmentBO - * @throws - */ - public AttractInvestmentBO getById(Long id) throws Exception; - - /** - * - * @Title: getAll - * @Description:查询所有数据 - * @author: - * @return List - * @throws - */ - public List getAll() throws Exception; - - /** - * - * @Title: update - * @Description:修改 - * @author: - * @param @param attractInvestmentBO - * @return AttractInvestmentBO - * @throws - */ - public AttractInvestmentBO update(AttractInvestmentBO attractInvestmentBO) throws Exception; - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service/LandlordContractTemplateService.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service/LandlordContractTemplateService.java deleted file mode 100644 index e0186931f100db1f265904a43ebc7e49e7d62a67..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service/LandlordContractTemplateService.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.lightsnail.schoolmanager.core.service; - -import java.util.List; - -import com.lightsnail.schoolmanager.core.model.bo.LandlordContractTemplateBO; - -/** - * @Description:房东合同模板表Service接口 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 23:24:09 - * @version v1.0 - */ -public interface LandlordContractTemplateService{ - - /** - * - * @Title: save - * @Description:新增 - * @author: - * @param @param dto - * @param @param userId - * @return LandlordContractTemplateBO 返回类型 - * @throws - */ - public LandlordContractTemplateBO save(LandlordContractTemplateBO landlordContractTemplateBO) throws Exception; - - /** - * - * @Title: delete - * @Description: 通过id删除数据 - * @author: - * @param @param id - * @return ResultDto 返回类型 - * @throws - */ - public Boolean delete(Long id); - - /** - * - * @Title: getById - * @Description: 通过id查询 - * @author: - * @param @param id - * @return LandlordContractTemplateBO - * @throws - */ - public LandlordContractTemplateBO getById(Long id) throws Exception; - - /** - * - * @Title: getAll - * @Description:查询所有数据 - * @author: - * @return List - * @throws - */ - public List getAll() throws Exception; - - /** - * - * @Title: update - * @Description:修改 - * @author: - * @param @param landlordContractTemplateBO - * @return LandlordContractTemplateBO - * @throws - */ - public LandlordContractTemplateBO update(LandlordContractTemplateBO landlordContractTemplateBO) throws Exception; - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service/LandlordRoomRentRecordService.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service/LandlordRoomRentRecordService.java deleted file mode 100644 index 63f216cf8f3e0fb6a760a86d38b3192d298a37cc..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service/LandlordRoomRentRecordService.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.lightsnail.schoolmanager.core.service; - -import java.util.List; - -import com.lightsnail.schoolmanager.core.model.bo.LandlordRoomRentRecordBO; - -/** - * @Description:房源出租记录表Service接口 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 23:24:09 - * @version v1.0 - */ -public interface LandlordRoomRentRecordService{ - - /** - * - * @Title: save - * @Description:新增 - * @author: - * @param @param dto - * @param @param userId - * @return LandlordRoomRentRecordBO 返回类型 - * @throws - */ - public LandlordRoomRentRecordBO save(LandlordRoomRentRecordBO landlordRoomRentRecordBO) throws Exception; - - /** - * - * @Title: delete - * @Description: 通过id删除数据 - * @author: - * @param @param id - * @return ResultDto 返回类型 - * @throws - */ - public Boolean delete(Long id); - - /** - * - * @Title: getById - * @Description: 通过id查询 - * @author: - * @param @param id - * @return LandlordRoomRentRecordBO - * @throws - */ - public LandlordRoomRentRecordBO getById(Long id) throws Exception; - - /** - * - * @Title: getAll - * @Description:查询所有数据 - * @author: - * @return List - * @throws - */ - public List getAll() throws Exception; - - /** - * - * @Title: update - * @Description:修改 - * @author: - * @param @param landlordRoomRentRecordBO - * @return LandlordRoomRentRecordBO - * @throws - */ - public LandlordRoomRentRecordBO update(LandlordRoomRentRecordBO landlordRoomRentRecordBO) throws Exception; - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service/LandlordRoomSourceService.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service/LandlordRoomSourceService.java deleted file mode 100644 index 4896006b5b4bfa64a8aa2eed4a9e340b865d77a5..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service/LandlordRoomSourceService.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.lightsnail.schoolmanager.core.service; - -import java.util.List; - -import com.lightsnail.schoolmanager.core.model.bo.LandlordRoomSourceBO; - -/** - * @Description:房东-房源表Service接口 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 23:24:09 - * @version v1.0 - */ -public interface LandlordRoomSourceService{ - - /** - * - * @Title: save - * @Description:新增 - * @author: - * @param @param dto - * @param @param userId - * @return LandlordRoomSourceBO 返回类型 - * @throws - */ - public LandlordRoomSourceBO save(LandlordRoomSourceBO landlordRoomSourceBO) throws Exception; - - /** - * - * @Title: delete - * @Description: 通过id删除数据 - * @author: - * @param @param id - * @return ResultDto 返回类型 - * @throws - */ - public Boolean delete(Long id); - - /** - * - * @Title: getById - * @Description: 通过id查询 - * @author: - * @param @param id - * @return LandlordRoomSourceBO - * @throws - */ - public LandlordRoomSourceBO getById(Long id) throws Exception; - - /** - * - * @Title: getAll - * @Description:查询所有数据 - * @author: - * @return List - * @throws - */ - public List getAll() throws Exception; - - /** - * - * @Title: update - * @Description:修改 - * @author: - * @param @param landlordRoomSourceBO - * @return LandlordRoomSourceBO - * @throws - */ - public LandlordRoomSourceBO update(LandlordRoomSourceBO landlordRoomSourceBO) throws Exception; - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service/RealRoomSourceService.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service/RealRoomSourceService.java deleted file mode 100644 index e4dde696b677ac00f76f3bd1933ea2b07ca7dcc2..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service/RealRoomSourceService.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.lightsnail.schoolmanager.core.service; - -import java.util.List; - -import com.lightsnail.schoolmanager.core.model.bo.RealRoomSourceBO; - -/** - * @Description:房东-房源表Service接口 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 23:24:09 - * @version v1.0 - */ -public interface RealRoomSourceService{ - - /** - * - * @Title: save - * @Description:新增 - * @author: - * @param @param dto - * @param @param userId - * @return RealRoomSourceBO 返回类型 - * @throws - */ - public RealRoomSourceBO save(RealRoomSourceBO realRoomSourceBO) throws Exception; - - /** - * - * @Title: delete - * @Description: 通过id删除数据 - * @author: - * @param @param id - * @return ResultDto 返回类型 - * @throws - */ - public Boolean delete(Long id); - - /** - * - * @Title: getById - * @Description: 通过id查询 - * @author: - * @param @param id - * @return RealRoomSourceBO - * @throws - */ - public RealRoomSourceBO getById(Long id) throws Exception; - - /** - * - * @Title: getAll - * @Description:查询所有数据 - * @author: - * @return List - * @throws - */ - public List getAll() throws Exception; - - /** - * - * @Title: update - * @Description:修改 - * @author: - * @param @param realRoomSourceBO - * @return RealRoomSourceBO - * @throws - */ - public RealRoomSourceBO update(RealRoomSourceBO realRoomSourceBO) throws Exception; - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service/RoomAgentOrderService.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service/RoomAgentOrderService.java deleted file mode 100644 index b7bb61afd00334b3f0c9ea22b5666869059e826b..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service/RoomAgentOrderService.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.lightsnail.schoolmanager.core.service; - -import java.util.List; - -import com.lightsnail.schoolmanager.core.model.bo.RoomAgentOrderBO; - -/** - * @Description:代理人-签单表Service接口 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 23:24:09 - * @version v1.0 - */ -public interface RoomAgentOrderService{ - - /** - * - * @Title: save - * @Description:新增 - * @author: - * @param @param dto - * @param @param userId - * @return RoomAgentOrderBO 返回类型 - * @throws - */ - public RoomAgentOrderBO save(RoomAgentOrderBO roomAgentOrderBO) throws Exception; - - /** - * - * @Title: delete - * @Description: 通过id删除数据 - * @author: - * @param @param id - * @return ResultDto 返回类型 - * @throws - */ - public Boolean delete(Long id); - - /** - * - * @Title: getById - * @Description: 通过id查询 - * @author: - * @param @param id - * @return RoomAgentOrderBO - * @throws - */ - public RoomAgentOrderBO getById(Long id) throws Exception; - - /** - * - * @Title: getAll - * @Description:查询所有数据 - * @author: - * @return List - * @throws - */ - public List getAll() throws Exception; - - /** - * - * @Title: update - * @Description:修改 - * @author: - * @param @param roomAgentOrderBO - * @return RoomAgentOrderBO - * @throws - */ - public RoomAgentOrderBO update(RoomAgentOrderBO roomAgentOrderBO) throws Exception; - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service/RoomAgentService.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service/RoomAgentService.java deleted file mode 100644 index b186323241762c129e5a409583fce832b1551d9a..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service/RoomAgentService.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.lightsnail.schoolmanager.core.service; - -import java.util.List; - -import com.lightsnail.schoolmanager.core.model.bo.RoomAgentBO; - -/** - * @Description:代理人表Service接口 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 23:24:09 - * @version v1.0 - */ -public interface RoomAgentService{ - - /** - * - * @Title: save - * @Description:新增 - * @author: - * @param @param dto - * @param @param userId - * @return RoomAgentBO 返回类型 - * @throws - */ - public RoomAgentBO save(RoomAgentBO roomAgentBO) throws Exception; - - /** - * - * @Title: delete - * @Description: 通过id删除数据 - * @author: - * @param @param id - * @return ResultDto 返回类型 - * @throws - */ - public Boolean delete(Long id); - - /** - * - * @Title: getById - * @Description: 通过id查询 - * @author: - * @param @param id - * @return RoomAgentBO - * @throws - */ - public RoomAgentBO getById(Long id) throws Exception; - - /** - * - * @Title: getAll - * @Description:查询所有数据 - * @author: - * @return List - * @throws - */ - public List getAll() throws Exception; - - /** - * - * @Title: update - * @Description:修改 - * @author: - * @param @param roomAgentBO - * @return RoomAgentBO - * @throws - */ - public RoomAgentBO update(RoomAgentBO roomAgentBO) throws Exception; - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service/RoomLandlordService.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service/RoomLandlordService.java deleted file mode 100644 index 23a01cd544d956891b5c87cf566ce420fec4bfcd..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service/RoomLandlordService.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.lightsnail.schoolmanager.core.service; - -import java.util.List; - -import com.lightsnail.schoolmanager.core.model.bo.RoomLandlordBO; - -/** - * @Description:房东表Service接口 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 23:24:09 - * @version v1.0 - */ -public interface RoomLandlordService{ - - /** - * - * @Title: save - * @Description:新增 - * @author: - * @param @param dto - * @param @param userId - * @return RoomLandlordBO 返回类型 - * @throws - */ - public RoomLandlordBO save(RoomLandlordBO roomLandlordBO) throws Exception; - - /** - * - * @Title: delete - * @Description: 通过id删除数据 - * @author: - * @param @param id - * @return ResultDto 返回类型 - * @throws - */ - public Boolean delete(Long id); - - /** - * - * @Title: getById - * @Description: 通过id查询 - * @author: - * @param @param id - * @return RoomLandlordBO - * @throws - */ - public RoomLandlordBO getById(Long id) throws Exception; - - /** - * - * @Title: getAll - * @Description:查询所有数据 - * @author: - * @return List - * @throws - */ - public List getAll() throws Exception; - - /** - * - * @Title: update - * @Description:修改 - * @author: - * @param @param roomLandlordBO - * @return RoomLandlordBO - * @throws - */ - public RoomLandlordBO update(RoomLandlordBO roomLandlordBO) throws Exception; - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service/RoomPublishService.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service/RoomPublishService.java deleted file mode 100644 index 0fa55cdb12ffca80f39d70f2067e88ec5c625732..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service/RoomPublishService.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.lightsnail.schoolmanager.core.service; - -import java.util.List; - -import com.lightsnail.schoolmanager.core.model.bo.RoomPublishBO; - -/** - * @Description:代理人-房源发布表Service接口 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 23:24:09 - * @version v1.0 - */ -public interface RoomPublishService{ - - /** - * - * @Title: save - * @Description:新增 - * @author: - * @param @param dto - * @param @param userId - * @return RoomPublishBO 返回类型 - * @throws - */ - public RoomPublishBO save(RoomPublishBO roomPublishBO) throws Exception; - - /** - * - * @Title: delete - * @Description: 通过id删除数据 - * @author: - * @param @param id - * @return ResultDto 返回类型 - * @throws - */ - public Boolean delete(Long id); - - /** - * - * @Title: getById - * @Description: 通过id查询 - * @author: - * @param @param id - * @return RoomPublishBO - * @throws - */ - public RoomPublishBO getById(Long id) throws Exception; - - /** - * - * @Title: getAll - * @Description:查询所有数据 - * @author: - * @return List - * @throws - */ - public List getAll() throws Exception; - - /** - * - * @Title: update - * @Description:修改 - * @author: - * @param @param roomPublishBO - * @return RoomPublishBO - * @throws - */ - public RoomPublishBO update(RoomPublishBO roomPublishBO) throws Exception; - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service/RoomSubscribeService.java b/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service/RoomSubscribeService.java deleted file mode 100644 index 4c4ad9f0ada2116c808f5c05f2b984c904ff3caf..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/lightsnail/snailapp/usercrm/core/service/RoomSubscribeService.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.lightsnail.schoolmanager.core.service; - -import java.util.List; - -import com.lightsnail.schoolmanager.core.model.bo.RoomSubscribeBO; - -/** - * @Description:代理人-预约看房记录表Service接口 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 23:24:09 - * @version v1.0 - */ -public interface RoomSubscribeService{ - - /** - * - * @Title: save - * @Description:新增 - * @author: - * @param @param dto - * @param @param userId - * @return RoomSubscribeBO 返回类型 - * @throws - */ - public RoomSubscribeBO save(RoomSubscribeBO roomSubscribeBO) throws Exception; - - /** - * - * @Title: delete - * @Description: 通过id删除数据 - * @author: - * @param @param id - * @return ResultDto 返回类型 - * @throws - */ - public Boolean delete(Long id); - - /** - * - * @Title: getById - * @Description: 通过id查询 - * @author: - * @param @param id - * @return RoomSubscribeBO - * @throws - */ - public RoomSubscribeBO getById(Long id) throws Exception; - - /** - * - * @Title: getAll - * @Description:查询所有数据 - * @author: - * @return List - * @throws - */ - public List getAll() throws Exception; - - /** - * - * @Title: update - * @Description:修改 - * @author: - * @param @param roomSubscribeBO - * @return RoomSubscribeBO - * @throws - */ - public RoomSubscribeBO update(RoomSubscribeBO roomSubscribeBO) throws Exception; - -} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/test/java/com/coderman/infosys/authtest/AdminAuthorityFacadeTest.java b/codemaker-dubbo/dubbo-core/src/test/java/com/coderman/infosys/authtest/AdminAuthorityFacadeTest.java new file mode 100644 index 0000000000000000000000000000000000000000..2710ca23fc909106b6ab2eae0364045e8634917f --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/test/java/com/coderman/infosys/authtest/AdminAuthorityFacadeTest.java @@ -0,0 +1,102 @@ +package com.coderman.infosys.auth.core.test; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.infosys.auth.api.facade.AdminAuthorityFacade; +import com.coderman.infosys.auth.api.dto.AdminAuthorityDTO; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.utils.response.ResultDto; + +import com.coderman.infosys.auth.core.Application; + +import org.apache.dubbo.config.annotation.Reference; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.annotation.Rollback; +import org.springframework.test.context.junit4.AbstractTransactionalJUnit4SpringContextTests; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.transaction.annotation.Transactional; +import com.alibaba.fastjson.JSON; + +import org.junit.Test; +import org.junit.runner.RunWith; + +/** +* @Description:单元测试 +* @Author:fanchunshuai +* @CreateTime:2021-06-25 09:19:38 +* @version v1.0 +*/ +@RunWith(SpringJUnit4ClassRunner.class) +@SpringBootTest(classes = Application.class) +@Rollback +@Transactional +public class AdminAuthorityFacadeTest extends AbstractTransactionalJUnit4SpringContextTests{ + + protected Logger logger = LoggerFactory.getLogger(AdminAuthorityFacadeTest.class); + + @Reference(url = "") + private AdminAuthorityFacade adminAuthorityFacade; + + + /** + * @Description:测试新增行政数据权限 接口 + */ + @Test + public void testAdd(){ + //todo test code + AdminAuthorityDTO dto = new AdminAuthorityDTO(); + + + } + + /** + * @Description:测试修改行政数据权限 + */ + @Test + public void testUpdate(){ + //todo test code + AdminAuthorityDTO vo = new AdminAuthorityDTO(); + } + + /** + * @Description:测试删除根据id删除行政数据权限 + */ + @Test + public void testDelete(){ + //todo test code + long id = 1L; + } + + /** + * @Description:根据ID获取行政数据权限单条记录 + */ + @Test + public void testGetById(){ + //todo test code + } + + /** + * @Description:测试分页获取行政数据权限记录 + */ + @Test + public void getPage(){ + //todo test code + } + + /** + * @Description:测试禁用行政数据权限状态 + */ + @Test + public void testDisable(){ + //todo test code + } + /** + * @Description:测试启用行政数据权限状态 + */ + @Test + public void testEnable(){ + //todo test code + } +} diff --git a/codemaker-dubbo/dubbo-core/src/test/java/com/coderman/infosys/authtest/AuthorityFacadeTest.java b/codemaker-dubbo/dubbo-core/src/test/java/com/coderman/infosys/authtest/AuthorityFacadeTest.java new file mode 100644 index 0000000000000000000000000000000000000000..3f8fd91011902831dd93540839bd139c01c35723 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/test/java/com/coderman/infosys/authtest/AuthorityFacadeTest.java @@ -0,0 +1,102 @@ +package com.coderman.infosys.auth.core.test; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.infosys.auth.api.facade.AuthorityFacade; +import com.coderman.infosys.auth.api.dto.AuthorityDTO; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.utils.response.ResultDto; + +import com.coderman.infosys.auth.core.Application; + +import org.apache.dubbo.config.annotation.Reference; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.annotation.Rollback; +import org.springframework.test.context.junit4.AbstractTransactionalJUnit4SpringContextTests; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.transaction.annotation.Transactional; +import com.alibaba.fastjson.JSON; + +import org.junit.Test; +import org.junit.runner.RunWith; + +/** +* @Description:单元测试 +* @Author:fanchunshuai +* @CreateTime:2021-06-25 09:19:38 +* @version v1.0 +*/ +@RunWith(SpringJUnit4ClassRunner.class) +@SpringBootTest(classes = Application.class) +@Rollback +@Transactional +public class AuthorityFacadeTest extends AbstractTransactionalJUnit4SpringContextTests{ + + protected Logger logger = LoggerFactory.getLogger(AuthorityFacadeTest.class); + + @Reference(url = "") + private AuthorityFacade authorityFacade; + + + /** + * @Description:测试新增抽象权限表 接口 + */ + @Test + public void testAdd(){ + //todo test code + AuthorityDTO dto = new AuthorityDTO(); + + + } + + /** + * @Description:测试修改抽象权限表 + */ + @Test + public void testUpdate(){ + //todo test code + AuthorityDTO vo = new AuthorityDTO(); + } + + /** + * @Description:测试删除根据id删除抽象权限表 + */ + @Test + public void testDelete(){ + //todo test code + long id = 1L; + } + + /** + * @Description:根据ID获取抽象权限表单条记录 + */ + @Test + public void testGetById(){ + //todo test code + } + + /** + * @Description:测试分页获取抽象权限表记录 + */ + @Test + public void getPage(){ + //todo test code + } + + /** + * @Description:测试禁用抽象权限表状态 + */ + @Test + public void testDisable(){ + //todo test code + } + /** + * @Description:测试启用抽象权限表状态 + */ + @Test + public void testEnable(){ + //todo test code + } +} diff --git a/codemaker-dubbo/dubbo-core/src/test/java/com/coderman/infosys/authtest/DataAuthorityFacadeTest.java b/codemaker-dubbo/dubbo-core/src/test/java/com/coderman/infosys/authtest/DataAuthorityFacadeTest.java new file mode 100644 index 0000000000000000000000000000000000000000..be14c566214167cfabd7d84353165c44b1b9aca1 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/test/java/com/coderman/infosys/authtest/DataAuthorityFacadeTest.java @@ -0,0 +1,102 @@ +package com.coderman.infosys.auth.core.test; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.infosys.auth.api.facade.DataAuthorityFacade; +import com.coderman.infosys.auth.api.dto.DataAuthorityDTO; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.utils.response.ResultDto; + +import com.coderman.infosys.auth.core.Application; + +import org.apache.dubbo.config.annotation.Reference; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.annotation.Rollback; +import org.springframework.test.context.junit4.AbstractTransactionalJUnit4SpringContextTests; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.transaction.annotation.Transactional; +import com.alibaba.fastjson.JSON; + +import org.junit.Test; +import org.junit.runner.RunWith; + +/** +* @Description:单元测试 +* @Author:fanchunshuai +* @CreateTime:2021-06-25 09:19:38 +* @version v1.0 +*/ +@RunWith(SpringJUnit4ClassRunner.class) +@SpringBootTest(classes = Application.class) +@Rollback +@Transactional +public class DataAuthorityFacadeTest extends AbstractTransactionalJUnit4SpringContextTests{ + + protected Logger logger = LoggerFactory.getLogger(DataAuthorityFacadeTest.class); + + @Reference(url = "") + private DataAuthorityFacade dataAuthorityFacade; + + + /** + * @Description:测试新增数据字段权限 接口 + */ + @Test + public void testAdd(){ + //todo test code + DataAuthorityDTO dto = new DataAuthorityDTO(); + + + } + + /** + * @Description:测试修改数据字段权限 + */ + @Test + public void testUpdate(){ + //todo test code + DataAuthorityDTO vo = new DataAuthorityDTO(); + } + + /** + * @Description:测试删除根据id删除数据字段权限 + */ + @Test + public void testDelete(){ + //todo test code + long id = 1L; + } + + /** + * @Description:根据ID获取数据字段权限单条记录 + */ + @Test + public void testGetById(){ + //todo test code + } + + /** + * @Description:测试分页获取数据字段权限记录 + */ + @Test + public void getPage(){ + //todo test code + } + + /** + * @Description:测试禁用数据字段权限状态 + */ + @Test + public void testDisable(){ + //todo test code + } + /** + * @Description:测试启用数据字段权限状态 + */ + @Test + public void testEnable(){ + //todo test code + } +} diff --git a/codemaker-dubbo/dubbo-core/src/test/java/com/coderman/infosys/authtest/DataColumnConfigFacadeTest.java b/codemaker-dubbo/dubbo-core/src/test/java/com/coderman/infosys/authtest/DataColumnConfigFacadeTest.java new file mode 100644 index 0000000000000000000000000000000000000000..7bc39bb00fdc5eefa57ab7ad59ad6fe02ae5e9e6 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/test/java/com/coderman/infosys/authtest/DataColumnConfigFacadeTest.java @@ -0,0 +1,102 @@ +package com.coderman.infosys.auth.core.test; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.infosys.auth.api.facade.DataColumnConfigFacade; +import com.coderman.infosys.auth.api.dto.DataColumnConfigDTO; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.utils.response.ResultDto; + +import com.coderman.infosys.auth.core.Application; + +import org.apache.dubbo.config.annotation.Reference; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.annotation.Rollback; +import org.springframework.test.context.junit4.AbstractTransactionalJUnit4SpringContextTests; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.transaction.annotation.Transactional; +import com.alibaba.fastjson.JSON; + +import org.junit.Test; +import org.junit.runner.RunWith; + +/** +* @Description:单元测试 +* @Author:fanchunshuai +* @CreateTime:2021-06-25 09:19:38 +* @version v1.0 +*/ +@RunWith(SpringJUnit4ClassRunner.class) +@SpringBootTest(classes = Application.class) +@Rollback +@Transactional +public class DataColumnConfigFacadeTest extends AbstractTransactionalJUnit4SpringContextTests{ + + protected Logger logger = LoggerFactory.getLogger(DataColumnConfigFacadeTest.class); + + @Reference(url = "") + private DataColumnConfigFacade dataColumnConfigFacade; + + + /** + * @Description:测试新增数据字段管理表 接口 + */ + @Test + public void testAdd(){ + //todo test code + DataColumnConfigDTO dto = new DataColumnConfigDTO(); + + + } + + /** + * @Description:测试修改数据字段管理表 + */ + @Test + public void testUpdate(){ + //todo test code + DataColumnConfigDTO vo = new DataColumnConfigDTO(); + } + + /** + * @Description:测试删除根据id删除数据字段管理表 + */ + @Test + public void testDelete(){ + //todo test code + long id = 1L; + } + + /** + * @Description:根据ID获取数据字段管理表单条记录 + */ + @Test + public void testGetById(){ + //todo test code + } + + /** + * @Description:测试分页获取数据字段管理表记录 + */ + @Test + public void getPage(){ + //todo test code + } + + /** + * @Description:测试禁用数据字段管理表状态 + */ + @Test + public void testDisable(){ + //todo test code + } + /** + * @Description:测试启用数据字段管理表状态 + */ + @Test + public void testEnable(){ + //todo test code + } +} diff --git a/codemaker-dubbo/dubbo-core/src/test/java/com/lightsnail/schoolmanager/core/test/StudentFacadeTest.java b/codemaker-dubbo/dubbo-core/src/test/java/com/coderman/infosys/authtest/MenuFacadeTest.java similarity index 63% rename from codemaker-dubbo/dubbo-core/src/test/java/com/lightsnail/schoolmanager/core/test/StudentFacadeTest.java rename to codemaker-dubbo/dubbo-core/src/test/java/com/coderman/infosys/authtest/MenuFacadeTest.java index d6e1703c4b1c42598713da200de572babe6d7e69..3df2a46861a96355735368f6faaf310b0766df65 100644 --- a/codemaker-dubbo/dubbo-core/src/test/java/com/lightsnail/schoolmanager/core/test/StudentFacadeTest.java +++ b/codemaker-dubbo/dubbo-core/src/test/java/com/coderman/infosys/authtest/MenuFacadeTest.java @@ -1,15 +1,15 @@ -package com.lightsnail.schoolmanager.core.test; +package com.coderman.infosys.auth.core.test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.lightsnail.schoolmanager.api.facade.StudentFacade; -import com.lightsnail.schoolmanager.api.dto.StudentDTO; +import com.coderman.infosys.auth.api.facade.MenuFacade; +import com.coderman.infosys.auth.api.dto.MenuDTO; import com.coderman.utils.response.ResultDataDto; import com.coderman.utils.response.ResultDto; -import com.lightsnail.schoolmanager.core.Application; +import com.coderman.infosys.auth.core.Application; import org.apache.dubbo.config.annotation.Reference; import org.springframework.boot.test.context.SpringBootTest; @@ -32,36 +32,36 @@ import org.junit.runner.RunWith; @SpringBootTest(classes = Application.class) @Rollback @Transactional -public class StudentFacadeTest extends AbstractTransactionalJUnit4SpringContextTests{ +public class MenuFacadeTest extends AbstractTransactionalJUnit4SpringContextTests{ - protected Logger logger = LoggerFactory.getLogger(StudentFacadeTest.class); + protected Logger logger = LoggerFactory.getLogger(MenuFacadeTest.class); @Reference(url = "") - private StudentFacade studentFacade; + private MenuFacade menuFacade; /** - * @Description:测试新增 接口 + * @Description:测试新增按钮表 接口 */ @Test public void testAdd(){ //todo test code - StudentDTO dto = new StudentDTO(); + MenuDTO dto = new MenuDTO(); } /** - * @Description:测试修改 + * @Description:测试修改按钮表 */ @Test public void testUpdate(){ //todo test code - StudentDTO vo = new StudentDTO(); + MenuDTO vo = new MenuDTO(); } /** - * @Description:测试删除根据id删除 + * @Description:测试删除根据id删除按钮表 */ @Test public void testDelete(){ @@ -70,7 +70,7 @@ public class StudentFacadeTest extends AbstractTransactionalJUnit4SpringContextT } /** - * @Description:根据ID获取单条记录 + * @Description:根据ID获取按钮表单条记录 */ @Test public void testGetById(){ @@ -78,7 +78,7 @@ public class StudentFacadeTest extends AbstractTransactionalJUnit4SpringContextT } /** - * @Description:测试分页获取记录 + * @Description:测试分页获取按钮表记录 */ @Test public void getPage(){ @@ -86,14 +86,14 @@ public class StudentFacadeTest extends AbstractTransactionalJUnit4SpringContextT } /** - * @Description:测试禁用状态 + * @Description:测试禁用按钮表状态 */ @Test public void testDisable(){ //todo test code } /** - * @Description:测试启用状态 + * @Description:测试启用按钮表状态 */ @Test public void testEnable(){ diff --git a/codemaker-dubbo/dubbo-core/src/test/java/com/coderman/infosys/authtest/ModuleFacadeTest.java b/codemaker-dubbo/dubbo-core/src/test/java/com/coderman/infosys/authtest/ModuleFacadeTest.java new file mode 100644 index 0000000000000000000000000000000000000000..2150995b06f15a4db14792271933949b0ca57104 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/test/java/com/coderman/infosys/authtest/ModuleFacadeTest.java @@ -0,0 +1,102 @@ +package com.coderman.infosys.auth.core.test; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.infosys.auth.api.facade.ModuleFacade; +import com.coderman.infosys.auth.api.dto.ModuleDTO; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.utils.response.ResultDto; + +import com.coderman.infosys.auth.core.Application; + +import org.apache.dubbo.config.annotation.Reference; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.annotation.Rollback; +import org.springframework.test.context.junit4.AbstractTransactionalJUnit4SpringContextTests; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.transaction.annotation.Transactional; +import com.alibaba.fastjson.JSON; + +import org.junit.Test; +import org.junit.runner.RunWith; + +/** +* @Description:单元测试 +* @Author:fanchunshuai +* @CreateTime:2021-06-25 09:19:38 +* @version v1.0 +*/ +@RunWith(SpringJUnit4ClassRunner.class) +@SpringBootTest(classes = Application.class) +@Rollback +@Transactional +public class ModuleFacadeTest extends AbstractTransactionalJUnit4SpringContextTests{ + + protected Logger logger = LoggerFactory.getLogger(ModuleFacadeTest.class); + + @Reference(url = "") + private ModuleFacade moduleFacade; + + + /** + * @Description:测试新增菜单模块表 接口 + */ + @Test + public void testAdd(){ + //todo test code + ModuleDTO dto = new ModuleDTO(); + + + } + + /** + * @Description:测试修改菜单模块表 + */ + @Test + public void testUpdate(){ + //todo test code + ModuleDTO vo = new ModuleDTO(); + } + + /** + * @Description:测试删除根据id删除菜单模块表 + */ + @Test + public void testDelete(){ + //todo test code + long id = 1L; + } + + /** + * @Description:根据ID获取菜单模块表单条记录 + */ + @Test + public void testGetById(){ + //todo test code + } + + /** + * @Description:测试分页获取菜单模块表记录 + */ + @Test + public void getPage(){ + //todo test code + } + + /** + * @Description:测试禁用菜单模块表状态 + */ + @Test + public void testDisable(){ + //todo test code + } + /** + * @Description:测试启用菜单模块表状态 + */ + @Test + public void testEnable(){ + //todo test code + } +} diff --git a/codemaker-dubbo/dubbo-core/src/test/java/com/lightsnail/schoolmanager/core/test/TeacherFacadeTest.java b/codemaker-dubbo/dubbo-core/src/test/java/com/coderman/infosys/authtest/RoleFacadeTest.java similarity index 63% rename from codemaker-dubbo/dubbo-core/src/test/java/com/lightsnail/schoolmanager/core/test/TeacherFacadeTest.java rename to codemaker-dubbo/dubbo-core/src/test/java/com/coderman/infosys/authtest/RoleFacadeTest.java index 831edf8fec1610e893cdb0799095538c71433b86..e7fe7668fb265daa8033883ead83b4cac9ba4720 100644 --- a/codemaker-dubbo/dubbo-core/src/test/java/com/lightsnail/schoolmanager/core/test/TeacherFacadeTest.java +++ b/codemaker-dubbo/dubbo-core/src/test/java/com/coderman/infosys/authtest/RoleFacadeTest.java @@ -1,15 +1,15 @@ -package com.lightsnail.schoolmanager.core.test; +package com.coderman.infosys.auth.core.test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.lightsnail.schoolmanager.api.facade.TeacherFacade; -import com.lightsnail.schoolmanager.api.dto.TeacherDTO; +import com.coderman.infosys.auth.api.facade.RoleFacade; +import com.coderman.infosys.auth.api.dto.RoleDTO; import com.coderman.utils.response.ResultDataDto; import com.coderman.utils.response.ResultDto; -import com.lightsnail.schoolmanager.core.Application; +import com.coderman.infosys.auth.core.Application; import org.apache.dubbo.config.annotation.Reference; import org.springframework.boot.test.context.SpringBootTest; @@ -32,36 +32,36 @@ import org.junit.runner.RunWith; @SpringBootTest(classes = Application.class) @Rollback @Transactional -public class TeacherFacadeTest extends AbstractTransactionalJUnit4SpringContextTests{ +public class RoleFacadeTest extends AbstractTransactionalJUnit4SpringContextTests{ - protected Logger logger = LoggerFactory.getLogger(TeacherFacadeTest.class); + protected Logger logger = LoggerFactory.getLogger(RoleFacadeTest.class); @Reference(url = "") - private TeacherFacade teacherFacade; + private RoleFacade roleFacade; /** - * @Description:测试新增 接口 + * @Description:测试新增角色表 接口 */ @Test public void testAdd(){ //todo test code - TeacherDTO dto = new TeacherDTO(); + RoleDTO dto = new RoleDTO(); } /** - * @Description:测试修改 + * @Description:测试修改角色表 */ @Test public void testUpdate(){ //todo test code - TeacherDTO vo = new TeacherDTO(); + RoleDTO vo = new RoleDTO(); } /** - * @Description:测试删除根据id删除 + * @Description:测试删除根据id删除角色表 */ @Test public void testDelete(){ @@ -70,7 +70,7 @@ public class TeacherFacadeTest extends AbstractTransactionalJUnit4SpringContextT } /** - * @Description:根据ID获取单条记录 + * @Description:根据ID获取角色表单条记录 */ @Test public void testGetById(){ @@ -78,7 +78,7 @@ public class TeacherFacadeTest extends AbstractTransactionalJUnit4SpringContextT } /** - * @Description:测试分页获取记录 + * @Description:测试分页获取角色表记录 */ @Test public void getPage(){ @@ -86,14 +86,14 @@ public class TeacherFacadeTest extends AbstractTransactionalJUnit4SpringContextT } /** - * @Description:测试禁用状态 + * @Description:测试禁用角色表状态 */ @Test public void testDisable(){ //todo test code } /** - * @Description:测试启用状态 + * @Description:测试启用角色表状态 */ @Test public void testEnable(){ diff --git a/codemaker-dubbo/dubbo-core/src/test/java/com/lightsnail/schoolmanager/core/test/ClassTeacherFacadeTest.java b/codemaker-dubbo/dubbo-core/src/test/java/com/coderman/infosys/authtest/RoleGroupFacadeTest.java similarity index 62% rename from codemaker-dubbo/dubbo-core/src/test/java/com/lightsnail/schoolmanager/core/test/ClassTeacherFacadeTest.java rename to codemaker-dubbo/dubbo-core/src/test/java/com/coderman/infosys/authtest/RoleGroupFacadeTest.java index 032646eac0e970e219c0f32cfdd4e0cd22a3d355..82b6aeeeb4c7e4e3b2c6c6c6989dcea2f4a211e8 100644 --- a/codemaker-dubbo/dubbo-core/src/test/java/com/lightsnail/schoolmanager/core/test/ClassTeacherFacadeTest.java +++ b/codemaker-dubbo/dubbo-core/src/test/java/com/coderman/infosys/authtest/RoleGroupFacadeTest.java @@ -1,15 +1,15 @@ -package com.lightsnail.schoolmanager.core.test; +package com.coderman.infosys.auth.core.test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.lightsnail.schoolmanager.api.facade.ClassTeacherFacade; -import com.lightsnail.schoolmanager.api.dto.ClassTeacherDTO; +import com.coderman.infosys.auth.api.facade.RoleGroupFacade; +import com.coderman.infosys.auth.api.dto.RoleGroupDTO; import com.coderman.utils.response.ResultDataDto; import com.coderman.utils.response.ResultDto; -import com.lightsnail.schoolmanager.core.Application; +import com.coderman.infosys.auth.core.Application; import org.apache.dubbo.config.annotation.Reference; import org.springframework.boot.test.context.SpringBootTest; @@ -32,36 +32,36 @@ import org.junit.runner.RunWith; @SpringBootTest(classes = Application.class) @Rollback @Transactional -public class ClassTeacherFacadeTest extends AbstractTransactionalJUnit4SpringContextTests{ +public class RoleGroupFacadeTest extends AbstractTransactionalJUnit4SpringContextTests{ - protected Logger logger = LoggerFactory.getLogger(ClassTeacherFacadeTest.class); + protected Logger logger = LoggerFactory.getLogger(RoleGroupFacadeTest.class); @Reference(url = "") - private ClassTeacherFacade classTeacherFacade; + private RoleGroupFacade roleGroupFacade; /** - * @Description:测试新增 接口 + * @Description:测试新增角色组 接口 */ @Test public void testAdd(){ //todo test code - ClassTeacherDTO dto = new ClassTeacherDTO(); + RoleGroupDTO dto = new RoleGroupDTO(); } /** - * @Description:测试修改 + * @Description:测试修改角色组 */ @Test public void testUpdate(){ //todo test code - ClassTeacherDTO vo = new ClassTeacherDTO(); + RoleGroupDTO vo = new RoleGroupDTO(); } /** - * @Description:测试删除根据id删除 + * @Description:测试删除根据id删除角色组 */ @Test public void testDelete(){ @@ -70,7 +70,7 @@ public class ClassTeacherFacadeTest extends AbstractTransactionalJUnit4SpringCon } /** - * @Description:根据ID获取单条记录 + * @Description:根据ID获取角色组单条记录 */ @Test public void testGetById(){ @@ -78,7 +78,7 @@ public class ClassTeacherFacadeTest extends AbstractTransactionalJUnit4SpringCon } /** - * @Description:测试分页获取记录 + * @Description:测试分页获取角色组记录 */ @Test public void getPage(){ @@ -86,14 +86,14 @@ public class ClassTeacherFacadeTest extends AbstractTransactionalJUnit4SpringCon } /** - * @Description:测试禁用状态 + * @Description:测试禁用角色组状态 */ @Test public void testDisable(){ //todo test code } /** - * @Description:测试启用状态 + * @Description:测试启用角色组状态 */ @Test public void testEnable(){ diff --git a/codemaker-dubbo/dubbo-core/src/test/java/com/coderman/infosys/authtest/SystemAuthorityFacadeTest.java b/codemaker-dubbo/dubbo-core/src/test/java/com/coderman/infosys/authtest/SystemAuthorityFacadeTest.java new file mode 100644 index 0000000000000000000000000000000000000000..5e16a012018f01d766b4a436cb70a20f69b9df63 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/test/java/com/coderman/infosys/authtest/SystemAuthorityFacadeTest.java @@ -0,0 +1,102 @@ +package com.coderman.infosys.auth.core.test; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.infosys.auth.api.facade.SystemAuthorityFacade; +import com.coderman.infosys.auth.api.dto.SystemAuthorityDTO; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.utils.response.ResultDto; + +import com.coderman.infosys.auth.core.Application; + +import org.apache.dubbo.config.annotation.Reference; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.annotation.Rollback; +import org.springframework.test.context.junit4.AbstractTransactionalJUnit4SpringContextTests; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.transaction.annotation.Transactional; +import com.alibaba.fastjson.JSON; + +import org.junit.Test; +import org.junit.runner.RunWith; + +/** +* @Description:单元测试 +* @Author:fanchunshuai +* @CreateTime:2021-06-25 09:19:38 +* @version v1.0 +*/ +@RunWith(SpringJUnit4ClassRunner.class) +@SpringBootTest(classes = Application.class) +@Rollback +@Transactional +public class SystemAuthorityFacadeTest extends AbstractTransactionalJUnit4SpringContextTests{ + + protected Logger logger = LoggerFactory.getLogger(SystemAuthorityFacadeTest.class); + + @Reference(url = "") + private SystemAuthorityFacade systemAuthorityFacade; + + + /** + * @Description:测试新增系统菜单权限表 接口 + */ + @Test + public void testAdd(){ + //todo test code + SystemAuthorityDTO dto = new SystemAuthorityDTO(); + + + } + + /** + * @Description:测试修改系统菜单权限表 + */ + @Test + public void testUpdate(){ + //todo test code + SystemAuthorityDTO vo = new SystemAuthorityDTO(); + } + + /** + * @Description:测试删除根据id删除系统菜单权限表 + */ + @Test + public void testDelete(){ + //todo test code + long id = 1L; + } + + /** + * @Description:根据ID获取系统菜单权限表单条记录 + */ + @Test + public void testGetById(){ + //todo test code + } + + /** + * @Description:测试分页获取系统菜单权限表记录 + */ + @Test + public void getPage(){ + //todo test code + } + + /** + * @Description:测试禁用系统菜单权限表状态 + */ + @Test + public void testDisable(){ + //todo test code + } + /** + * @Description:测试启用系统菜单权限表状态 + */ + @Test + public void testEnable(){ + //todo test code + } +} diff --git a/codemaker-dubbo/dubbo-core/src/test/java/com/lightsnail/schoolmanager/core/test/ClassFacadeTest.java b/codemaker-dubbo/dubbo-core/src/test/java/com/coderman/infosys/authtest/SystemFacadeTest.java similarity index 63% rename from codemaker-dubbo/dubbo-core/src/test/java/com/lightsnail/schoolmanager/core/test/ClassFacadeTest.java rename to codemaker-dubbo/dubbo-core/src/test/java/com/coderman/infosys/authtest/SystemFacadeTest.java index d8b0d2c2c76e5086adf379f2a96a529b7b185932..80cba05d944965c9b1db82179ba7b4da59eedca5 100644 --- a/codemaker-dubbo/dubbo-core/src/test/java/com/lightsnail/schoolmanager/core/test/ClassFacadeTest.java +++ b/codemaker-dubbo/dubbo-core/src/test/java/com/coderman/infosys/authtest/SystemFacadeTest.java @@ -1,15 +1,15 @@ -package com.lightsnail.schoolmanager.core.test; +package com.coderman.infosys.auth.core.test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.lightsnail.schoolmanager.api.facade.ClassFacade; -import com.lightsnail.schoolmanager.api.dto.ClassDTO; +import com.coderman.infosys.auth.api.facade.SystemFacade; +import com.coderman.infosys.auth.api.dto.SystemDTO; import com.coderman.utils.response.ResultDataDto; import com.coderman.utils.response.ResultDto; -import com.lightsnail.schoolmanager.core.Application; +import com.coderman.infosys.auth.core.Application; import org.apache.dubbo.config.annotation.Reference; import org.springframework.boot.test.context.SpringBootTest; @@ -32,36 +32,36 @@ import org.junit.runner.RunWith; @SpringBootTest(classes = Application.class) @Rollback @Transactional -public class ClassFacadeTest extends AbstractTransactionalJUnit4SpringContextTests{ +public class SystemFacadeTest extends AbstractTransactionalJUnit4SpringContextTests{ - protected Logger logger = LoggerFactory.getLogger(ClassFacadeTest.class); + protected Logger logger = LoggerFactory.getLogger(SystemFacadeTest.class); @Reference(url = "") - private ClassFacade classFacade; + private SystemFacade systemFacade; /** - * @Description:测试新增 接口 + * @Description:测试新增系统表 接口 */ @Test public void testAdd(){ //todo test code - ClassDTO dto = new ClassDTO(); + SystemDTO dto = new SystemDTO(); } /** - * @Description:测试修改 + * @Description:测试修改系统表 */ @Test public void testUpdate(){ //todo test code - ClassDTO vo = new ClassDTO(); + SystemDTO vo = new SystemDTO(); } /** - * @Description:测试删除根据id删除 + * @Description:测试删除根据id删除系统表 */ @Test public void testDelete(){ @@ -70,7 +70,7 @@ public class ClassFacadeTest extends AbstractTransactionalJUnit4SpringContextTes } /** - * @Description:根据ID获取单条记录 + * @Description:根据ID获取系统表单条记录 */ @Test public void testGetById(){ @@ -78,7 +78,7 @@ public class ClassFacadeTest extends AbstractTransactionalJUnit4SpringContextTes } /** - * @Description:测试分页获取记录 + * @Description:测试分页获取系统表记录 */ @Test public void getPage(){ @@ -86,14 +86,14 @@ public class ClassFacadeTest extends AbstractTransactionalJUnit4SpringContextTes } /** - * @Description:测试禁用状态 + * @Description:测试禁用系统表状态 */ @Test public void testDisable(){ //todo test code } /** - * @Description:测试启用状态 + * @Description:测试启用系统表状态 */ @Test public void testEnable(){ diff --git a/codemaker-dubbo/dubbo-core/src/test/java/com/coderman/infosys/authtest/UserGroupFacadeTest.java b/codemaker-dubbo/dubbo-core/src/test/java/com/coderman/infosys/authtest/UserGroupFacadeTest.java new file mode 100644 index 0000000000000000000000000000000000000000..ad394fe0b49b1a99a0a7e94176493879b180f447 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/test/java/com/coderman/infosys/authtest/UserGroupFacadeTest.java @@ -0,0 +1,102 @@ +package com.coderman.infosys.auth.core.test; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.infosys.auth.api.facade.UserGroupFacade; +import com.coderman.infosys.auth.api.dto.UserGroupDTO; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.utils.response.ResultDto; + +import com.coderman.infosys.auth.core.Application; + +import org.apache.dubbo.config.annotation.Reference; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.annotation.Rollback; +import org.springframework.test.context.junit4.AbstractTransactionalJUnit4SpringContextTests; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.transaction.annotation.Transactional; +import com.alibaba.fastjson.JSON; + +import org.junit.Test; +import org.junit.runner.RunWith; + +/** +* @Description:单元测试 +* @Author:fanchunshuai +* @CreateTime:2021-06-25 09:19:38 +* @version v1.0 +*/ +@RunWith(SpringJUnit4ClassRunner.class) +@SpringBootTest(classes = Application.class) +@Rollback +@Transactional +public class UserGroupFacadeTest extends AbstractTransactionalJUnit4SpringContextTests{ + + protected Logger logger = LoggerFactory.getLogger(UserGroupFacadeTest.class); + + @Reference(url = "") + private UserGroupFacade userGroupFacade; + + + /** + * @Description:测试新增用户组 接口 + */ + @Test + public void testAdd(){ + //todo test code + UserGroupDTO dto = new UserGroupDTO(); + + + } + + /** + * @Description:测试修改用户组 + */ + @Test + public void testUpdate(){ + //todo test code + UserGroupDTO vo = new UserGroupDTO(); + } + + /** + * @Description:测试删除根据id删除用户组 + */ + @Test + public void testDelete(){ + //todo test code + long id = 1L; + } + + /** + * @Description:根据ID获取用户组单条记录 + */ + @Test + public void testGetById(){ + //todo test code + } + + /** + * @Description:测试分页获取用户组记录 + */ + @Test + public void getPage(){ + //todo test code + } + + /** + * @Description:测试禁用用户组状态 + */ + @Test + public void testDisable(){ + //todo test code + } + /** + * @Description:测试启用用户组状态 + */ + @Test + public void testEnable(){ + //todo test code + } +} diff --git a/codemaker-dubbo/dubbo-core/src/test/java/com/coderman/infosys/authtest/UserRoleMappingFacadeTest.java b/codemaker-dubbo/dubbo-core/src/test/java/com/coderman/infosys/authtest/UserRoleMappingFacadeTest.java new file mode 100644 index 0000000000000000000000000000000000000000..3b1d96d7c5b08d530bbd25b614af825522d4c859 --- /dev/null +++ b/codemaker-dubbo/dubbo-core/src/test/java/com/coderman/infosys/authtest/UserRoleMappingFacadeTest.java @@ -0,0 +1,102 @@ +package com.coderman.infosys.auth.core.test; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.infosys.auth.api.facade.UserRoleMappingFacade; +import com.coderman.infosys.auth.api.dto.UserRoleMappingDTO; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.utils.response.ResultDto; + +import com.coderman.infosys.auth.core.Application; + +import org.apache.dubbo.config.annotation.Reference; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.annotation.Rollback; +import org.springframework.test.context.junit4.AbstractTransactionalJUnit4SpringContextTests; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.transaction.annotation.Transactional; +import com.alibaba.fastjson.JSON; + +import org.junit.Test; +import org.junit.runner.RunWith; + +/** +* @Description:单元测试 +* @Author:fanchunshuai +* @CreateTime:2021-06-25 09:19:38 +* @version v1.0 +*/ +@RunWith(SpringJUnit4ClassRunner.class) +@SpringBootTest(classes = Application.class) +@Rollback +@Transactional +public class UserRoleMappingFacadeTest extends AbstractTransactionalJUnit4SpringContextTests{ + + protected Logger logger = LoggerFactory.getLogger(UserRoleMappingFacadeTest.class); + + @Reference(url = "") + private UserRoleMappingFacade userRoleMappingFacade; + + + /** + * @Description:测试新增用户角色关联表 接口 + */ + @Test + public void testAdd(){ + //todo test code + UserRoleMappingDTO dto = new UserRoleMappingDTO(); + + + } + + /** + * @Description:测试修改用户角色关联表 + */ + @Test + public void testUpdate(){ + //todo test code + UserRoleMappingDTO vo = new UserRoleMappingDTO(); + } + + /** + * @Description:测试删除根据id删除用户角色关联表 + */ + @Test + public void testDelete(){ + //todo test code + long id = 1L; + } + + /** + * @Description:根据ID获取用户角色关联表单条记录 + */ + @Test + public void testGetById(){ + //todo test code + } + + /** + * @Description:测试分页获取用户角色关联表记录 + */ + @Test + public void getPage(){ + //todo test code + } + + /** + * @Description:测试禁用用户角色关联表状态 + */ + @Test + public void testDisable(){ + //todo test code + } + /** + * @Description:测试启用用户角色关联表状态 + */ + @Test + public void testEnable(){ + //todo test code + } +} diff --git a/codemaker-springboot/pom.xml b/codemaker-springboot/pom.xml index 5fd5df454021e836754dc7a8471972886d7db9f0..f96af0074b95dcc3ca41ad4a26d4074c0d1b40fa 100644 --- a/codemaker-springboot/pom.xml +++ b/codemaker-springboot/pom.xml @@ -159,7 +159,7 @@ com.coderman.utils coderman-utils - 1.0.2-SNAPSHOT + 1.0.4-SNAPSHOT org.projectlombok @@ -184,7 +184,24 @@ - + + + aliyun-releases + 阿里云仓库 + https://maven.aliyun.com/repository/public + + + apache.snapshots.https + Apache Development Snapshot Repository + https://repository.apache.org/content/repositories/snapshots + + false + + + true + + + diff --git a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/Application.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/Application.java similarity index 51% rename from codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/Application.java rename to codemaker-springboot/src/main/java/com/coderman/infosys/auth/Application.java index 841ed4e7eed30009945b287c6e7100cdbbe6cf97..13b0524cd63bdb0de41be085d0728a9f92464e97 100644 --- a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/Application.java +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/Application.java @@ -1,4 +1,4 @@ -package com.lightsnail.schoolmanager; +package com.coderman.infosys.auth; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -7,32 +7,20 @@ import org.slf4j.LoggerFactory; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.cloud.client.loadbalancer.LoadBalanced; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; -import org.springframework.web.client.RestTemplate; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; /** * @Description:应用启动入口 -* @Author:fanchunshuai -* @CreateTime:2021-06-25 16:08:54 +* @Author:shenshuai +* @CreateTime:2021-11-06 23:38:07 * @version v1.0 */ @SpringBootApplication(exclude = DataSourceAutoConfiguration.class) -@EnableDiscoveryClient -@ComponentScan({"com.lightsnail.**","com.alibaba.nacos","com.coderman.**"}) +@ComponentScan({"com.coderman.infosys.auth.**"}) public class Application { - @LoadBalanced - @Bean - public RestTemplate restTemplate() { - return new RestTemplate(); - } - + public static void main(String[] args) { SpringApplication.run(Application.class, args); } diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/AuthorityOperationController.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/AuthorityOperationController.java new file mode 100644 index 0000000000000000000000000000000000000000..08da03d25b56390d85f5b9f38bcce5bf083d0a2f --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/AuthorityOperationController.java @@ -0,0 +1,36 @@ +package com.coderman.infosys.auth.adapter.controller; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.adapter.vo.AuthorityVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +/** +* @Description:控制层 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@RestController +public class AuthorityOperationController { + + protected Logger logger = LoggerFactory.getLogger(AuthorityOperationController.class); + + + + /** + * + * @Description 给角色授权 + * @param authorityVO + * @return ResultDataDto + */ + @RequestMapping(value = "/authority/savetorole") + public ResultDataDto saveAuthority(@RequestBody AuthorityVO authorityVO){ + + return null; + } +} diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/AuthorityQueryController.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/AuthorityQueryController.java new file mode 100644 index 0000000000000000000000000000000000000000..caa3c18220cb047a0ba610949073963a25c2e0ba --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/AuthorityQueryController.java @@ -0,0 +1,48 @@ +package com.coderman.infosys.auth.adapter.controller; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.adapter.vo.AuthorityVO; +import com.coderman.utils.response.PageVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +/** +* @Description:控制层 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@RestController +public class AuthorityQueryController { + + protected Logger logger = LoggerFactory.getLogger(AuthorityQueryController.class); + + + + /** + * + * @Description 分页获取权限信息 + * @return ResultDataDto> + */ + @RequestMapping(value = "/authority/pagelist") + public ResultDataDto> getPageList(){ + + return null; + } + + /** + * + * @Description 获取权限信息 + * @param authCode + * @return ResultDataDto + */ + @RequestMapping(value = "/authority/getbycode") + public ResultDataDto getByCode(@RequestParam(value = "authCode", required = true) String authCode){ + + return null; + } +} diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/DataAuthorityController.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/DataAuthorityController.java new file mode 100644 index 0000000000000000000000000000000000000000..70a80533e93f4c7300e3fec58345e5d2ab5bcbbd --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/DataAuthorityController.java @@ -0,0 +1,36 @@ +package com.coderman.infosys.auth.adapter.controller; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.adapter.vo.DataAuthorityResponseVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +/** +* @Description:控制层 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@RestController +public class DataAuthorityController { + + protected Logger logger = LoggerFactory.getLogger(DataAuthorityController.class); + + + + /** + * + * @Description 获取权限信息 + * @param authCode + * @return ResultDataDto + */ + @RequestMapping(value = "/dataauthority/getbycode") + public ResultDataDto getByCode(@RequestParam(value = "authCode", required = true) String authCode){ + + return null; + } +} diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/DataColumnController.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/DataColumnController.java new file mode 100644 index 0000000000000000000000000000000000000000..a17b727cc7f40229d32642c168b0315500805b3e --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/DataColumnController.java @@ -0,0 +1,63 @@ +package com.coderman.infosys.auth.adapter.controller; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.infosys.auth.adapter.vo.DataColumnVO; +import java.util.List; +import com.coderman.utils.response.ResultDataDto; +import com.coderman.utils.response.PageVO; +import com.coderman.infosys.auth.api.dto.UpdateMenuRequestDTO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +/** +* @Description:控制层 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@RestController +public class DataColumnController { + + protected Logger logger = LoggerFactory.getLogger(DataColumnController.class); + + + + /** + * + * @Description 获取数据字段信息 + * @param busDataBase + * @return ResultDataDto> + */ + @RequestMapping(value = "/datacolumn/getbycode") + public ResultDataDto> getListByBusDataBase(@RequestParam(value = "busDataBase", required = true) String busDataBase){ + + return null; + } + + /** + * + * @Description 分页获取数据字段信息 + * @param pageVO + * @return ResultDataDto> + */ + @RequestMapping(value = "/datacolumn/pagelist") + public ResultDataDto> getPageList(@RequestParam(value = "pageVO", required = true) PageVO pageVO){ + + return null; + } + + /** + * + * @Description 导入数据字段列表 + * @param updateMenuRequestDTO + * @return ResultDataDto + */ + @RequestMapping(value = "/datacolumn/import") + public ResultDataDto importDataColumnList(@RequestBody List updateMenuRequestDTO){ + + return null; + } +} diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/MenuController.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/MenuController.java new file mode 100644 index 0000000000000000000000000000000000000000..0814643bcb3ca272d18ea2beb37d40a77f3660b3 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/MenuController.java @@ -0,0 +1,84 @@ +package com.coderman.infosys.auth.adapter.controller; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.infosys.auth.adapter.vo.MenuVO; +import java.util.List; +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.adapter.vo.UpdateMenuRequestVO; +import com.coderman.infosys.auth.adapter.vo.CreateMenuRequestVO; +import com.coderman.infosys.auth.domain.bo.MenuBO; +import com.coderman.infosys.auth.domain.gataway.SystemModuleRepository; +import com.coderman.infosys.auth.model.convert.MenuConverter; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +/** +* @Description:控制层 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@RestController +public class MenuController { + + protected Logger logger = LoggerFactory.getLogger(MenuController.class); + + @Autowired + private SystemModuleRepository systemModuleRepository; + + + /** + * + * @Description 修改按钮信息 + * @param updateMenuRequestVO + * @return ResultDataDto + */ + @RequestMapping(value = "/menu/updatemenu") + public ResultDataDto updateMenu(@RequestBody UpdateMenuRequestVO updateMenuRequestVO){ + MenuBO menuBO = MenuConverter.INSTANCE.vo2bo(updateMenuRequestVO); + Integer intVar = systemModuleRepository.updateMenu(menuBO); + + return null; + } + + /** + * + * @Description 创建按钮信息 + * @param createMenuRequestVO + * @return ResultDataDto + */ + @RequestMapping(value = "/menu/createmenu") + public ResultDataDto createMenu(@RequestBody CreateMenuRequestVO createMenuRequestVO){ + MenuBO menuBO = MenuConverter.INSTANCE.vo2bo(createMenuRequestVO); + Long longVar = systemModuleRepository.saveMenu(menuBO); + + return null; + } + + /** + * + * @Description 获取按钮详情信息 + * @param menuCode + * @return ResultDataDto + */ + @RequestMapping(value = "/menu/getbycode") + public ResultDataDto getByCode(@RequestParam(value = "menuCode", required = true) String menuCode){ + + return null; + } + + /** + * + * @Description 获取按钮列表信息 + * @param moduleCode + * @return ResultDataDto> + */ + @RequestMapping(value = "/menu/pagelist") + public ResultDataDto> getPageList(@RequestParam(value = "moduleCode", required = true) String moduleCode ){ + + return null; + } +} diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/ModuleController.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/ModuleController.java new file mode 100644 index 0000000000000000000000000000000000000000..253abf1d7124654d8877bc38edd68674eb8a1a61 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/ModuleController.java @@ -0,0 +1,127 @@ +package com.coderman.infosys.auth.adapter.controller; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.List; +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.adapter.vo.CreateModuleRequestVO; +import com.coderman.infosys.auth.adapter.vo.ModuleVO; +import com.coderman.utils.response.PageVO; +import com.coderman.infosys.auth.api.dto.CreateModuleRequestDTO; +import com.coderman.infosys.auth.adapter.vo.UpdateModuleRequestVO; +import com.coderman.infosys.auth.domain.bo.ModuleBO; +import com.coderman.infosys.auth.model.convert.ModuleConverter; +import com.coderman.infosys.auth.domain.gataway.SystemModuleQueryGataWay; +import com.coderman.infosys.auth.domain.gataway.SystemModuleRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +/** +* @Description:控制层 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@RestController +public class ModuleController { + + protected Logger logger = LoggerFactory.getLogger(ModuleController.class); + + @Autowired + private SystemModuleQueryGataWay systemModuleQueryGataWay; + @Autowired + private SystemModuleRepository systemModuleRepository; + + + /** + * + * @Description 创建菜单信息 + * @param createRequest + * @return ResultDataDto> + */ + @RequestMapping(value = "/module/createmodule") + public ResultDataDto> createModule(@RequestBody CreateModuleRequestVO createRequest){ + ModuleBO moduleBO = ModuleConverter.INSTANCE.vo2bo(createRequest); + ModuleBO moduleBO = systemModuleQueryGataWay.getModuleByCode(moduleBO.getModuleCode()); + Long longVar = systemModuleRepository.saveModule(moduleBO); + + return null; + } + + /** + * + * @Description 创建菜单信息 + * @param updateRequest + * @return ResultDataDto> + */ + @RequestMapping(value = "/module/updatemodule") + public ResultDataDto> updateModule(@RequestBody UpdateModuleRequestVO updateRequest){ + ModuleBO moduleBO = ModuleConverter.INSTANCE.vo2bo(updateRequest); + Integer intVar = systemModuleRepository.updateModule(moduleBO); + + return null; + } + + /** + * + * @Description 获取系统菜单列表信息 + * @param systemCode + * @return ResultDataDto> + */ + @RequestMapping(value = "/module/getbysystemcode") + public ResultDataDto> getBySystemCode(@RequestParam(value = "systemCode", required = true) String systemCode){ + + return null; + } + + /** + * + * @Description 获取菜单信息 + * @param moduleCode + * @return ResultDataDto + */ + @RequestMapping(value = "/module/getbycode") + public ResultDataDto getByModuleCode(@RequestParam(value = "moduleCode", required = true) String moduleCode){ + ModuleBO moduleBO = systemModuleQueryGataWay.getModuleByCode(moduleCode); + ModuleVO moduleVO = ModuleConverter.INSTANCE.bo2VO(moduleBO); + + return ResultDataDto.success(moduleVO); + } + + /** + * + * @Description 分页获取菜单信息 + * @return ResultDataDto> + */ + @RequestMapping(value = "/module/pagelist") + public ResultDataDto> getPageList(){ + + return null; + } + + /** + * + * @Description 导入菜单信息 + * @param createRequest + * @return ResultDataDto + */ + @RequestMapping(value = "/module/import") + public ResultDataDto importModuleList(@RequestBody List createRequest){ + + return null; + } + + /** + * + * @Description 导出菜单信息 + * @param systemCode + * @return ResultDataDto + */ + @RequestMapping(value = "/module/export") + public ResultDataDto exportModuleList(@RequestParam(value = "systemCode", required = true) String systemCode){ + + return null; + } +} diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/RoleController.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/RoleController.java new file mode 100644 index 0000000000000000000000000000000000000000..9ad42e1cd85b66c57d69bfeae61d2653eadad466 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/RoleController.java @@ -0,0 +1,73 @@ +package com.coderman.infosys.auth.adapter.controller; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.adapter.vo.CreateRoleRequestVO; +import com.coderman.infosys.auth.adapter.vo.RoleVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +/** +* @Description:控制层 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@RestController +public class RoleController { + + protected Logger logger = LoggerFactory.getLogger(RoleController.class); + + + + /** + * + * @Description 创建角色 + * @param createRoleRequestVO + * @return ResultDataDto + */ + @RequestMapping(value = "/role/createrule") + public ResultDataDto createRole(@RequestBody CreateRoleRequestVO createRoleRequestVO){ + + return null; + } + + /** + * + * @Description 根据编码获取角色详情 + * @param roleCode + * @return ResultDataDto + */ + @RequestMapping(value = "/role/getbyrolecode") + public ResultDataDto getByRoleCode(@RequestParam(value = "roleCode", required = true) String roleCode){ + + return null; + } + + /** + * + * @Description 禁用角色 + * @param roleCode + * @return ResultDataDto + */ + @RequestMapping(value = "/role/disable") + public ResultDataDto disable(String roleCode){ + + return null; + } + + /** + * + * @Description 启用角色 + * @param roleCode + * @return ResultDataDto + */ + @RequestMapping(value = "/role/enable") + public ResultDataDto enable(String roleCode){ + + return null; + } +} diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/RoleGroupController.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/RoleGroupController.java new file mode 100644 index 0000000000000000000000000000000000000000..f904c00aac64215da4eb6503e6c5dfa0eef82067 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/RoleGroupController.java @@ -0,0 +1,37 @@ +package com.coderman.infosys.auth.adapter.controller; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.infosys.auth.adapter.vo.RoleGroupVO; +import com.coderman.utils.response.ResultDataDto; +import com.coderman.utils.response.PageVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +/** +* @Description:控制层 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@RestController +public class RoleGroupController { + + protected Logger logger = LoggerFactory.getLogger(RoleGroupController.class); + + + + /** + * + * @Description 分页获取用户组信息 + * @param pageVO + * @return ResultDataDto> + */ + @RequestMapping(value = "/role/pagelist") + public ResultDataDto> getPageList(@RequestParam(value = "pageVO", required = true) PageVO pageVO){ + + return null; + } +} diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/RoleQueryController.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/RoleQueryController.java new file mode 100644 index 0000000000000000000000000000000000000000..a02de769f69ca61fa30441d9ed4fed4efc06738f --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/RoleQueryController.java @@ -0,0 +1,37 @@ +package com.coderman.infosys.auth.adapter.controller; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.utils.response.PageVO; +import com.coderman.infosys.auth.adapter.vo.RoleVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +/** +* @Description:控制层 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@RestController +public class RoleQueryController { + + protected Logger logger = LoggerFactory.getLogger(RoleQueryController.class); + + + + /** + * + * @Description 分页获取用户组信息 + * @param pageVO + * @return ResultDataDto> + */ + @RequestMapping(value = "/role/pagelist") + public ResultDataDto> getPageList(@RequestParam(value = "pageVO", required = true) PageVO pageVO){ + + return null; + } +} diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/SystemAuthorityController.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/SystemAuthorityController.java new file mode 100644 index 0000000000000000000000000000000000000000..b7bf8952e90e92133f073250e23fcd5341405f3e --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/SystemAuthorityController.java @@ -0,0 +1,49 @@ +package com.coderman.infosys.auth.adapter.controller; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.adapter.vo.SystemAuthorityVO; +import com.coderman.infosys.auth.adapter.vo.AuthorityVO; +import com.coderman.utils.response.PageVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +/** +* @Description:控制层 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@RestController +public class SystemAuthorityController { + + protected Logger logger = LoggerFactory.getLogger(SystemAuthorityController.class); + + + + /** + * + * @Description 获取权限信息 + * @param authCode + * @return ResultDataDto + */ + @RequestMapping(value = "/systemauthority/getbycode") + public ResultDataDto getByCode(@RequestParam(value = "authCode", required = true) String authCode){ + + return null; + } + + /** + * + * @Description 分页获取权限信息 + * @return ResultDataDto> + */ + @RequestMapping(value = "/systemauthority/pagelist") + public ResultDataDto> getPageList(){ + + return null; + } +} diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/SystemController.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/SystemController.java new file mode 100644 index 0000000000000000000000000000000000000000..84a694fd4d0d8f85af1f179aa6b40617fe1df408 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/SystemController.java @@ -0,0 +1,107 @@ +package com.coderman.infosys.auth.adapter.controller; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.List; +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.adapter.vo.CreateSystemRequestVO; +import com.coderman.infosys.auth.adapter.vo.SystemVO; +import com.coderman.utils.response.PageVO; +import com.coderman.infosys.auth.adapter.vo.UpdateSystemRequestVO; +import com.coderman.infosys.auth.domain.bo.SystemBO; +import com.coderman.infosys.auth.domain.gataway.SystemModuleQueryGataWay; +import com.coderman.infosys.auth.model.convert.SystemConverter; +import com.coderman.infosys.auth.domain.gataway.SystemModuleRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +/** +* @Description:控制层 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@RestController +public class SystemController { + + protected Logger logger = LoggerFactory.getLogger(SystemController.class); + + @Autowired + private SystemModuleQueryGataWay systemModuleQueryGataWay; + @Autowired + private SystemModuleRepository systemModuleRepository; + + + /** + * + * @Description 分页获取系统信息 + * @param systemVO + * @return ResultDataDto> + */ + @RequestMapping(value = "/system/pagelist") + public ResultDataDto> getPageList(@RequestParam(value = "systemVO", required = true) SystemVO systemVO){ + List systemBOList = systemModuleQueryGataWay.querySystemPage(null); + List systemVOList = SystemConverter.INSTANCE.bolist2voList(systemBOList); + + return null; + } + + /** + * + * @Description 搜索获取系统信息 + * @param search + * @return ResultDataDto> + */ + @RequestMapping(value = "/system/search") + public ResultDataDto> getSearchList(@RequestParam(value = "search", required = true) String search){ + List systemBOList = systemModuleQueryGataWay.queryByCondition(search); + List systemVOList = SystemConverter.INSTANCE.bolist2voList(systemBOList); + + return ResultDataDto.success(systemVOList); + } + + /** + * + * @Description 新建系统信息 + * @param systemVO + * @return ResultDataDto + */ + @RequestMapping(value = "/system/save") + public ResultDataDto saveSystem(@RequestBody CreateSystemRequestVO systemVO){ + SystemBO systemBO = SystemConverter.INSTANCE.vo2bo(systemVO); + List systemBOList = systemModuleQueryGataWay.getSystemByName(systemBO.getSystemName()); + Long longVar = systemModuleRepository.saveSystem(systemBO); + + return null; + } + + /** + * + * @Description 修改系统信息 + * @param systemVO + * @return ResultDataDto + */ + @RequestMapping(value = "/system/update") + public ResultDataDto updateSystem(@RequestBody UpdateSystemRequestVO systemVO){ + SystemBO systemBO = SystemConverter.INSTANCE.vo2bo(systemVO); + Integer intVar = systemModuleRepository.updateSystem(systemBO); + + return null; + } + + /** + * + * @Description 通过系统编号获取系统信息 + * @param systemCode + * @return ResultDataDto + */ + @RequestMapping(value = "/system/getbycode") + public ResultDataDto getByCode(@RequestParam(value = "systemCode", required = true) String systemCode){ + SystemBO systemBO = systemModuleQueryGataWay.queryBySystemCode(systemCode); + SystemVO systemVO = SystemConverter.INSTANCE.bo2VO(systemBO); + + return ResultDataDto.success(systemVO); + } +} diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/UserGroupController.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/UserGroupController.java new file mode 100644 index 0000000000000000000000000000000000000000..943f3374ffb67d8ced68d11f516ae61be6f71a1b --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/UserGroupController.java @@ -0,0 +1,36 @@ +package com.coderman.infosys.auth.adapter.controller; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.infosys.auth.adapter.vo.UserGroupVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +/** +* @Description:控制层 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@RestController +public class UserGroupController { + + protected Logger logger = LoggerFactory.getLogger(UserGroupController.class); + + + + /** + * + * @Description 创建用户组 + * @param userGroupVO + * @return ResultDataDto + */ + @RequestMapping(value = "/usergroup/creategroup") + public ResultDataDto createUserGroup(@RequestBody UserGroupVO userGroupVO){ + + return null; + } +} diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/UserGroupQueryController.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/UserGroupQueryController.java new file mode 100644 index 0000000000000000000000000000000000000000..a0d79372ad6656145ef5c0488ab8d410a084b40d --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/UserGroupQueryController.java @@ -0,0 +1,36 @@ +package com.coderman.infosys.auth.adapter.controller; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.utils.response.PageVO; +import com.coderman.infosys.auth.adapter.vo.UserGroupVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +/** +* @Description:控制层 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@RestController +public class UserGroupQueryController { + + protected Logger logger = LoggerFactory.getLogger(UserGroupQueryController.class); + + + + /** + * + * @Description 分页获取用户组信息 + * @return ResultDataDto> + */ + @RequestMapping(value = "/usergroup/pagelist") + public ResultDataDto> getPageList(){ + + return null; + } +} diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/AuthorityVO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/AuthorityVO.java new file mode 100644 index 0000000000000000000000000000000000000000..432c41922861648e4a6073948cfe5500b3e79c60 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/AuthorityVO.java @@ -0,0 +1,37 @@ +package com.coderman.infosys.auth.adapter.vo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:权限类 + * @Author: + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class AuthorityVO { + + /** 主键ID **/ + private Long id; + /** 权限编码标示 **/ + private String authCode; + /** 权限类型 **/ + private Integer authorityType; + /** 关联角色 **/ + private String roleCode; + /** 关联角色组 **/ + private String roleGroupCode; + /** 权限状态 **/ + private Integer status; + /** 数据字段权限列表 **/ + /** private List dataAuthorityBOList **/; + /** 系统菜单权限列表 **/ + /** private List systemAuthorityBOList **/; + /** 行政权限列表 **/ + /** private List adminAuthorityBOList **/; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/CreateMenuRequestVO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/CreateMenuRequestVO.java new file mode 100644 index 0000000000000000000000000000000000000000..8e4ea0d17a62dd046dba6226eba22911e4363e2c --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/CreateMenuRequestVO.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.adapter.vo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:按钮管理类 + * @Author: + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class CreateMenuRequestVO { + + /** 主键ID **/ + private Long id; + /** 按钮名称 **/ + private String menuName; + /** 按钮编码 **/ + private String menuCode; + /** 按钮链接 **/ + private String menuUrl; + /** 系统编码 **/ + private String systemCode; + /** 菜单编码 **/ + private String moduleCode; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/CreateModuleRequestVO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/CreateModuleRequestVO.java new file mode 100644 index 0000000000000000000000000000000000000000..78d5aa8d8c697b72b25ab542a41a3acae2360a00 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/CreateModuleRequestVO.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.adapter.vo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:菜单/模块管理类 + * @Author: + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class CreateModuleRequestVO { + + /** 主键ID **/ + private Long id; + /** 菜单名称 **/ + private String moduleName; + /** 菜单编码 **/ + private String moduleCode; + /** 菜单链接 **/ + private String moduleUrl; + /** 系统标示 **/ + private String systemCode; + /** 按钮列表 **/ + /** private List menuBOList **/; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/CreateRoleRequestVO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/CreateRoleRequestVO.java new file mode 100644 index 0000000000000000000000000000000000000000..e0939b2cc43e6c9017e1a18b0a86e29c6e7b7b2a --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/CreateRoleRequestVO.java @@ -0,0 +1,29 @@ +package com.coderman.infosys.auth.adapter.vo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:角色类 + * @Author: + * @CreateTime:2021-11-06 23:38:07 + * @version v1.0 + */ +@Data +@ToString +public class CreateRoleRequestVO { + + /** 主键ID **/ + private Long id; + /** 角色名称 **/ + private String roleName; + /** 角色编码 **/ + private String roleCode; + /** 角色状态 **/ + private Integer status; + /** 角色对应用户列表 **/ + /** private List userList **/; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/CreateSystemRequestVO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/CreateSystemRequestVO.java new file mode 100644 index 0000000000000000000000000000000000000000..3ef0aa4bf0f435260a5e13da8c4025cfbf7260d5 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/CreateSystemRequestVO.java @@ -0,0 +1,37 @@ +package com.coderman.infosys.auth.adapter.vo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:系统管理类 + * @Author: + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class CreateSystemRequestVO { + + /** 主键ID **/ + private Long id; + /** 系统名称 **/ + private String systemName; + /** 系统标示 **/ + private String systemCode; + /** 系统域名 **/ + private String systemUrl; + /** 系统图标 **/ + private String systemPicUrl; + /** 系统技术负责人 **/ + private Long tecAdminUserId; + /** 系统业务负责人 **/ + private Long busAdminUserId; + /** 系统当前所在部门 **/ + private Long departmentId; + /** 系统模块列表 **/ + /** private List moduleBOList **/; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/DataAuthorityResponseVO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/DataAuthorityResponseVO.java new file mode 100644 index 0000000000000000000000000000000000000000..5db48de00dd34fd4e61ad06a95cc94dc3120910c --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/DataAuthorityResponseVO.java @@ -0,0 +1,25 @@ +package com.coderman.infosys.auth.adapter.vo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:数据字段权限类 + * @Author: + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class DataAuthorityResponseVO { + + /** 主键ID **/ + private Long id; + /** 权限编码标示 **/ + private String authCode; + /** 数据字段ID **/ + private Long dataColumnId; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/DataColumnResponseVO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/DataColumnResponseVO.java new file mode 100644 index 0000000000000000000000000000000000000000..60545a50a25b9bcc4a2952c645e8e72e651ee213 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/DataColumnResponseVO.java @@ -0,0 +1,35 @@ +package com.coderman.infosys.auth.adapter.vo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:数据字段实体类 + * @Author: + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class DataColumnResponseVO { + + /** 主键ID **/ + private Long id; + /** 主键ID **/ + private Long id; + /** 数据库业务系统名称 **/ + private String busDataBase; + /** 数据库表名称 **/ + private String tableName; + /** 数据库表描述 **/ + private String tableDesc; + /** 数据库字段名称 **/ + private String columnName; + /** 数据库字段描述 **/ + private String columnDesc; + /** 业务字段名称 **/ + private String fieldName; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/DataColumnVO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/DataColumnVO.java new file mode 100644 index 0000000000000000000000000000000000000000..24b62c9b858cb3163d077e09ac6fa7769e48f3d3 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/DataColumnVO.java @@ -0,0 +1,35 @@ +package com.coderman.infosys.auth.adapter.vo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:数据字段实体类 + * @Author: + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class DataColumnVO { + + /** 主键ID **/ + private Long id; + /** 主键ID **/ + private Long id; + /** 数据库业务系统名称 **/ + private String busDataBase; + /** 数据库表名称 **/ + private String tableName; + /** 数据库表描述 **/ + private String tableDesc; + /** 数据库字段名称 **/ + private String columnName; + /** 数据库字段描述 **/ + private String columnDesc; + /** 业务字段名称 **/ + private String fieldName; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/MenuVO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/MenuVO.java new file mode 100644 index 0000000000000000000000000000000000000000..9d90bde6f381d7e8d506490935d43a3119282711 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/MenuVO.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.adapter.vo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:按钮管理类 + * @Author: + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class MenuVO { + + /** 主键ID **/ + private Long id; + /** 按钮名称 **/ + private String menuName; + /** 按钮编码 **/ + private String menuCode; + /** 按钮链接 **/ + private String menuUrl; + /** 系统编码 **/ + private String systemCode; + /** 菜单编码 **/ + private String moduleCode; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/ModuleVO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/ModuleVO.java new file mode 100644 index 0000000000000000000000000000000000000000..5dc379147d0e245aea23bf0d8f7236d057f942f8 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/ModuleVO.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.adapter.vo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:菜单/模块管理类 + * @Author: + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class ModuleVO { + + /** 主键ID **/ + private Long id; + /** 菜单名称 **/ + private String moduleName; + /** 菜单编码 **/ + private String moduleCode; + /** 菜单链接 **/ + private String moduleUrl; + /** 系统标示 **/ + private String systemCode; + /** 按钮列表 **/ + /** private List menuBOList **/; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/RoleGroupVO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/RoleGroupVO.java new file mode 100644 index 0000000000000000000000000000000000000000..011caac96c7ce12c49deb33da956015b417445e6 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/RoleGroupVO.java @@ -0,0 +1,29 @@ +package com.coderman.infosys.auth.adapter.vo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:角色组类 + * @Author: + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class RoleGroupVO { + + /** 主键ID **/ + private Long id; + /** 角色组名称 **/ + private String roleName; + /** 角色组编码 **/ + private String roleCode; + /** 角色状态 **/ + private Integer status; + /** 组内角色列表 **/ + /** private List roleList **/; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/RoleVO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/RoleVO.java new file mode 100644 index 0000000000000000000000000000000000000000..6f45f6d69700046fdf7e11f8b93d57a497045578 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/RoleVO.java @@ -0,0 +1,29 @@ +package com.coderman.infosys.auth.adapter.vo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:角色类 + * @Author: + * @CreateTime:2021-11-06 23:38:07 + * @version v1.0 + */ +@Data +@ToString +public class RoleVO { + + /** 主键ID **/ + private Long id; + /** 角色名称 **/ + private String roleName; + /** 角色编码 **/ + private String roleCode; + /** 角色状态 **/ + private Integer status; + /** 角色对应用户列表 **/ + /** private List userList **/; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/SystemAuthorityVO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/SystemAuthorityVO.java new file mode 100644 index 0000000000000000000000000000000000000000..5ba37826e49c999951f56daa448ee32f234d9d51 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/SystemAuthorityVO.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.adapter.vo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:系统菜单权限类 + * @Author: + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class SystemAuthorityVO { + + /** 主键ID **/ + private Long id; + /** 权限编码标示 **/ + private String authCode; + /** 业务数据系统标示 **/ + private String systemName; + /** 功能 **/ + private String funcName; + /** 菜单 **/ + private String categoryName; + /** 按钮 **/ + private String menuName; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/SystemVO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/SystemVO.java new file mode 100644 index 0000000000000000000000000000000000000000..87bed3a27a5e67bc59e2b8ed8a55c43417d6855e --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/SystemVO.java @@ -0,0 +1,37 @@ +package com.coderman.infosys.auth.adapter.vo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:系统管理类 + * @Author: + * @CreateTime:2021-11-06 23:38:07 + * @version v1.0 + */ +@Data +@ToString +public class SystemVO { + + /** 主键ID **/ + private Long id; + /** 系统名称 **/ + private String systemName; + /** 系统标示 **/ + private String systemCode; + /** 系统域名 **/ + private String systemUrl; + /** 系统图标 **/ + private String systemPicUrl; + /** 系统技术负责人 **/ + private Long tecAdminUserId; + /** 系统业务负责人 **/ + private Long busAdminUserId; + /** 系统当前所在部门 **/ + private Long departmentId; + /** 系统模块列表 **/ + /** private List moduleBOList **/; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/UpdateMenuRequestVO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/UpdateMenuRequestVO.java new file mode 100644 index 0000000000000000000000000000000000000000..e264836cacd73cbe20f329c9240c7ac234cb21d2 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/UpdateMenuRequestVO.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.adapter.vo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:按钮管理类 + * @Author: + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class UpdateMenuRequestVO { + + /** 主键ID **/ + private Long id; + /** 按钮名称 **/ + private String menuName; + /** 按钮编码 **/ + private String menuCode; + /** 按钮链接 **/ + private String menuUrl; + /** 系统编码 **/ + private String systemCode; + /** 菜单编码 **/ + private String moduleCode; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/UpdateModuleRequestVO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/UpdateModuleRequestVO.java new file mode 100644 index 0000000000000000000000000000000000000000..0fa42b6cf011a262ebbfe97531b9039b7f3ff657 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/UpdateModuleRequestVO.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.adapter.vo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:菜单/模块管理类 + * @Author: + * @CreateTime:2021-11-06 23:38:07 + * @version v1.0 + */ +@Data +@ToString +public class UpdateModuleRequestVO { + + /** 主键ID **/ + private Long id; + /** 菜单名称 **/ + private String moduleName; + /** 菜单编码 **/ + private String moduleCode; + /** 菜单链接 **/ + private String moduleUrl; + /** 系统标示 **/ + private String systemCode; + /** 按钮列表 **/ + /** private List menuBOList **/; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/UpdateSystemRequestVO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/UpdateSystemRequestVO.java new file mode 100644 index 0000000000000000000000000000000000000000..a69dc783b4f132b95f398dd0ba38e1cc3b1b8c86 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/UpdateSystemRequestVO.java @@ -0,0 +1,37 @@ +package com.coderman.infosys.auth.adapter.vo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:系统管理类 + * @Author: + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class UpdateSystemRequestVO { + + /** 主键ID **/ + private Long id; + /** 系统名称 **/ + private String systemName; + /** 系统标示 **/ + private String systemCode; + /** 系统域名 **/ + private String systemUrl; + /** 系统图标 **/ + private String systemPicUrl; + /** 系统技术负责人 **/ + private Long tecAdminUserId; + /** 系统业务负责人 **/ + private Long busAdminUserId; + /** 系统当前所在部门 **/ + private Long departmentId; + /** 系统模块列表 **/ + /** private List moduleBOList **/; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/UserGroupVO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/UserGroupVO.java new file mode 100644 index 0000000000000000000000000000000000000000..ad571b4919cdc0edfeeca887832081cad25f02fa --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/UserGroupVO.java @@ -0,0 +1,33 @@ +package com.coderman.infosys.auth.adapter.vo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:用户组类 + * @Author: + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class UserGroupVO { + + /** 主键ID **/ + private Long id; + /** 组名 **/ + private String groupName; + /** 组编码 **/ + private String groupCode; + /** 用户组状态 **/ + private Integer status; + /** 组内用户列表 **/ + /** private List userList **/; + /** 用户组对应的角色列表 **/ + /** private List roleList **/; + /** 用户组对应角色组列表 **/ + /** private List roleGroupList **/; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/AuthorityResponseDTO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/AuthorityResponseDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..5f42f26b14ec5eaa63db1c624bf1f17376c4986b --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/AuthorityResponseDTO.java @@ -0,0 +1,37 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:权限类 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Data +@ToString +public class AuthorityResponseDTO { + + /** 主键ID **/ + private Long id; + /** 权限编码标示 **/ + private String authCode; + /** 权限类型 **/ + private Integer authorityType; + /** 关联角色 **/ + private String roleCode; + /** 关联角色组 **/ + private String roleGroupCode; + /** 权限状态 **/ + private Integer status; + /** 数据字段权限列表 **/ + /** private List dataAuthorityBOList **/; + /** 系统菜单权限列表 **/ + /** private List systemAuthorityBOList **/; + /** 行政权限列表 **/ + /** private List adminAuthorityBOList **/; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/CreateAuthorityRequestDTO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/CreateAuthorityRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..dfd047404e18e595bcb3bd77ef5931df3983f81c --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/CreateAuthorityRequestDTO.java @@ -0,0 +1,37 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:权限类 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Data +@ToString +public class CreateAuthorityRequestDTO { + + /** 主键ID **/ + private Long id; + /** 权限编码标示 **/ + private String authCode; + /** 权限类型 **/ + private Integer authorityType; + /** 关联角色 **/ + private String roleCode; + /** 关联角色组 **/ + private String roleGroupCode; + /** 权限状态 **/ + private Integer status; + /** 数据字段权限列表 **/ + /** private List dataAuthorityBOList **/; + /** 系统菜单权限列表 **/ + /** private List systemAuthorityBOList **/; + /** 行政权限列表 **/ + /** private List adminAuthorityBOList **/; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/CreateDataAuthorityRequestDTO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/CreateDataAuthorityRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..20ae27f4cd571f9ec399e70843bebc25f7753bf1 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/CreateDataAuthorityRequestDTO.java @@ -0,0 +1,25 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:数据字段权限类 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Data +@ToString +public class CreateDataAuthorityRequestDTO { + + /** 主键ID **/ + private Long id; + /** 权限编码标示 **/ + private String authCode; + /** 数据字段ID **/ + private Long dataColumnId; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/CreateMenuRequestDTO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/CreateMenuRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..6e4703e54e0f13403991c1f672a73161d1f14a4f --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/CreateMenuRequestDTO.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:按钮管理类 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Data +@ToString +public class CreateMenuRequestDTO { + + /** 主键ID **/ + private Long id; + /** 按钮名称 **/ + private String menuName; + /** 按钮编码 **/ + private String menuCode; + /** 按钮链接 **/ + private String menuUrl; + /** 系统编码 **/ + private String systemCode; + /** 菜单编码 **/ + private String moduleCode; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/CreateModuleRequestDTO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/CreateModuleRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..107ff1aa4b27da6c0069564f9bf6db3224d185cb --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/CreateModuleRequestDTO.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:菜单/模块管理类 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Data +@ToString +public class CreateModuleRequestDTO { + + /** 主键ID **/ + private Long id; + /** 菜单名称 **/ + private String moduleName; + /** 菜单编码 **/ + private String moduleCode; + /** 菜单链接 **/ + private String moduleUrl; + /** 系统标示 **/ + private String systemCode; + /** 按钮列表 **/ + /** private List menuBOList **/; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/CreateRoleRequestDTO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/CreateRoleRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..51da7ebd3cea44663281c7200d7d4075c1e300cc --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/CreateRoleRequestDTO.java @@ -0,0 +1,29 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:角色类 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Data +@ToString +public class CreateRoleRequestDTO { + + /** 主键ID **/ + private Long id; + /** 角色名称 **/ + private String roleName; + /** 角色编码 **/ + private String roleCode; + /** 角色状态 **/ + private Integer status; + /** 角色对应用户列表 **/ + /** private List userList **/; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/CreateSystemAuthorityRequestDTO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/CreateSystemAuthorityRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..1b9db9000d195b1426c437da35c39f5419aa2c56 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/CreateSystemAuthorityRequestDTO.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:系统菜单权限类 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Data +@ToString +public class CreateSystemAuthorityRequestDTO { + + /** 主键ID **/ + private Long id; + /** 权限编码标示 **/ + private String authCode; + /** 业务数据系统标示 **/ + private String systemName; + /** 功能 **/ + private String funcName; + /** 菜单 **/ + private String categoryName; + /** 按钮 **/ + private String menuName; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/CreateSystemRequestDTO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/CreateSystemRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..4721381e1c1309330e78cc840900faebf4904ff4 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/CreateSystemRequestDTO.java @@ -0,0 +1,37 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:系统管理类 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Data +@ToString +public class CreateSystemRequestDTO { + + /** 主键ID **/ + private Long id; + /** 系统名称 **/ + private String systemName; + /** 系统标示 **/ + private String systemCode; + /** 系统域名 **/ + private String systemUrl; + /** 系统图标 **/ + private String systemPicUrl; + /** 系统技术负责人 **/ + private Long tecAdminUserId; + /** 系统业务负责人 **/ + private Long busAdminUserId; + /** 系统当前所在部门 **/ + private Long departmentId; + /** 系统模块列表 **/ + /** private List moduleBOList **/; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/CreateUserGroupRequestDTO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/CreateUserGroupRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..cd6da28d7ccf1fba4ffccceb023c8d485882094a --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/CreateUserGroupRequestDTO.java @@ -0,0 +1,33 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:用户组类 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Data +@ToString +public class CreateUserGroupRequestDTO { + + /** 主键ID **/ + private Long id; + /** 组名 **/ + private String groupName; + /** 组编码 **/ + private String groupCode; + /** 用户组状态 **/ + private Integer status; + /** 组内用户列表 **/ + /** private List userList **/; + /** 用户组对应的角色列表 **/ + /** private List roleList **/; + /** 用户组对应角色组列表 **/ + /** private List roleGroupList **/; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/DataAuthorityResponseDTO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/DataAuthorityResponseDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..8fd45db577e35c1a927366939a6082b7d81a50a6 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/DataAuthorityResponseDTO.java @@ -0,0 +1,25 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:数据字段权限类 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Data +@ToString +public class DataAuthorityResponseDTO { + + /** 主键ID **/ + private Long id; + /** 权限编码标示 **/ + private String authCode; + /** 数据字段ID **/ + private Long dataColumnId; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/MenuResponseDTO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/MenuResponseDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..852cf64fb6e1aafa7c8857a4cf4e934671beed82 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/MenuResponseDTO.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:按钮管理类 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Data +@ToString +public class MenuResponseDTO { + + /** 主键ID **/ + private Long id; + /** 按钮名称 **/ + private String menuName; + /** 按钮编码 **/ + private String menuCode; + /** 按钮链接 **/ + private String menuUrl; + /** 系统编码 **/ + private String systemCode; + /** 菜单编码 **/ + private String moduleCode; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/ModuleResponseDTO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/ModuleResponseDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..666a9216fd9683746d659d245d9045da83ac74b1 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/ModuleResponseDTO.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:菜单/模块管理类 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Data +@ToString +public class ModuleResponseDTO { + + /** 主键ID **/ + private Long id; + /** 菜单名称 **/ + private String moduleName; + /** 菜单编码 **/ + private String moduleCode; + /** 菜单链接 **/ + private String moduleUrl; + /** 系统标示 **/ + private String systemCode; + /** 按钮列表 **/ + /** private List menuBOList **/; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/RoleGroupResponseDTO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/RoleGroupResponseDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..a362eb3387b75e28d0da3dd1893bbf519d51d13c --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/RoleGroupResponseDTO.java @@ -0,0 +1,29 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:角色组类 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Data +@ToString +public class RoleGroupResponseDTO { + + /** 主键ID **/ + private Long id; + /** 角色组名称 **/ + private String roleName; + /** 角色组编码 **/ + private String roleCode; + /** 角色状态 **/ + private Integer status; + /** 组内角色列表 **/ + /** private List roleList **/; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/RoleResponseDTO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/RoleResponseDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..be0990ac6d6daf50640b32d145490df4ad79b127 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/RoleResponseDTO.java @@ -0,0 +1,29 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:角色类 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Data +@ToString +public class RoleResponseDTO { + + /** 主键ID **/ + private Long id; + /** 角色名称 **/ + private String roleName; + /** 角色编码 **/ + private String roleCode; + /** 角色状态 **/ + private Integer status; + /** 角色对应用户列表 **/ + /** private List userList **/; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/SystemAuthorityResponseDTO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/SystemAuthorityResponseDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..627d7da433686f5ccdf4c66d999e93e95f9a7426 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/SystemAuthorityResponseDTO.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:系统菜单权限类 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Data +@ToString +public class SystemAuthorityResponseDTO { + + /** 主键ID **/ + private Long id; + /** 权限编码标示 **/ + private String authCode; + /** 业务数据系统标示 **/ + private String systemName; + /** 功能 **/ + private String funcName; + /** 菜单 **/ + private String categoryName; + /** 按钮 **/ + private String menuName; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/SystemDTO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/SystemDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..24f2da86de31124972c290fe0775f267a3620a26 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/SystemDTO.java @@ -0,0 +1,37 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:系统管理类 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Data +@ToString +public class SystemDTO { + + /** 主键ID **/ + private Long id; + /** 系统名称 **/ + private String systemName; + /** 系统标示 **/ + private String systemCode; + /** 系统域名 **/ + private String systemUrl; + /** 系统图标 **/ + private String systemPicUrl; + /** 系统技术负责人 **/ + private Long tecAdminUserId; + /** 系统业务负责人 **/ + private Long busAdminUserId; + /** 系统当前所在部门 **/ + private Long departmentId; + /** 系统模块列表 **/ + /** private List moduleBOList **/; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/UpdateAuthorityRequestDTO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/UpdateAuthorityRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..c282835c7c9beaeeee4eadbb3257d3877ffcd8d3 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/UpdateAuthorityRequestDTO.java @@ -0,0 +1,37 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:权限类 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Data +@ToString +public class UpdateAuthorityRequestDTO { + + /** 主键ID **/ + private Long id; + /** 权限编码标示 **/ + private String authCode; + /** 权限类型 **/ + private Integer authorityType; + /** 关联角色 **/ + private String roleCode; + /** 关联角色组 **/ + private String roleGroupCode; + /** 权限状态 **/ + private Integer status; + /** 数据字段权限列表 **/ + /** private List dataAuthorityBOList **/; + /** 系统菜单权限列表 **/ + /** private List systemAuthorityBOList **/; + /** 行政权限列表 **/ + /** private List adminAuthorityBOList **/; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/UpdateDataAuthorityRequestDTO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/UpdateDataAuthorityRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..8115724ace14757f8e28a2e2de86d66ed4214131 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/UpdateDataAuthorityRequestDTO.java @@ -0,0 +1,25 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:数据字段权限类 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Data +@ToString +public class UpdateDataAuthorityRequestDTO { + + /** 主键ID **/ + private Long id; + /** 权限编码标示 **/ + private String authCode; + /** 数据字段ID **/ + private Long dataColumnId; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/UpdateMenuRequestDTO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/UpdateMenuRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..50b1358dabba13841fc7cae481e11f94946a50f2 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/UpdateMenuRequestDTO.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:按钮管理类 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Data +@ToString +public class UpdateMenuRequestDTO { + + /** 主键ID **/ + private Long id; + /** 按钮名称 **/ + private String menuName; + /** 按钮编码 **/ + private String menuCode; + /** 按钮链接 **/ + private String menuUrl; + /** 系统编码 **/ + private String systemCode; + /** 菜单编码 **/ + private String moduleCode; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/UpdateModuleRequestDTO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/UpdateModuleRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..c656588e42af80ab70f397bbf6f40cb41eda64e9 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/UpdateModuleRequestDTO.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:菜单/模块管理类 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Data +@ToString +public class UpdateModuleRequestDTO { + + /** 主键ID **/ + private Long id; + /** 菜单名称 **/ + private String moduleName; + /** 菜单编码 **/ + private String moduleCode; + /** 菜单链接 **/ + private String moduleUrl; + /** 系统标示 **/ + private String systemCode; + /** 按钮列表 **/ + /** private List menuBOList **/; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/UpdateRoleGroupRequestDTO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/UpdateRoleGroupRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..22d9c2c993425170f553d0675c7537207f2d315d --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/UpdateRoleGroupRequestDTO.java @@ -0,0 +1,29 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:角色组类 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Data +@ToString +public class UpdateRoleGroupRequestDTO { + + /** 主键ID **/ + private Long id; + /** 角色组名称 **/ + private String roleName; + /** 角色组编码 **/ + private String roleCode; + /** 角色状态 **/ + private Integer status; + /** 组内角色列表 **/ + /** private List roleList **/; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/UpdateRoleRequestDTO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/UpdateRoleRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..19fb60f9ae22e7c31dcdc7172e8f7b4ced2dc6a9 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/UpdateRoleRequestDTO.java @@ -0,0 +1,29 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:角色类 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Data +@ToString +public class UpdateRoleRequestDTO { + + /** 主键ID **/ + private Long id; + /** 角色名称 **/ + private String roleName; + /** 角色编码 **/ + private String roleCode; + /** 角色状态 **/ + private Integer status; + /** 角色对应用户列表 **/ + /** private List userList **/; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/UpdateSystemAuthorityRequestDTO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/UpdateSystemAuthorityRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..4a9aee0358fcb4dc56cec4d08e5647bff3fe806c --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/UpdateSystemAuthorityRequestDTO.java @@ -0,0 +1,31 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:系统菜单权限类 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Data +@ToString +public class UpdateSystemAuthorityRequestDTO { + + /** 主键ID **/ + private Long id; + /** 权限编码标示 **/ + private String authCode; + /** 业务数据系统标示 **/ + private String systemName; + /** 功能 **/ + private String funcName; + /** 菜单 **/ + private String categoryName; + /** 按钮 **/ + private String menuName; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/UpdateSystemRequestDTO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/UpdateSystemRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..a0ae6cfec2bc04b2bfcc6ec593f2e80162718d55 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/UpdateSystemRequestDTO.java @@ -0,0 +1,37 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:系统管理类 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Data +@ToString +public class UpdateSystemRequestDTO { + + /** 主键ID **/ + private Long id; + /** 系统名称 **/ + private String systemName; + /** 系统标示 **/ + private String systemCode; + /** 系统域名 **/ + private String systemUrl; + /** 系统图标 **/ + private String systemPicUrl; + /** 系统技术负责人 **/ + private Long tecAdminUserId; + /** 系统业务负责人 **/ + private Long busAdminUserId; + /** 系统当前所在部门 **/ + private Long departmentId; + /** 系统模块列表 **/ + /** private List moduleBOList **/; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/UpdateUserGroupRequestDTO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/UpdateUserGroupRequestDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..637069b8bf9f85ecc1daa2b0f4be08d3ebbf5ed3 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/UpdateUserGroupRequestDTO.java @@ -0,0 +1,33 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:用户组类 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Data +@ToString +public class UpdateUserGroupRequestDTO { + + /** 主键ID **/ + private Long id; + /** 组名 **/ + private String groupName; + /** 组编码 **/ + private String groupCode; + /** 用户组状态 **/ + private Integer status; + /** 组内用户列表 **/ + /** private List userList **/; + /** 用户组对应的角色列表 **/ + /** private List roleList **/; + /** 用户组对应角色组列表 **/ + /** private List roleGroupList **/; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/UserGroupResponseDTO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/UserGroupResponseDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..e519936dd5c31c6c33347f7a34e776b7b4e38f8f --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/UserGroupResponseDTO.java @@ -0,0 +1,33 @@ +package com.coderman.infosys.auth.api.dto; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:用户组类 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Data +@ToString +public class UserGroupResponseDTO { + + /** 主键ID **/ + private Long id; + /** 组名 **/ + private String groupName; + /** 组编码 **/ + private String groupCode; + /** 用户组状态 **/ + private Integer status; + /** 组内用户列表 **/ + /** private List userList **/; + /** 用户组对应的角色列表 **/ + /** private List roleList **/; + /** 用户组对应角色组列表 **/ + /** private List roleGroupList **/; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/enums/AuthorityTypeEnum.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/enums/AuthorityTypeEnum.java new file mode 100644 index 0000000000000000000000000000000000000000..f06dce65a279638b631106f2436ec07f69f35cae --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/enums/AuthorityTypeEnum.java @@ -0,0 +1,45 @@ +package com.coderman.infosys.auth.api.enums; + +import lombok.Getter; + + /** + * @Description:权限类型类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Getter +public enum AuthorityTypeEnum{ + + /** + * + */ + DATA(1,"数据字段权限"), + FUNCATION(2,"菜单功能权限"), + ADMINISTRATION(3,"行政权限"), + CUSTOMIZE(4,"自定义权限"), + ; + + /** 权限类型code **/ + private Integer code; + /** 权限类型描述 **/ + private String desc; + + + AuthorityTypeEnum(Integer code,String desc){ + this.code = code; + this.desc = desc; + } + + + + /** + * + * @Description:static + * @return AuthorityTypeEnum + */ + public static AuthorityTypeEnum getByCode(Integer code){ + return null; + } + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/command/AbstractCmd.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/command/AbstractCmd.java new file mode 100644 index 0000000000000000000000000000000000000000..7f245dc71122201d1330d06937bb025e4cf805ae --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/command/AbstractCmd.java @@ -0,0 +1,40 @@ +package com.coderman.infosys.auth.app.command; + +import java.util.Date; + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:抽象命令类类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class AbstractCmd { + + + /** + * 操作时 + */ + public Date operateTime; + + /** + * 操作人I + */ + public Long userId; + + /** + * 命令 + */ + public Class commandClass; + + /** + * 命令数 + */ + public String payLoad;; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/command/AddRoleAuthCmd.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/command/AddRoleAuthCmd.java new file mode 100644 index 0000000000000000000000000000000000000000..0f853f5f0a06132f3965af824b9f24f09d5637c2 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/command/AddRoleAuthCmd.java @@ -0,0 +1,29 @@ +package com.coderman.infosys.auth.app.command; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:对角色权限类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class AddRoleAuthCmd extends AbstractCmd{ + + + /** + * 角色ID + */ + private Long roleId; + + /** + * 权限数据内容 + */ + private String json; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/command/AddUserAuthCmd.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/command/AddUserAuthCmd.java new file mode 100644 index 0000000000000000000000000000000000000000..ea0e9020e39143a6daea4a139feb9a005358bafc --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/command/AddUserAuthCmd.java @@ -0,0 +1,39 @@ +package com.coderman.infosys.auth.app.command; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:增加用户权限类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class AddUserAuthCmd extends AbstractCmd{ + + + /** + * 用户ID + */ + private Long userId; + + /** + * 角色ID + */ + private Long roleId; + + /** + * 权限类型 + */ + private int authorityType; + + /** + * 权限数据内容 + */ + private String json; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/command/AddUserCmd.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/command/AddUserCmd.java new file mode 100644 index 0000000000000000000000000000000000000000..146f1e5952076670fdc36d8cb2485b455080a252 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/command/AddUserCmd.java @@ -0,0 +1,34 @@ +package com.coderman.infosys.auth.app.command; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:增加用户命令类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class AddUserCmd extends AbstractCmd{ + + + /** + * 用户名 + */ + private String userName; + + /** + * 用户ID + */ + private Long userId; + + /** + * 所属组织 + */ + private Long departmentId; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/command/AddUserGroupCmd.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/command/AddUserGroupCmd.java new file mode 100644 index 0000000000000000000000000000000000000000..3dd38593a803bb45da7345cf70c8041fb1b501f6 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/command/AddUserGroupCmd.java @@ -0,0 +1,29 @@ +package com.coderman.infosys.auth.app.command; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:增加用户组命令类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class AddUserGroupCmd extends AbstractCmd{ + + + /** + * 组名 + */ + private String groupName; + + /** + * 用户ID + */ + private Long userId; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/command/UpdateRoleAuthCmd.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/command/UpdateRoleAuthCmd.java new file mode 100644 index 0000000000000000000000000000000000000000..67b9a18813963c97ab738f86c9d2262e8042a1e4 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/command/UpdateRoleAuthCmd.java @@ -0,0 +1,29 @@ +package com.coderman.infosys.auth.app.command; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:更新角色权限类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class UpdateRoleAuthCmd extends AbstractCmd{ + + + /** + * 角色ID + */ + private Long roleId; + + /** + * 权限数据内容 + */ + private String json; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/command/UpdateUserAuthCmd.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/command/UpdateUserAuthCmd.java new file mode 100644 index 0000000000000000000000000000000000000000..4facd9f38d27b2d82c3d05d7258ed0888e7e504c --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/command/UpdateUserAuthCmd.java @@ -0,0 +1,34 @@ +package com.coderman.infosys.auth.app.command; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:更新用户权限类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class UpdateUserAuthCmd extends AbstractCmd{ + + + /** + * 用户ID + */ + private Long userId; + + /** + * 角色ID + */ + private Long roleId; + + /** + * 权限数据内容 + */ + private String json; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/convert/AuthorityConvert.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/convert/AuthorityConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..f3b68efe8bcafff73689b24267f94b0ab9dd1ea0 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/convert/AuthorityConvert.java @@ -0,0 +1,60 @@ +package com.coderman.infosys.auth.app.convert; + +import com.coderman.infosys.auth.api.dto.UpdateAuthorityRequestDTO; +import com.coderman.infosys.auth.domain.bo.AuthorityBO; +import java.util.List; +import com.coderman.infosys.auth.api.dto.CreateAuthorityRequestDTO; +import com.coderman.infosys.auth.api.dto.AuthorityResponseDTO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:AuthorityConvert接口 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Mapper +public interface AuthorityConvert{ + AuthorityConvert INSTANCE = Mappers.getMapper(AuthorityConvert.class); + + /** + * + * @Description: + * @return AuthorityResponseDTO + */ + AuthorityResponseDTO bo2dto(AuthorityBO authorityBO); + /** + * + * @Description: + * @return List + */ + List authorityBOs2dtoList(List authorityBOList); + /** + * + * @Description: + * @return AuthorityBO + */ + AuthorityBO dto2bo(UpdateAuthorityRequestDTO updateAuthorityRequestDTO); + /** + * + * @Description: + * @return List + */ + List createAuthorityRequestDTOs2boList(List createAuthorityRequestDTOList); + /** + * + * @Description: + * @return AuthorityBO + */ + AuthorityBO dto2bo(CreateAuthorityRequestDTO createAuthorityRequestDTO); + /** + * + * @Description: + * @return List + */ + List updateAuthorityRequestDTOs2boList(List updateAuthorityRequestDTOList); +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/convert/DataAuthorityConvert.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/convert/DataAuthorityConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..f4abe7c44e57f8457ad994dad6e26c68d31d23e4 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/convert/DataAuthorityConvert.java @@ -0,0 +1,61 @@ +package com.coderman.infosys.auth.app.convert; + +import java.util.List; +import com.coderman.infosys.auth.domain.bo.AuthorityBO; +import com.coderman.infosys.auth.api.dto.UpdateDataAuthorityRequestDTO; +import com.coderman.infosys.auth.api.dto.CreateDataAuthorityRequestDTO; +import com.coderman.infosys.auth.api.dto.DataAuthorityResponseDTO; +import com.coderman.infosys.auth.domain.bo.DataAuthorityBO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:DataAuthorityConvert接口 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Mapper +public interface DataAuthorityConvert{ + DataAuthorityConvert INSTANCE = Mappers.getMapper(DataAuthorityConvert.class); + + /** + * + * @Description: + * @return List + */ + List createDataAuthorityRequestDTOs2boList(List createDataAuthorityRequestDTOList); + /** + * + * @Description: + * @return List + */ + List updateDataAuthorityRequestDTOs2boList(List updateDataAuthorityRequestDTOList); + /** + * + * @Description: + * @return DataAuthorityBO + */ + DataAuthorityBO dto2bo(CreateDataAuthorityRequestDTO createDataAuthorityRequestDTO); + /** + * + * @Description: + * @return DataAuthorityBO + */ + DataAuthorityBO dto2bo(UpdateDataAuthorityRequestDTO updateDataAuthorityRequestDTO); + /** + * + * @Description: + * @return DataAuthorityResponseDTO + */ + DataAuthorityResponseDTO bo2dto(DataAuthorityBO dataAuthorityBO); + /** + * + * @Description: + * @return List + */ + List dataAuthorityBOs2dtoList(List dataAuthorityBOList); +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/convert/MenuConvert.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/convert/MenuConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..3acc017b7365d3f4a804e0880a6a65f0a3a1540d --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/convert/MenuConvert.java @@ -0,0 +1,60 @@ +package com.coderman.infosys.auth.app.convert; + +import com.coderman.infosys.auth.domain.bo.MenuBO; +import java.util.List; +import com.coderman.infosys.auth.api.dto.UpdateMenuRequestDTO; +import com.coderman.infosys.auth.api.dto.CreateMenuRequestDTO; +import com.coderman.infosys.auth.api.dto.MenuResponseDTO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:MenuConvert接口 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Mapper +public interface MenuConvert{ + MenuConvert INSTANCE = Mappers.getMapper(MenuConvert.class); + + /** + * + * @Description: + * @return MenuResponseDTO + */ + MenuResponseDTO bo2dto(MenuBO menuBO); + /** + * + * @Description: + * @return List + */ + List menuBOs2dtoList(List menuBOList); + /** + * + * @Description: + * @return MenuBO + */ + MenuBO dto2bo(UpdateMenuRequestDTO updateMenuRequestDTO); + /** + * + * @Description: + * @return List + */ + List updateMenuRequestDTOs2boList(List updateMenuRequestDTOList); + /** + * + * @Description: + * @return MenuBO + */ + MenuBO dto2bo(CreateMenuRequestDTO createMenuRequestDTO); + /** + * + * @Description: + * @return List + */ + List createMenuRequestDTOs2boList(List createMenuRequestDTOList); +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/convert/ModuleConvert.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/convert/ModuleConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..1d6d2ea5e0369d4d75f100b49a1260c1453f4b2c --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/convert/ModuleConvert.java @@ -0,0 +1,60 @@ +package com.coderman.infosys.auth.app.convert; + +import java.util.List; +import com.coderman.infosys.auth.api.dto.UpdateModuleRequestDTO; +import com.coderman.infosys.auth.api.dto.ModuleResponseDTO; +import com.coderman.infosys.auth.domain.bo.ModuleBO; +import com.coderman.infosys.auth.api.dto.CreateModuleRequestDTO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:ModuleConvert接口 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Mapper +public interface ModuleConvert{ + ModuleConvert INSTANCE = Mappers.getMapper(ModuleConvert.class); + + /** + * + * @Description: + * @return ModuleResponseDTO + */ + ModuleResponseDTO bo2dto(ModuleBO moduleBO); + /** + * + * @Description: + * @return List + */ + List moduleBOs2dtoList(List moduleBOList); + /** + * + * @Description: + * @return ModuleBO + */ + ModuleBO dto2bo(CreateModuleRequestDTO createModuleRequestDTO); + /** + * + * @Description: + * @return ModuleBO + */ + ModuleBO dto2bo(UpdateModuleRequestDTO updateModuleRequestDTO); + /** + * + * @Description: + * @return List + */ + List createModuleRequestDTOs2boList(List createModuleRequestDTOList); + /** + * + * @Description: + * @return List + */ + List updateModuleRequestDTOs2boList(List updateModuleRequestDTOList); +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/convert/RoleConvert.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/convert/RoleConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..ded3a635ea50e89d1591a0261cc4cccd08862cb2 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/convert/RoleConvert.java @@ -0,0 +1,60 @@ +package com.coderman.infosys.auth.app.convert; + +import java.util.List; +import com.coderman.infosys.auth.domain.bo.RoleBO; +import com.coderman.infosys.auth.api.dto.CreateRoleRequestDTO; +import com.coderman.infosys.auth.api.dto.RoleResponseDTO; +import com.coderman.infosys.auth.api.dto.UpdateRoleRequestDTO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:RoleConvert接口 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Mapper +public interface RoleConvert{ + RoleConvert INSTANCE = Mappers.getMapper(RoleConvert.class); + + /** + * + * @Description: + * @return List + */ + List createRoleRequestDTOs2boList(List createRoleRequestDTOList); + /** + * + * @Description: + * @return RoleBO + */ + RoleBO dto2bo(UpdateRoleRequestDTO updateRoleRequestDTO); + /** + * + * @Description: + * @return RoleResponseDTO + */ + RoleResponseDTO bo2dto(RoleBO roleBO); + /** + * + * @Description: + * @return List + */ + List roleBOs2dtoList(List roleBOList); + /** + * + * @Description: + * @return List + */ + List updateRoleRequestDTOs2boList(List updateRoleRequestDTOList); + /** + * + * @Description: + * @return RoleBO + */ + RoleBO dto2bo(CreateRoleRequestDTO createRoleRequestDTO); +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/convert/RoleGroupConvert.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/convert/RoleGroupConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..520d2a88e418afec3ab891536cebc86c998b0a5c --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/convert/RoleGroupConvert.java @@ -0,0 +1,47 @@ +package com.coderman.infosys.auth.app.convert; + +import com.coderman.infosys.auth.api.dto.UpdateRoleGroupRequestDTO; +import java.util.List; +import com.coderman.infosys.auth.api.dto.RoleGroupResponseDTO; +import com.coderman.infosys.auth.domain.bo.RoleGroupBO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:RoleGroupConvert接口 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Mapper +public interface RoleGroupConvert{ + RoleGroupConvert INSTANCE = Mappers.getMapper(RoleGroupConvert.class); + + /** + * + * @Description: + * @return RoleGroupBO + */ + RoleGroupBO dto2bo(UpdateRoleGroupRequestDTO updateRoleGroupRequestDTO); + /** + * + * @Description: + * @return RoleGroupResponseDTO + */ + RoleGroupResponseDTO bo2dto(RoleGroupBO roleGroupBO); + /** + * + * @Description: + * @return List + */ + List roleGroupBOs2dtoList(List roleGroupBOList); + /** + * + * @Description: + * @return List + */ + List updateRoleGroupRequestDTOs2boList(List updateRoleGroupRequestDTOList); +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/convert/SystemAuthorityConvert.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/convert/SystemAuthorityConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..adad5d8e535371abe89b311e8bc50b1c9c86e6ba --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/convert/SystemAuthorityConvert.java @@ -0,0 +1,61 @@ +package com.coderman.infosys.auth.app.convert; + +import com.coderman.infosys.auth.domain.bo.SystemAuthorityBO; +import com.coderman.infosys.auth.domain.bo.AuthorityBO; +import java.util.List; +import com.coderman.infosys.auth.api.dto.UpdateSystemAuthorityRequestDTO; +import com.coderman.infosys.auth.api.dto.SystemAuthorityResponseDTO; +import com.coderman.infosys.auth.api.dto.CreateSystemAuthorityRequestDTO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:SystemAuthorityConvert接口 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Mapper +public interface SystemAuthorityConvert{ + SystemAuthorityConvert INSTANCE = Mappers.getMapper(SystemAuthorityConvert.class); + + /** + * + * @Description: + * @return SystemAuthorityResponseDTO + */ + SystemAuthorityResponseDTO bo2dto(SystemAuthorityBO systemAuthorityBO); + /** + * + * @Description: + * @return SystemAuthorityBO + */ + SystemAuthorityBO dto2bo(CreateSystemAuthorityRequestDTO createSystemAuthorityRequestDTO); + /** + * + * @Description: + * @return List + */ + List createSystemAuthorityRequestDTOs2boList(List createSystemAuthorityRequestDTOList); + /** + * + * @Description: + * @return List + */ + List updateSystemAuthorityRequestDTOs2boList(List updateSystemAuthorityRequestDTOList); + /** + * + * @Description: + * @return SystemAuthorityBO + */ + SystemAuthorityBO dto2bo(UpdateSystemAuthorityRequestDTO updateSystemAuthorityRequestDTO); + /** + * + * @Description: + * @return List + */ + List systemAuthorityBOs2dtoList(List systemAuthorityBOList); +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/convert/SystemConvert.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/convert/SystemConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..8705de75ebb4ab9f788dd4f43450082128ee65e8 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/convert/SystemConvert.java @@ -0,0 +1,72 @@ +package com.coderman.infosys.auth.app.convert; + +import java.util.List; +import com.coderman.infosys.auth.api.dto.UpdateSystemRequestDTO; +import com.coderman.infosys.auth.domain.bo.SystemBO; +import com.coderman.infosys.auth.api.dto.CreateSystemRequestDTO; +import com.coderman.infosys.auth.api.dto.SystemDTO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:SystemConvert接口 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Mapper +public interface SystemConvert{ + SystemConvert INSTANCE = Mappers.getMapper(SystemConvert.class); + + /** + * + * @Description: + * @return List + */ + List systemDTOs2boList(List systemDTOList); + /** + * + * @Description: + * @return SystemBO + */ + SystemBO dto2bo(CreateSystemRequestDTO createSystemRequestDTO); + /** + * + * @Description: + * @return List + */ + List createSystemRequestDTOs2boList(List createSystemRequestDTOList); + /** + * + * @Description: + * @return SystemBO + */ + SystemBO dto2bo(UpdateSystemRequestDTO updateSystemRequestDTO); + /** + * + * @Description: + * @return SystemBO + */ + SystemBO dto2bo(SystemDTO systemDTO); + /** + * + * @Description: + * @return SystemDTO + */ + SystemDTO bo2dto(SystemBO systemBO); + /** + * + * @Description: + * @return List + */ + List systemBOs2dtoList(List systemBOList); + /** + * + * @Description: + * @return List + */ + List updateSystemRequestDTOs2boList(List updateSystemRequestDTOList); +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/convert/UserGroupConvert.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/convert/UserGroupConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..5782989686868e084430fe3b209573b87156f313 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/convert/UserGroupConvert.java @@ -0,0 +1,60 @@ +package com.coderman.infosys.auth.app.convert; + +import com.coderman.infosys.auth.api.dto.UserGroupResponseDTO; +import java.util.List; +import com.coderman.infosys.auth.api.dto.CreateUserGroupRequestDTO; +import com.coderman.infosys.auth.domain.bo.UserGroupBO; +import com.coderman.infosys.auth.api.dto.UpdateUserGroupRequestDTO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:UserGroupConvert接口 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Mapper +public interface UserGroupConvert{ + UserGroupConvert INSTANCE = Mappers.getMapper(UserGroupConvert.class); + + /** + * + * @Description: + * @return List + */ + List updateUserGroupRequestDTOs2boList(List updateUserGroupRequestDTOList); + /** + * + * @Description: + * @return UserGroupResponseDTO + */ + UserGroupResponseDTO bo2dto(UserGroupBO userGroupBO); + /** + * + * @Description: + * @return UserGroupBO + */ + UserGroupBO dto2bo(UpdateUserGroupRequestDTO updateUserGroupRequestDTO); + /** + * + * @Description: + * @return List + */ + List userGroupBOs2dtoList(List userGroupBOList); + /** + * + * @Description: + * @return UserGroupBO + */ + UserGroupBO dto2bo(CreateUserGroupRequestDTO createUserGroupRequestDTO); + /** + * + * @Description: + * @return List + */ + List createUserGroupRequestDTOs2boList(List createUserGroupRequestDTOList); +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/exe/CmdExeService.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/exe/CmdExeService.java new file mode 100644 index 0000000000000000000000000000000000000000..723b622e729f7ced7d2728923d9420b7d520dbf9 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/exe/CmdExeService.java @@ -0,0 +1,19 @@ +package com.coderman.infosys.auth.app.exe; + +import com.coderman.infosys.auth.app.command.AbstractCmd; + + +/** + * @Description:命令执行接口接口 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +public interface CmdExeService{ + /** + * + * @Description:命令执行入口 + * @return String + */ + String exe(AbstractCmd abstractCmd); +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/exe/RoleAuthCmdExe.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/exe/RoleAuthCmdExe.java new file mode 100644 index 0000000000000000000000000000000000000000..425dea5523740c5ac1d34a79673bc4d8c00caf12 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/exe/RoleAuthCmdExe.java @@ -0,0 +1,29 @@ +package com.coderman.infosys.auth.app.exe; + +import com.coderman.infosys.auth.app.command.AbstractCmd; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import com.coderman.infosys.auth.app.exe.RoleAuthCmdExe; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * @Description:角色权限cmd处理类接口实现类 + * @Author：shenshuai + * @CreateTime：2021-11-06 23:38:06 + * @version v1.0 + */ +@Service +public class RoleAuthCmdExe implements CmdExeService{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + @Override + public String exe(AbstractCmd abstractCmd){ + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/exe/UserAuthCmdExe.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/exe/UserAuthCmdExe.java new file mode 100644 index 0000000000000000000000000000000000000000..7d937e14b78dce9026e3b148fa4bbce75099e7f9 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/exe/UserAuthCmdExe.java @@ -0,0 +1,29 @@ +package com.coderman.infosys.auth.app.exe; + +import com.coderman.infosys.auth.app.command.AbstractCmd; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import com.coderman.infosys.auth.app.exe.UserAuthCmdExe; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * @Description:用户权限cmd处理类接口实现类 + * @Author：shenshuai + * @CreateTime：2021-11-06 23:38:06 + * @version v1.0 + */ +@Service +public class UserAuthCmdExe implements CmdExeService{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + @Override + public String exe(AbstractCmd abstractCmd){ + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/exe/UserCmdExe.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/exe/UserCmdExe.java new file mode 100644 index 0000000000000000000000000000000000000000..df08cee162bb44f438b4a5e2b3d17a0b2cfa749c --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/exe/UserCmdExe.java @@ -0,0 +1,29 @@ +package com.coderman.infosys.auth.app.exe; + +import com.coderman.infosys.auth.app.command.AbstractCmd; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import com.coderman.infosys.auth.app.exe.UserCmdExe; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * @Description:用户cmd处理类接口实现类 + * @Author：shenshuai + * @CreateTime：2021-11-06 23:38:06 + * @version v1.0 + */ +@Service +public class UserCmdExe implements CmdExeService{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + @Override + public String exe(AbstractCmd abstractCmd){ + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/exe/UserGroupCmdExe.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/exe/UserGroupCmdExe.java new file mode 100644 index 0000000000000000000000000000000000000000..966f6957828e4319fd6f8b91627d543499c22a71 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/exe/UserGroupCmdExe.java @@ -0,0 +1,29 @@ +package com.coderman.infosys.auth.app.exe; + +import com.coderman.infosys.auth.app.command.AbstractCmd; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import com.coderman.infosys.auth.app.exe.UserGroupCmdExe; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * @Description:用户组cmd处理类接口实现类 + * @Author：shenshuai + * @CreateTime：2021-11-06 23:38:06 + * @version v1.0 + */ +@Service +public class UserGroupCmdExe implements CmdExeService{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + @Override + public String exe(AbstractCmd abstractCmd){ + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/controller/BaseController.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/controller/BaseController.java new file mode 100644 index 0000000000000000000000000000000000000000..25e870deb01b0fe78e45c0d1197e79ffc6bac8a3 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/controller/BaseController.java @@ -0,0 +1,45 @@ +package com.coderman.infosys.auth.controller; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** +* @Description:控制层基础父类 +* @Author:shenshuai +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +public class BaseController{ + + protected Logger logger = LoggerFactory.getLogger(this.getClass()); + + /** + * 从request中获取指定的字符串 + * @param parameterName + * @return + */ + protected String getParameterString(String parameterName) { + //return RequestUtil.getParameterString(parameterName); + return ""; + } + + /** + * 从request中获取指定的整型 + * @param parameterName + * @return + */ + protected Integer getParameterInteger(String parameterName) { + // return RequestUtil.getParameterInteger(parameterName); + return 0; + } + + /** + * 从request中获取指定的长整型 + * @param parameterName + * @return + */ + protected Long getParameterLong(String parameterName) { + //return RequestUtil.getParameterLong(parameterName); + return 0L; + } +} diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/AdminAuthorityBO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/AdminAuthorityBO.java new file mode 100644 index 0000000000000000000000000000000000000000..18db1e5cfc7b0d56ef907f1c4316105f7ae7090c --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/AdminAuthorityBO.java @@ -0,0 +1,39 @@ +package com.coderman.infosys.auth.domain.bo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:行政权限类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class AdminAuthorityBO extends AuthorityBO{ + + + /** + * 权限编码标示 + */ + private String authCode; + + /** + * 组织部门 + */ + private Long departmentId; + + /** + * 城市 + */ + private Long cityId; + + /** + * 职位 + */ + private Long jobId; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/AuthAggregateBO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/AuthAggregateBO.java new file mode 100644 index 0000000000000000000000000000000000000000..1b209ec3571fe8965abb1c0d5a1e4381e29347e5 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/AuthAggregateBO.java @@ -0,0 +1,50 @@ +package com.coderman.infosys.auth.domain.bo; + +import java.util.List; + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:权限聚合根类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class AuthAggregateBO { + + + /** + * 系统权 + */ + public List systemBOList; + + /** + * 菜单权 + */ + public List moduleBOList; + + /** + * 按钮权 + */ + public List menuBOList; + + /** + * 城市权 + */ + public List cityIdList; + + /** + * 部门权 + */ + public List departmentIdList; + + /** + * 数据字段权 + */ + public List dataColumnBOList; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/AuthorityBO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/AuthorityBO.java new file mode 100644 index 0000000000000000000000000000000000000000..834e22b6d1f97b5e0f4b55008fc2b0184f547af0 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/AuthorityBO.java @@ -0,0 +1,65 @@ +package com.coderman.infosys.auth.domain.bo; + +import java.util.List; + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:权限类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class AuthorityBO { + + + /** + * 主键ID + */ + private Long id; + + /** + * 权限编码标示 + */ + private String authCode; + + /** + * 权限类型 + */ + private Integer authorityType; + + /** + * 关联角色 + */ + private String roleCode; + + /** + * 关联角色组 + */ + private String roleGroupCode; + + /** + * 数据字段权限列表 + */ + private List dataAuthorityBOList; + + /** + * 系统菜单权限列表 + */ + private List systemAuthorityBOList; + + /** + * 行政权限列表 + */ + private List adminAuthorityBOList; + + /** + * 权限状态 + */ + private Integer status; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/AuthorityUpdateRequestBO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/AuthorityUpdateRequestBO.java new file mode 100644 index 0000000000000000000000000000000000000000..1185e700cea66b2387d14c1da054752218fe1069 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/AuthorityUpdateRequestBO.java @@ -0,0 +1,24 @@ +package com.coderman.infosys.auth.domain.bo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:权限更新请求实体类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class AuthorityUpdateRequestBO { + + + /** + * 权限编码标示 + */ + private String authCode; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/BasicOperateBO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/BasicOperateBO.java new file mode 100644 index 0000000000000000000000000000000000000000..79ca5c5b125dc0d6ebbc35c967aed097dcd0a32c --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/BasicOperateBO.java @@ -0,0 +1,40 @@ +package com.coderman.infosys.auth.domain.bo; + +import java.util.Date; + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:数据操作信息类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class BasicOperateBO { + + + /** + * 修改时 + */ + public Date dateUpdate; + + /** + * 创建时 + */ + public Date dateCreate; + + /** + * 修改 + */ + public Long updateUserId; + + /** + * 创建 + */ + public Long createUserId; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/DataAuthorityBO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/DataAuthorityBO.java new file mode 100644 index 0000000000000000000000000000000000000000..22d506b90d51d14f7fe8cf06aa5da87a739d3571 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/DataAuthorityBO.java @@ -0,0 +1,34 @@ +package com.coderman.infosys.auth.domain.bo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:数据字段权限类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class DataAuthorityBO extends AuthorityBO { + + + /** + * 主键ID + */ + private Long id; + + /** + * 权限编码标示 + */ + private String authCode; + + /** + * 数据字段ID + */ + private Long dataColumnId; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/DataColumnBO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/DataColumnBO.java new file mode 100644 index 0000000000000000000000000000000000000000..ebbe7aa406c52c4315f242ae19334fc9e8892f8a --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/DataColumnBO.java @@ -0,0 +1,59 @@ +package com.coderman.infosys.auth.domain.bo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:数据字段实体类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class DataColumnBO { + + + /** + * 主键ID + */ + private Long id; + + /** + * 主键ID + */ + private Long id; + + /** + * 数据库业务系统名称 + */ + private String busDataBase; + + /** + * 数据库表名称 + */ + private String tableName; + + /** + * 数据库表描述 + */ + private String tableDesc; + + /** + * 数据库字段名称 + */ + private String columnName; + + /** + * 数据库字段描述 + */ + private String columnDesc; + + /** + * 业务字段名称 + */ + private String fieldName; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/MenuBO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/MenuBO.java new file mode 100644 index 0000000000000000000000000000000000000000..e454145ebfa2faf0f2731f45b523071c4d828ae0 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/MenuBO.java @@ -0,0 +1,49 @@ +package com.coderman.infosys.auth.domain.bo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:按钮管理类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class MenuBO { + + + /** + * 主键ID + */ + private Long id; + + /** + * 按钮名称 + */ + private String menuName; + + /** + * 按钮编码 + */ + private String menuCode; + + /** + * 按钮链接 + */ + private String menuUrl; + + /** + * 系统编码 + */ + private String systemCode; + + /** + * 菜单编码 + */ + private String moduleCode; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/ModuleBO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/ModuleBO.java new file mode 100644 index 0000000000000000000000000000000000000000..895905fa5413f7bf4610c0f768af2c3a3535aa17 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/ModuleBO.java @@ -0,0 +1,50 @@ +package com.coderman.infosys.auth.domain.bo; + +import java.util.List; + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:菜单/模块管理类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class ModuleBO { + + + /** + * 主键ID + */ + private Long id; + + /** + * 菜单名称 + */ + private String moduleName; + + /** + * 菜单编码 + */ + private String moduleCode; + + /** + * 菜单链接 + */ + private String moduleUrl; + + /** + * 系统标示 + */ + private String systemCode; + + /** + * 按钮列表 + */ + private List menuBOList; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/OperateDateBO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/OperateDateBO.java new file mode 100644 index 0000000000000000000000000000000000000000..b9e8014fb34f5251306eddf8e4eb0a2d1634d117 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/OperateDateBO.java @@ -0,0 +1,30 @@ +package com.coderman.infosys.auth.domain.bo; + +import java.util.Date; + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:操作时间信息类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class OperateDateBO { + + + /** + * 修改时 + */ + public Date dateUpdate; + + /** + * 修改 + */ + public Long updateUserId; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/OperatorBO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/OperatorBO.java new file mode 100644 index 0000000000000000000000000000000000000000..1e35d910a2c7fa94af1fbde85d5a92a459e3ae3b --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/OperatorBO.java @@ -0,0 +1,30 @@ +package com.coderman.infosys.auth.domain.bo; + +import java.util.Date; + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:操作人信息类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class OperatorBO { + + + /** + * 创建时 + */ + public Date dateCreate; + + /** + * 创建 + */ + public Long createUserId; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/RoleAuthAggregateBO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/RoleAuthAggregateBO.java new file mode 100644 index 0000000000000000000000000000000000000000..c60f483cdba74e4ba08c245a0e174b52f8dc67b5 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/RoleAuthAggregateBO.java @@ -0,0 +1,24 @@ +package com.coderman.infosys.auth.domain.bo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:角色权限聚合根类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class RoleAuthAggregateBO extends AuthAggregateBO{ + + + /** + * 角色ID + */ + private Long roleId; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/RoleBO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/RoleBO.java new file mode 100644 index 0000000000000000000000000000000000000000..554cbfe4cb4832d8428ec57e9a6b9db772a146e9 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/RoleBO.java @@ -0,0 +1,45 @@ +package com.coderman.infosys.auth.domain.bo; + +import java.util.List; + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:角色类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class RoleBO { + + + /** + * 主键ID + */ + private Long id; + + /** + * 角色名称 + */ + private String roleName; + + /** + * 角色编码 + */ + private String roleCode; + + /** + * 角色对应用户列表 + */ + private List userList; + + /** + * 角色状态 + */ + private Integer status; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/RoleGroupBO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/RoleGroupBO.java new file mode 100644 index 0000000000000000000000000000000000000000..f6937034a8a2448ffccdeed359a862e141dc82ff --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/RoleGroupBO.java @@ -0,0 +1,45 @@ +package com.coderman.infosys.auth.domain.bo; + +import java.util.List; + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:角色组类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class RoleGroupBO { + + + /** + * 主键ID + */ + private Long id; + + /** + * 角色组名称 + */ + private String roleName; + + /** + * 角色组编码 + */ + private String roleCode; + + /** + * 组内角色列表 + */ + private List roleList; + + /** + * 角色状态 + */ + private Integer status; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/SystemAuthorityBO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/SystemAuthorityBO.java new file mode 100644 index 0000000000000000000000000000000000000000..a98c36bb93dd8c22606a668c614397e0c9d852e3 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/SystemAuthorityBO.java @@ -0,0 +1,49 @@ +package com.coderman.infosys.auth.domain.bo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:系统菜单权限类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class SystemAuthorityBO extends AuthorityBO{ + + + /** + * 主键ID + */ + private Long id; + + /** + * 权限编码标示 + */ + private String authCode; + + /** + * 业务数据系统标示 + */ + private String systemName; + + /** + * 功能 + */ + private String funcName; + + /** + * 菜单 + */ + private String categoryName; + + /** + * 按钮 + */ + private String menuName; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/SystemBO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/SystemBO.java new file mode 100644 index 0000000000000000000000000000000000000000..80dad2fdf3f91a786b541a8498ec65102f9cd560 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/SystemBO.java @@ -0,0 +1,65 @@ +package com.coderman.infosys.auth.domain.bo; + +import java.util.List; + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:系统管理类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class SystemBO { + + + /** + * 主键ID + */ + private Long id; + + /** + * 系统名称 + */ + private String systemName; + + /** + * 系统标示 + */ + private String systemCode; + + /** + * 系统域名 + */ + private String systemUrl; + + /** + * 系统图标 + */ + private String systemPicUrl; + + /** + * 系统技术负责人 + */ + private Long tecAdminUserId; + + /** + * 系统业务负责人 + */ + private Long busAdminUserId; + + /** + * 系统当前所在部门 + */ + private Long departmentId; + + /** + * 系统模块列表 + */ + private List moduleBOList; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/SystemConfig.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/SystemConfig.java new file mode 100644 index 0000000000000000000000000000000000000000..dcd5abb96d305636976f2e2482acb82ef652d5b8 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/SystemConfig.java @@ -0,0 +1,25 @@ +package com.coderman.infosys.auth.domain.bo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:系统设置类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class SystemConfig { + + /** 变量名 **/ + private String varName; + /** 变量描述 **/ + private String varDesc; + /** 变量值 **/ + private String value; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/UserAuthAggregateBO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/UserAuthAggregateBO.java new file mode 100644 index 0000000000000000000000000000000000000000..7ea40b2f65beb6a327a68ef65bab849a3316314d --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/UserAuthAggregateBO.java @@ -0,0 +1,24 @@ +package com.coderman.infosys.auth.domain.bo; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:用户权限聚合根类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class UserAuthAggregateBO extends AuthAggregateBO{ + + + /** + * 用户ID + */ + private Long userId; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/UserBO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/UserBO.java new file mode 100644 index 0000000000000000000000000000000000000000..d67e7e028a6b6d6be4d7dc0aff3126b7fdc4de06 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/UserBO.java @@ -0,0 +1,40 @@ +package com.coderman.infosys.auth.domain.bo; + +import java.util.List; + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:用户信息类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class UserBO { + + + /** + * 用户名 + */ + private String userName; + + /** + * 用户ID + */ + private Long userId; + + /** + * 用户对应角色列表 + */ + private List userList; + + /** + * 用户对应角色组列表 + */ + private List userList; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/UserGroupBO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/UserGroupBO.java new file mode 100644 index 0000000000000000000000000000000000000000..b61b1a0bd5504852bdf040bb3da15d813cbea686 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/UserGroupBO.java @@ -0,0 +1,55 @@ +package com.coderman.infosys.auth.domain.bo; + +import java.util.List; + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:用户组类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class UserGroupBO { + + + /** + * 主键ID + */ + private Long id; + + /** + * 组名 + */ + private String groupName; + + /** + * 组编码 + */ + private String groupCode; + + /** + * 组内用户列表 + */ + private List userList; + + /** + * 用户组状态 + */ + private Integer status; + + /** + * 用户组对应的角色列表 + */ + private List roleList; + + /** + * 用户组对应角色组列表 + */ + private List roleGroupList; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/enums/AuthorityTypeEnum.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/enums/AuthorityTypeEnum.java new file mode 100644 index 0000000000000000000000000000000000000000..c0d61b79914b5af59f0ffa9047c527682f2041ad --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/enums/AuthorityTypeEnum.java @@ -0,0 +1,45 @@ +package com.coderman.infosys.auth.domain.enums; + +import lombok.Getter; + + /** + * @Description:权限类型类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Getter +public enum AuthorityTypeEnum{ + + /** + * + */ + DATA(1,"数据字段权限"), + FUNCATION(2,"菜单功能权限"), + ADMINISTRATION(3,"行政权限"), + CUSTOMIZE(4,"自定义权限"), + ; + + /** 权限类型code **/ + private Integer code; + /** 权限类型描述 **/ + private String desc; + + + AuthorityTypeEnum(Integer code,String desc){ + this.code = code; + this.desc = desc; + } + + + + /** + * + * @Description:static + * @return AuthorityTypeEnum + */ + public static AuthorityTypeEnum getByCode(Integer code){ + return null; + } + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/event/BaseEvent.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/event/BaseEvent.java new file mode 100644 index 0000000000000000000000000000000000000000..22c0d908928a00f63cd478802d8e5dbca90ea875 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/event/BaseEvent.java @@ -0,0 +1,18 @@ +package com.coderman.infosys.auth.domain.event; + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:事件基类类 + * @Author: + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class BaseEvent{ + + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/event/MenuChangeEvent.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/event/MenuChangeEvent.java new file mode 100644 index 0000000000000000000000000000000000000000..4d7aa1a2676014ac2dfa8e2ee9b307d477f173b0 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/event/MenuChangeEvent.java @@ -0,0 +1,25 @@ +package com.coderman.infosys.auth.domain.event; + +import com.coderman.infosys.auth.domain.bo.MenuBO; +import lombok.Data; +import lombok.ToString; + + /** + * @Description:按钮信息变更事件类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class MenuChangeEvent{ + + /** 按钮code **/ + private String menuCode; + /** 变更事件类型 **/ + private Integer changeEventType; + /** 按钮内容 **/ + private MenuBO menuBO; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/event/RoleAuthChangeEvent.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/event/RoleAuthChangeEvent.java new file mode 100644 index 0000000000000000000000000000000000000000..ea5ddf75e5fd581fe8dab92c20d8f031d4a9580e --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/event/RoleAuthChangeEvent.java @@ -0,0 +1,27 @@ +package com.coderman.infosys.auth.domain.event; + +import com.coderman.infosys.auth.domain.bo.RoleBO; +import lombok.Data; +import lombok.ToString; + + /** + * @Description:角色授权变更事件类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class RoleAuthChangeEvent{ + + /** 角色code **/ + private String roleCode; + /** 权限code **/ + private String authCode; + /** 变更事件类型 **/ + private Integer changeEventType; + /** 角色内容 **/ + private RoleBO roleBO; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/event/RoleChangeEvent.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/event/RoleChangeEvent.java new file mode 100644 index 0000000000000000000000000000000000000000..5f6338aafdcd4a723b726070bdbf2b06c7616874 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/event/RoleChangeEvent.java @@ -0,0 +1,25 @@ +package com.coderman.infosys.auth.domain.event; + +import com.coderman.infosys.auth.domain.bo.RoleBO; +import lombok.Data; +import lombok.ToString; + + /** + * @Description:角色变更事件类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class RoleChangeEvent{ + + /** 角色code **/ + private String roleCode; + /** 变更事件类型 **/ + private Integer changeEventType; + /** 角色内容 **/ + private RoleBO roleBO; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/factory/AuthorityFactory.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/factory/AuthorityFactory.java new file mode 100644 index 0000000000000000000000000000000000000000..cf085c7b45991f542eb577a313818a00af2db56f --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/factory/AuthorityFactory.java @@ -0,0 +1,43 @@ +package com.coderman.infosys.auth.domain.factory; + +import com.coderman.infosys.auth.domain.bo.AuthorityBO; +import com.coderman.infosys.auth.domain.bo.UserAuthAggregateBO; +import com.coderman.infosys.auth.domain.bo.AuthAggregateBO; + +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; + + /** + * @Description:AuthorityFactory类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Service +public class AuthorityFactory{ + + + + /** + * + * @Description 基于权限本身的维度-权限编码构建权限模 + * @param authorityCode + * @return AuthorityBO + */ + public AuthorityBO buildAuthorityByCode(String authorityCode){ + + return null; + } + + /** + * + * @Description 基于用户的维度构建权限模 + * @param roleCode + * @return UserAuthAggregateBO + */ + public UserAuthAggregateBO buildAuthorityWithRoleCode(String roleCode){ + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/gataway/AuthorityRepository.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/gataway/AuthorityRepository.java new file mode 100644 index 0000000000000000000000000000000000000000..c6315cb5272aba5de0659310369400067ab96841 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/gataway/AuthorityRepository.java @@ -0,0 +1,44 @@ +package com.coderman.infosys.auth.domain.gataway; + +import com.coderman.infosys.auth.domain.bo.AuthorityBO; +import com.coderman.infosys.auth.domain.bo.AuthorityUpdateRequestBO; + + +/** + * @Description:权限管理仓库接口 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +public interface AuthorityRepository{ + /** + * + * @Description:给角色构建权限 + * @return Boolean + */ + Boolean buildAuthority(AuthorityBO authorityBO); + /** + * + * @Description:给角色更新权限 + * @return Boolean + */ + Boolean updateAuthority(AuthorityUpdateRequestBO authorityUpdateRequestBO); + /** + * + * @Description:根据权限code禁用权限资源 + * @return Boolean + */ + Boolean disableAuthority(String authorityCode); + /** + * + * @Description:根据权限code查询权限资源 + * @return AuthorityBO + */ + AuthorityBO getByCode(String authorityCode); + /** + * + * @Description:根据角色code查询权限资源 + * @return AuthorityBO + */ + AuthorityBO getByRoleCode(String roleCode); +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/gataway/DataColumnGataWay.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/gataway/DataColumnGataWay.java new file mode 100644 index 0000000000000000000000000000000000000000..4d52f3084fd9b1b9abf65a15bd2df49ccd44edfe --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/gataway/DataColumnGataWay.java @@ -0,0 +1,51 @@ +package com.coderman.infosys.auth.domain.gataway; + +import java.util.List; +import com.coderman.utils.commonbo.PageBO; +import com.coderman.infosys.auth.domain.bo.DataColumnBO; + + +/** + * @Description:数据字段管理网关接口 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +public interface DataColumnGataWay{ + /** + * + * @Description:保存数据字段 + * @return Long + */ + Long saveDataColumn(DataColumnBO dataColumnBO); + /** + * + * @Description:批量保存保存数据字段 + * @return Boolean + */ + Boolean saveBatchDataColumn(List list); + /** + * + * @Description:更新数据字段 + * @return Long + */ + Long updateDataColumn(DataColumnBO dataColumnBO); + /** + * + * @Description:根据ID查询数据字段详情 + * @return DataColumnBO + */ + DataColumnBO getById(Long id); + /** + * + * @Description:根据数据库名称获取字段元数据内容 + * @return List + */ + List getByDBCode(String busDataBase); + /** + * + * @Description:分页查询数据字段内容 + * @return List + */ + List getPageList(PageBO pageBO); +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/gataway/SystemModuleQueryGataWay.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/gataway/SystemModuleQueryGataWay.java new file mode 100644 index 0000000000000000000000000000000000000000..be66458c1d807cb9b80754b4d1e5495b760e37d2 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/gataway/SystemModuleQueryGataWay.java @@ -0,0 +1,71 @@ +package com.coderman.infosys.auth.domain.gataway; + +import java.util.List; +import com.coderman.infosys.auth.domain.bo.MenuBO; +import com.coderman.utils.commonbo.PageBO; +import com.coderman.infosys.auth.domain.bo.SystemBO; +import com.coderman.infosys.auth.domain.bo.ModuleBO; + + +/** + * @Description:系统菜单按钮查询服务接口 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +public interface SystemModuleQueryGataWay{ + /** + * + * @Description:分页查询系统列表 + * @return List + */ + List querySystemPage(PageBO pageBO); + /** + * + * @Description:分页查询菜单列表 + * @return List + */ + List queryModulePage(); + /** + * + * @Description:基于系统code查询菜单和按钮 + * @return SystemBO + */ + SystemBO queryBySystemCode(String systemCode); + /** + * + * @Description:根据条件查询系统 + * @return List + */ + List queryByCondition(String search); + /** + * + * @Description:查询所有系统菜单和按钮 + * @return List + */ + List queryWithAll(String search); + /** + * + * @Description:根据code查询系统详情 + * @return SystemBO + */ + SystemBO getSystemByCode(String systemCode); + /** + * + * @Description:根据code查询菜单详情 + * @return ModuleBO + */ + ModuleBO getModuleByCode(String moduleCode); + /** + * + * @Description:根据code查询按钮详情 + * @return MenuBO + */ + MenuBO getMenu(String menuCode); + /** + * + * @Description:根据系统名称查询 + * @return List + */ + List getSystemByName(String systemName); +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/gataway/SystemModuleRepository.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/gataway/SystemModuleRepository.java new file mode 100644 index 0000000000000000000000000000000000000000..bed64b7da1f592b4c62ce38dc6ab4ce62735a274 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/gataway/SystemModuleRepository.java @@ -0,0 +1,51 @@ +package com.coderman.infosys.auth.domain.gataway; + +import com.coderman.infosys.auth.domain.bo.MenuBO; +import com.coderman.infosys.auth.domain.bo.SystemBO; +import com.coderman.infosys.auth.domain.bo.ModuleBO; + + +/** + * @Description:系统菜单按钮仓库服务接口 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +public interface SystemModuleRepository{ + /** + * + * @Description:创建系统信息 + * @return Long + */ + Long saveSystem(SystemBO systemBO); + /** + * + * @Description:更新系统信息 + * @return Integer + */ + Integer updateSystem(SystemBO systemBO); + /** + * + * @Description:创建菜单信息 + * @return Long + */ + Long saveModule(ModuleBO moduleBO); + /** + * + * @Description:更新菜单信息 + * @return Integer + */ + Integer updateModule(ModuleBO moduleBO); + /** + * + * @Description:创建按钮信息 + * @return Long + */ + Long saveMenu(MenuBO moduleBO); + /** + * + * @Description:更新按钮信息 + * @return Integer + */ + Integer updateMenu(MenuBO moduleBO); +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/gataway/UserRoleRepository.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/gataway/UserRoleRepository.java new file mode 100644 index 0000000000000000000000000000000000000000..c5c1629136f823903264d9ac8bdf9dd46db5fbc7 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/gataway/UserRoleRepository.java @@ -0,0 +1,77 @@ +package com.coderman.infosys.auth.domain.gataway; + +import java.util.List; +import com.coderman.infosys.auth.domain.bo.UserGroupBO; +import com.coderman.utils.commonbo.PageBO; +import com.coderman.infosys.auth.domain.bo.RoleBO; +import com.coderman.infosys.auth.domain.bo.RoleGroupBO; + + +/** + * @Description:用户和角色管理仓库接口 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +public interface UserRoleRepository{ + /** + * + * @Description:保存用户组并尝试关联用户 + * @return Long + */ + Long saveUserGroup(UserGroupBO userGroupBO); + /** + * + * @Description:更新用户组 + * @return Integer + */ + Integer updateUserGroup(UserGroupBO userGroupBO); + /** + * + * @Description:保存角色组并尝试关联角色 + * @return Long + */ + Long saveRoleGroup(RoleGroupBO roleGroupBO); + /** + * + * @Description:更新角色组 + * @return Integer + */ + Integer updateRoleGroup(RoleGroupBO roleGroupBO); + /** + * + * @Description:保存角色 + * @return Long + */ + Long saveRole(RoleBO roleBO); + /** + * + * @Description:更新角色 + * @return Integer + */ + Integer updateRole(RoleBO roleBO); + /** + * + * @Description:分页获取角色 + * @return List + */ + List getPageList(PageBO pageBO); + /** + * + * @Description:根据code查询用户组详情 + * @return UserGroupBO + */ + UserGroupBO getByUserGroupCode(String userGroupCode); + /** + * + * @Description:根据code查询角色详情 + * @return RoleBO + */ + RoleBO getByRoleCode(String roleCode); + /** + * + * @Description:根据code查询角色组详情 + * @return RoleGroupBO + */ + RoleGroupBO getByRoleGroupCode(String roleGroupCode); +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/msgbody/UserStatusChangeMsgBody.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/msgbody/UserStatusChangeMsgBody.java new file mode 100644 index 0000000000000000000000000000000000000000..87697cce3f86b383cc6791beccdafd2ca29440ba --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/msgbody/UserStatusChangeMsgBody.java @@ -0,0 +1,23 @@ +package com.coderman.infosys.auth.domain.msgbody; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:接收用户状态变更消息类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class UserStatusChangeMsgBody{ + + /** 用户ID **/ + private Long userId; + /** 状态类型 **/ + private Integer statusType; + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/AdminAuthorityDO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/AdminAuthorityDO.java new file mode 100644 index 0000000000000000000000000000000000000000..9e9ece009cb7cdb130c96f892f689ab1201990b3 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/AdminAuthorityDO.java @@ -0,0 +1,43 @@ +package com.coderman.infosys.auth.infrast.dao.dataobject; + +import java.util.Date; +import java.math.BigDecimal; +import lombok.Data; +import lombok.ToString; + + /** + * @Description:行政数据权限DO类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:07 + * @version v1.0 + */ +@Data +@ToString +public class AdminAuthorityDO{ + + + /** 主键 **/ + private Long id; + + /** 权限标示 **/ + private String authCode; + + /** 组织部门ID **/ + private Long departmentId; + + /** 城市权限 **/ + private Long cityId; + + /** 创建时间 **/ + private Date dateCreate; + + /** 修改时间 **/ + private Date dateUpdate; + + /** 修改人 **/ + private Long updateUserId; + + /** 创建人 **/ + private Long createUserId; + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/AuthorityDO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/AuthorityDO.java new file mode 100644 index 0000000000000000000000000000000000000000..1e4e5c71a22294f751479dd0196f54d4fc5ae119 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/AuthorityDO.java @@ -0,0 +1,49 @@ +package com.coderman.infosys.auth.infrast.dao.dataobject; + +import java.util.Date; +import java.math.BigDecimal; +import lombok.Data; +import lombok.ToString; + + /** + * @Description:抽象权限表DO类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:07 + * @version v1.0 + */ +@Data +@ToString +public class AuthorityDO{ + + + /** 主键 **/ + private Long id; + + /** 权限编码 **/ + private String authCode; + + /** 权限类型 **/ + private Integer authorityType; + + /** 关联角色编码 **/ + private String roleCode; + + /** 关联角色组 **/ + private String roleGroupCode; + + /** 权限状态 **/ + private Integer status; + + /** 创建时间 **/ + private Date dateCreate; + + /** 修改时间 **/ + private Date dateUpdate; + + /** 修改人 **/ + private Long updateUserId; + + /** 创建人 **/ + private Long createUserId; + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/DataAuthorityDO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/DataAuthorityDO.java new file mode 100644 index 0000000000000000000000000000000000000000..9e1ec68d3c09cb77a45f4f3d60f068ccedb5d1d9 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/DataAuthorityDO.java @@ -0,0 +1,40 @@ +package com.coderman.infosys.auth.infrast.dao.dataobject; + +import java.util.Date; +import java.math.BigDecimal; +import lombok.Data; +import lombok.ToString; + + /** + * @Description:数据字段权限DO类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:07 + * @version v1.0 + */ +@Data +@ToString +public class DataAuthorityDO{ + + + /** 主键 **/ + private Long id; + + /** 权限标示 **/ + private String authCode; + + /** 业务数据库标示 **/ + private String dataColumnId; + + /** 创建时间 **/ + private Date dateCreate; + + /** 修改时间 **/ + private Date dateUpdate; + + /** 修改人 **/ + private Long updateUserId; + + /** 创建人 **/ + private Long createUserId; + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/DataColumnConfigDO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/DataColumnConfigDO.java new file mode 100644 index 0000000000000000000000000000000000000000..d3f21adb15e9bca19811cd46a65acf7291478922 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/DataColumnConfigDO.java @@ -0,0 +1,55 @@ +package com.coderman.infosys.auth.infrast.dao.dataobject; + +import java.util.Date; +import java.math.BigDecimal; +import lombok.Data; +import lombok.ToString; + + /** + * @Description:数据字段管理表DO类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:07 + * @version v1.0 + */ +@Data +@ToString +public class DataColumnConfigDO{ + + + /** 主键 **/ + private Long id; + + /** 数据库业务系统名称 **/ + private String busDatabase; + + /** 表名称 **/ + private String tableName; + + /** 表描述 **/ + private String tableDesc; + + /** 字段名称 **/ + private String columnName; + + /** 字段描述 **/ + private String columnDesc; + + /** 业务模块 **/ + private String busModel; + + /** 业务属性名称 **/ + private String fieldName; + + /** 创建时间 **/ + private Date dateCreate; + + /** 修改时间 **/ + private Date dateUpdate; + + /** 修改人 **/ + private Long updateUserId; + + /** 创建人 **/ + private Long createUserId; + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/MenuDO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/MenuDO.java new file mode 100644 index 0000000000000000000000000000000000000000..8bfac74725157b8401e94b2511c9ef73acc7a89d --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/MenuDO.java @@ -0,0 +1,49 @@ +package com.coderman.infosys.auth.infrast.dao.dataobject; + +import java.util.Date; +import java.math.BigDecimal; +import lombok.Data; +import lombok.ToString; + + /** + * @Description:按钮表DO类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:07 + * @version v1.0 + */ +@Data +@ToString +public class MenuDO{ + + + /** 主键 **/ + private Long id; + + /** 按钮名称 **/ + private String menuName; + + /** 按钮编码 **/ + private String menuCode; + + /** 所属菜单编码 **/ + private String moduleCode; + + /** 所属系统编码 **/ + private String systemCode; + + /** 菜单链接 **/ + private String moduleUrl; + + /** 创建时间 **/ + private Date dateCreate; + + /** 修改时间 **/ + private Date dateUpdate; + + /** 修改人 **/ + private Long updateUserId; + + /** 创建人 **/ + private Long createUserId; + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/ModuleDO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/ModuleDO.java new file mode 100644 index 0000000000000000000000000000000000000000..4cd09be972cd696e58290de8cda441135416c531 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/ModuleDO.java @@ -0,0 +1,46 @@ +package com.coderman.infosys.auth.infrast.dao.dataobject; + +import java.util.Date; +import java.math.BigDecimal; +import lombok.Data; +import lombok.ToString; + + /** + * @Description:菜单模块表DO类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:07 + * @version v1.0 + */ +@Data +@ToString +public class ModuleDO{ + + + /** 主键 **/ + private Long id; + + /** 菜单名称 **/ + private String moduleName; + + /** 菜单编码 **/ + private String moduleCode; + + /** 系统编码 **/ + private String systemCode; + + /** 菜单链接 **/ + private String moduleUrl; + + /** 创建时间 **/ + private Date dateCreate; + + /** 修改时间 **/ + private Date dateUpdate; + + /** 修改人 **/ + private Long updateUserId; + + /** 创建人 **/ + private Long createUserId; + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/RoleDO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/RoleDO.java new file mode 100644 index 0000000000000000000000000000000000000000..dbab670c07e81fe928719e747c6ac4112df510b4 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/RoleDO.java @@ -0,0 +1,43 @@ +package com.coderman.infosys.auth.infrast.dao.dataobject; + +import java.util.Date; +import java.math.BigDecimal; +import lombok.Data; +import lombok.ToString; + + /** + * @Description:角色表DO类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:07 + * @version v1.0 + */ +@Data +@ToString +public class RoleDO{ + + + /** 主键 **/ + private Long id; + + /** 角色名称 **/ + private String roleName; + + /** 角色编码 **/ + private String roleCode; + + /** 角色组状态 **/ + private Long status; + + /** 创建时间 **/ + private Date dateCreate; + + /** 修改时间 **/ + private Date dateUpdate; + + /** 修改人 **/ + private Long updateUserId; + + /** 创建人 **/ + private Long createUserId; + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/RoleGroupDO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/RoleGroupDO.java new file mode 100644 index 0000000000000000000000000000000000000000..e74a1a3fdb2adb7463dd044e79a517adacc2d8e1 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/RoleGroupDO.java @@ -0,0 +1,43 @@ +package com.coderman.infosys.auth.infrast.dao.dataobject; + +import java.util.Date; +import java.math.BigDecimal; +import lombok.Data; +import lombok.ToString; + + /** + * @Description:角色组DO类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:07 + * @version v1.0 + */ +@Data +@ToString +public class RoleGroupDO{ + + + /** 主键 **/ + private Long id; + + /** 角色组名 **/ + private String groupName; + + /** 角色组编码 **/ + private String groupCode; + + /** 角色列表 **/ + private String roleCodeList; + + /** 创建时间 **/ + private Date dateCreate; + + /** 修改时间 **/ + private Date dateUpdate; + + /** 修改人 **/ + private Long updateUserId; + + /** 创建人 **/ + private Long createUserId; + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/SystemAuthorityDO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/SystemAuthorityDO.java new file mode 100644 index 0000000000000000000000000000000000000000..39f283ed93015ab2ae5372f55ba2ea1f76138769 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/SystemAuthorityDO.java @@ -0,0 +1,40 @@ +package com.coderman.infosys.auth.infrast.dao.dataobject; + +import java.util.Date; +import java.math.BigDecimal; +import lombok.Data; +import lombok.ToString; + + /** + * @Description:系统菜单权限表DO类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:07 + * @version v1.0 + */ +@Data +@ToString +public class SystemAuthorityDO{ + + + /** 主键 **/ + private Long id; + + /** 权限标示 **/ + private String authCode; + + /** 系统编码 **/ + private String systemCode; + + /** 菜单编码 **/ + private String moduleCode; + + /** 按钮编码 **/ + private String menuCode; + + /** 创建时间 **/ + private Date dateCreate; + + /** 创建人 **/ + private Long createUserId; + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/SystemDO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/SystemDO.java new file mode 100644 index 0000000000000000000000000000000000000000..d4994536bffe3a92d5bde46d29ea40717104500e --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/SystemDO.java @@ -0,0 +1,49 @@ +package com.coderman.infosys.auth.infrast.dao.dataobject; + +import java.util.Date; +import java.math.BigDecimal; +import lombok.Data; +import lombok.ToString; + + /** + * @Description:系统表DO类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:07 + * @version v1.0 + */ +@Data +@ToString +public class SystemDO{ + + + /** 主键 **/ + private Long id; + + /** 系统名称 **/ + private String systemName; + + /** 系统编码 **/ + private String systemCode; + + /** 系统域名 **/ + private String systemUrl; + + /** 系统图标 **/ + private String systemPicurl; + + /** 系统技术负责人 **/ + private Long tecAdminUserId; + + /** 系统业务负责人 **/ + private Long busAdminUserId; + + /** 系统所属部门 **/ + private Long departmentId; + + /** 创建时间 **/ + private Date dateCreate; + + /** 创建人 **/ + private Long createUserId; + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/UserGroupDO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/UserGroupDO.java new file mode 100644 index 0000000000000000000000000000000000000000..f02dd771cbee9737b57f62358c60add6abb387e1 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/UserGroupDO.java @@ -0,0 +1,46 @@ +package com.coderman.infosys.auth.infrast.dao.dataobject; + +import java.util.Date; +import java.math.BigDecimal; +import lombok.Data; +import lombok.ToString; + + /** + * @Description:用户组DO类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:07 + * @version v1.0 + */ +@Data +@ToString +public class UserGroupDO{ + + + /** 主键 **/ + private Long id; + + /** 用户组名 **/ + private String groupName; + + /** 用户组编码 **/ + private String groupCode; + + /** 用户组状态 **/ + private Long status; + + /** 用户组内用户列表 **/ + private String userList; + + /** 创建时间 **/ + private Date dateCreate; + + /** 修改时间 **/ + private Date dateUpdate; + + /** 修改人 **/ + private Long updateUserId; + + /** 创建人 **/ + private Long createUserId; + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-common/src/main/java/com/lightsnail/schoolmanager/common/dataobject/TeacherDO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/UserRoleMappingDO.java similarity index 35% rename from codemaker-dubbo/dubbo-common/src/main/java/com/lightsnail/schoolmanager/common/dataobject/TeacherDO.java rename to codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/UserRoleMappingDO.java index 297ee386fb8a2ebac314c00028e1dd6a1b7cee6b..149ab98b7e01f765a5d8029548a76fe5f465e4d9 100644 --- a/codemaker-dubbo/dubbo-common/src/main/java/com/lightsnail/schoolmanager/common/dataobject/TeacherDO.java +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/UserRoleMappingDO.java @@ -1,4 +1,4 @@ -package com.lightsnail.schoolmanager.common.dataobject; +package com.coderman.infosys.auth.infrast.dao.dataobject; import java.util.Date; import java.math.BigDecimal; @@ -6,26 +6,23 @@ import lombok.Data; import lombok.ToString; /** - * @Description:DO类 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 16:19:51 + * @Description:用户角色关联表DO类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:07 * @version v1.0 */ @Data @ToString -public class TeacherDO{ +public class UserRoleMappingDO{ - /** **/ + /** 主键 **/ private Long id; - /** **/ - private String teacherName; + /** 用户ID **/ + private Long userId; - /** **/ - private Integer age; - - /** **/ - private Integer sex; + /** 角色code **/ + private String roleCode; } \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/acl/AreaServiceAdapter.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/acl/AreaServiceAdapter.java new file mode 100644 index 0000000000000000000000000000000000000000..0b83524b872018c42b6a7344da5a5cd61dcb1065 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/acl/AreaServiceAdapter.java @@ -0,0 +1,27 @@ +package com.coderman.infosys.auth.infrast.acl; + +import java.util.List; +import com.coderman.infosys.auth.infrast.acl.res.dto.CityResponseDTO; +import com.coderman.infosys.auth.infrast.acl.res.dto.ProvinceResponseDTO; + + +/** + * @Description:省份城市查询服务适配器接口 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +public interface AreaServiceAdapter{ + /** + * + * @Description:查询所有的省份 + * @return List + */ + List queryAllProvince(); + /** + * + * @Description:查询省份下所有城市 + * @return List + */ + List queryCityByProvinceid(Long provinceId); +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/acl/DepartmentServiceAdapter.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/acl/DepartmentServiceAdapter.java new file mode 100644 index 0000000000000000000000000000000000000000..d82d0d0dbf6c494d203acdf781700bc0d4218e81 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/acl/DepartmentServiceAdapter.java @@ -0,0 +1,27 @@ +package com.coderman.infosys.auth.infrast.acl; + +import java.util.List; +import com.coderman.infosys.auth.infrast.acl.req.dto.DepartmentQueryDTO; +import com.coderman.infosys.auth.infrast.acl.res.dto.DepartmentResponseDTO; + + +/** + * @Description:部门查询服务适配器接口 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +public interface DepartmentServiceAdapter{ + /** + * + * @Description:查询所有有效的部门 + * @return List + */ + List queryAllDepartment(DepartmentQueryDTO queryDto); + /** + * + * @Description:查询子部门 + * @return List + */ + List queryDepartmentsList(Long pId); +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/acl/impl/AreaServiceAdapterImpl.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/acl/impl/AreaServiceAdapterImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..3059fbb0cc6ec3a1a11220c86a9af96075a310af --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/acl/impl/AreaServiceAdapterImpl.java @@ -0,0 +1,39 @@ +package com.coderman.infosys.auth.infrast.acl.impl; + +import java.util.List; +import com.coderman.infosys.auth.infrast.acl.res.dto.CityResponseDTO; +import com.coderman.infosys.auth.infrast.acl.AreaServiceAdapter; +import com.coderman.infosys.auth.infrast.acl.res.dto.ProvinceResponseDTO; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; + + +/** + * @Description:接口实现类 + * @Author： + * @CreateTime：2021-11-06 23:38:06 + * @version v1.0 + */ +@Service +public class AreaServiceAdapterImpl implements AreaServiceAdapter{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + + @Override + public List queryAllProvince(){ + + return null; + } + + @Override + public List queryCityByProvinceid(Long provinceId){ + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/acl/impl/DepartmentServiceAdapterImpl.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/acl/impl/DepartmentServiceAdapterImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..3318e3743540a8fdd10fad0f5f28c59b3346133e --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/acl/impl/DepartmentServiceAdapterImpl.java @@ -0,0 +1,39 @@ +package com.coderman.infosys.auth.infrast.acl.impl; + +import java.util.List; +import com.coderman.infosys.auth.infrast.acl.req.dto.DepartmentQueryDTO; +import com.coderman.infosys.auth.infrast.acl.DepartmentServiceAdapter; +import com.coderman.infosys.auth.infrast.acl.res.dto.DepartmentResponseDTO; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; + + +/** + * @Description:接口实现类 + * @Author： + * @CreateTime：2021-11-06 23:38:06 + * @version v1.0 + */ +@Service +public class DepartmentServiceAdapterImpl implements DepartmentServiceAdapter{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + + @Override + public List queryAllDepartment(DepartmentQueryDTO queryDto){ + + return null; + } + + @Override + public List queryDepartmentsList(Long pId){ + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/acl/req/dto/DepartmentQueryDTO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/acl/req/dto/DepartmentQueryDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..50e1dacf881ad46edead76567c847f7501a44c16 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/acl/req/dto/DepartmentQueryDTO.java @@ -0,0 +1,19 @@ +package com.coderman.infosys.auth.infrast.acl.req.dto; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class DepartmentQueryDTO { + + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/acl/res/dto/CityResponseDTO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/acl/res/dto/CityResponseDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..ec950d5a9998705e69fa5cef89f0ba92a0569e45 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/acl/res/dto/CityResponseDTO.java @@ -0,0 +1,19 @@ +package com.coderman.infosys.auth.infrast.acl.res.dto; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class CityResponseDTO { + + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/acl/res/dto/DepartmentResponseDTO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/acl/res/dto/DepartmentResponseDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..c428df1f71cd34adb3aa45d365438715041799e3 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/acl/res/dto/DepartmentResponseDTO.java @@ -0,0 +1,19 @@ +package com.coderman.infosys.auth.infrast.acl.res.dto; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class DepartmentResponseDTO { + + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/acl/res/dto/ProvinceResponseDTO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/acl/res/dto/ProvinceResponseDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..a9a9519567939ec4734c4ab6552168bc60227606 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/acl/res/dto/ProvinceResponseDTO.java @@ -0,0 +1,19 @@ +package com.coderman.infosys.auth.infrast.acl.res.dto; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Data +@ToString +public class ProvinceResponseDTO { + + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/AdminAuthorityMapper.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/AdminAuthorityMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..9e5347b8e002eb0586521cbb0f8a340d2a929e5c --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/AdminAuthorityMapper.java @@ -0,0 +1,60 @@ +package com.coderman.infosys.auth.infrast.dao.mapper; + +import java.util.List; +import com.coderman.infosys.auth.infrast.dao.dataobject.AdminAuthorityDO; +import com.coderman.infosys.auth.infrast.dao.dataobject.AuthorityDO; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + + + +/** +* @Description:行政数据权限接口 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Mapper +public interface AdminAuthorityMapper{ + + /** + * + * @Description 保存数据记录 + * @param adminAuthorityDO + * @return long + */ + long insert(@Param(value = "adminAuthorityDO") AdminAuthorityDO adminAuthorityDO); + + /** + * + * @Description 更新数据记录 + * @param adminAuthorityDO + * @return int + */ + int update(@Param(value = "adminAuthorityDO") AdminAuthorityDO adminAuthorityDO); + + /** + * + * @Description 获取所有数据记录 + * @return List + */ + List getAll(); + + /** + * + * @Description 根据ID获取单条记录 + * @param id + * @return AdminAuthorityDO + */ + AdminAuthorityDO getById(@Param(value = "id") Long id); + + /** + * + * @Description 根据ID删除单条记录 + * @param id + * @return int + */ + int deleteById(@Param(value = "id") Long id); + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/AuthorityMapper.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/AuthorityMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..2bea428825d4db2d9c4681a9c6fdd297fac00d12 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/AuthorityMapper.java @@ -0,0 +1,59 @@ +package com.coderman.infosys.auth.infrast.dao.mapper; + +import java.util.List; +import com.coderman.infosys.auth.infrast.dao.dataobject.AuthorityDO; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + + + +/** +* @Description:抽象权限表接口 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Mapper +public interface AuthorityMapper{ + + /** + * + * @Description 保存数据记录 + * @param authorityDO + * @return long + */ + long insert(@Param(value = "authorityDO") AuthorityDO authorityDO); + + /** + * + * @Description 更新数据记录 + * @param authorityDO + * @return int + */ + int update(@Param(value = "authorityDO") AuthorityDO authorityDO); + + /** + * + * @Description 获取所有数据记录 + * @return List + */ + List getAll(); + + /** + * + * @Description 根据ID获取单条记录 + * @param id + * @return AuthorityDO + */ + AuthorityDO getById(@Param(value = "id") Long id); + + /** + * + * @Description 根据ID删除单条记录 + * @param id + * @return int + */ + int deleteById(@Param(value = "id") Long id); + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/DataAuthorityMapper.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/DataAuthorityMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..0b0b80ff674685ddbd275aa37de66b8f5b19e3d7 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/DataAuthorityMapper.java @@ -0,0 +1,60 @@ +package com.coderman.infosys.auth.infrast.dao.mapper; + +import java.util.List; +import com.coderman.infosys.auth.infrast.dao.dataobject.DataAuthorityDO; +import com.coderman.infosys.auth.infrast.dao.dataobject.AuthorityDO; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + + + +/** +* @Description:数据字段权限接口 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Mapper +public interface DataAuthorityMapper{ + + /** + * + * @Description 保存数据记录 + * @param dataAuthorityDO + * @return long + */ + long insert(@Param(value = "dataAuthorityDO") DataAuthorityDO dataAuthorityDO); + + /** + * + * @Description 更新数据记录 + * @param dataAuthorityDO + * @return int + */ + int update(@Param(value = "dataAuthorityDO") DataAuthorityDO dataAuthorityDO); + + /** + * + * @Description 获取所有数据记录 + * @return List + */ + List getAll(); + + /** + * + * @Description 根据ID获取单条记录 + * @param id + * @return DataAuthorityDO + */ + DataAuthorityDO getById(@Param(value = "id") Long id); + + /** + * + * @Description 根据ID删除单条记录 + * @param id + * @return int + */ + int deleteById(@Param(value = "id") Long id); + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/DataColumnConfigMapper.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/DataColumnConfigMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..af5a9bfce1e27c0fe715ba505967116dbe65f61a --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/DataColumnConfigMapper.java @@ -0,0 +1,59 @@ +package com.coderman.infosys.auth.infrast.dao.mapper; + +import com.coderman.infosys.auth.infrast.dao.dataobject.DataColumnConfigDO; +import java.util.List; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + + + +/** +* @Description:数据字段管理表接口 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Mapper +public interface DataColumnConfigMapper{ + + /** + * + * @Description 保存数据记录 + * @param dataColumnConfigDO + * @return long + */ + long insert(@Param(value = "dataColumnConfigDO") DataColumnConfigDO dataColumnConfigDO); + + /** + * + * @Description 更新数据记录 + * @param dataColumnConfigDO + * @return int + */ + int update(@Param(value = "dataColumnConfigDO") DataColumnConfigDO dataColumnConfigDO); + + /** + * + * @Description 获取所有数据记录 + * @return List + */ + List getAll(); + + /** + * + * @Description 根据ID获取单条记录 + * @param id + * @return DataColumnConfigDO + */ + DataColumnConfigDO getById(@Param(value = "id") Long id); + + /** + * + * @Description 根据ID删除单条记录 + * @param id + * @return int + */ + int deleteById(@Param(value = "id") Long id); + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/MenuMapper.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/MenuMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..91c3dbfa0173db445af364cd053e208af54e1380 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/MenuMapper.java @@ -0,0 +1,67 @@ +package com.coderman.infosys.auth.infrast.dao.mapper; + +import java.util.List; +import com.coderman.infosys.auth.infrast.dao.dataobject.MenuDO; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + + + +/** +* @Description:按钮表接口 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Mapper +public interface MenuMapper{ + + /** + * + * @Description 保存数据记录 + * @param menuDO + * @return long + */ + long insert(@Param(value = "menuDO") MenuDO menuDO); + + /** + * + * @Description 更新数据记录 + * @param menuDO + * @return int + */ + int update(@Param(value = "menuDO") MenuDO menuDO); + + /** + * + * @Description 获取所有数据记录 + * @return List + */ + List getAll(); + + /** + * + * @Description 根据ID获取单条记录 + * @param id + * @return MenuDO + */ + MenuDO getById(@Param(value = "id") Long id); + + /** + * + * @Description 根据ID删除单条记录 + * @param id + * @return int + */ + int deleteById(@Param(value = "id") Long id); + + /** + * + * @Description 查询 + * @param moduleCode + * @return List + */ + List getListByModuleCode(@Param(value = "moduleCode") String moduleCode); + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/ModuleMapper.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/ModuleMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..e2ed6f86afb897dbd07986837b1a7effcb261088 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/ModuleMapper.java @@ -0,0 +1,67 @@ +package com.coderman.infosys.auth.infrast.dao.mapper; + +import com.coderman.infosys.auth.infrast.dao.dataobject.ModuleDO; +import java.util.List; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + + + +/** +* @Description:菜单模块表接口 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Mapper +public interface ModuleMapper{ + + /** + * + * @Description 保存数据记录 + * @param moduleDO + * @return long + */ + long insert(@Param(value = "moduleDO") ModuleDO moduleDO); + + /** + * + * @Description 更新数据记录 + * @param moduleDO + * @return int + */ + int update(@Param(value = "moduleDO") ModuleDO moduleDO); + + /** + * + * @Description 获取所有数据记录 + * @return List + */ + List getAll(); + + /** + * + * @Description 根据ID获取单条记录 + * @param id + * @return ModuleDO + */ + ModuleDO getById(@Param(value = "id") Long id); + + /** + * + * @Description 根据ID删除单条记录 + * @param id + * @return int + */ + int deleteById(@Param(value = "id") Long id); + + /** + * + * @Description 查询 + * @param moduleName + * @return List + */ + List getByName(@Param(value = "moduleName") String moduleName); + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/RoleGroupMapper.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/RoleGroupMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..8a85e15fc61b739b2526d6a2dddb343e3c2242bc --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/RoleGroupMapper.java @@ -0,0 +1,59 @@ +package com.coderman.infosys.auth.infrast.dao.mapper; + +import java.util.List; +import com.coderman.infosys.auth.infrast.dao.dataobject.RoleGroupDO; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + + + +/** +* @Description:角色组接口 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Mapper +public interface RoleGroupMapper{ + + /** + * + * @Description 保存数据记录 + * @param roleGroupDO + * @return long + */ + long insert(@Param(value = "roleGroupDO") RoleGroupDO roleGroupDO); + + /** + * + * @Description 更新数据记录 + * @param roleGroupDO + * @return int + */ + int update(@Param(value = "roleGroupDO") RoleGroupDO roleGroupDO); + + /** + * + * @Description 获取所有数据记录 + * @return List + */ + List getAll(); + + /** + * + * @Description 根据ID获取单条记录 + * @param id + * @return RoleGroupDO + */ + RoleGroupDO getById(@Param(value = "id") Long id); + + /** + * + * @Description 根据ID删除单条记录 + * @param id + * @return int + */ + int deleteById(@Param(value = "id") Long id); + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/RoleMapper.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/RoleMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..b62d788b7aa1c740b1e0e5c0417327c5b6a51c4a --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/RoleMapper.java @@ -0,0 +1,59 @@ +package com.coderman.infosys.auth.infrast.dao.mapper; + +import java.util.List; +import com.coderman.infosys.auth.infrast.dao.dataobject.RoleDO; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + + + +/** +* @Description:角色表接口 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Mapper +public interface RoleMapper{ + + /** + * + * @Description 保存数据记录 + * @param roleDO + * @return long + */ + long insert(@Param(value = "roleDO") RoleDO roleDO); + + /** + * + * @Description 更新数据记录 + * @param roleDO + * @return int + */ + int update(@Param(value = "roleDO") RoleDO roleDO); + + /** + * + * @Description 获取所有数据记录 + * @return List + */ + List getAll(); + + /** + * + * @Description 根据ID获取单条记录 + * @param id + * @return RoleDO + */ + RoleDO getById(@Param(value = "id") Long id); + + /** + * + * @Description 根据ID删除单条记录 + * @param id + * @return int + */ + int deleteById(@Param(value = "id") Long id); + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/SystemAuthorityMapper.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/SystemAuthorityMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..7dd030aa93d1693353861482a0504fb1b2cacb0e --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/SystemAuthorityMapper.java @@ -0,0 +1,60 @@ +package com.coderman.infosys.auth.infrast.dao.mapper; + +import java.util.List; +import com.coderman.infosys.auth.infrast.dao.dataobject.SystemAuthorityDO; +import com.coderman.infosys.auth.infrast.dao.dataobject.AuthorityDO; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + + + +/** +* @Description:系统菜单权限表接口 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Mapper +public interface SystemAuthorityMapper{ + + /** + * + * @Description 保存数据记录 + * @param systemAuthorityDO + * @return long + */ + long insert(@Param(value = "systemAuthorityDO") SystemAuthorityDO systemAuthorityDO); + + /** + * + * @Description 更新数据记录 + * @param systemAuthorityDO + * @return int + */ + int update(@Param(value = "systemAuthorityDO") SystemAuthorityDO systemAuthorityDO); + + /** + * + * @Description 获取所有数据记录 + * @return List + */ + List getAll(); + + /** + * + * @Description 根据ID获取单条记录 + * @param id + * @return SystemAuthorityDO + */ + SystemAuthorityDO getById(@Param(value = "id") Long id); + + /** + * + * @Description 根据ID删除单条记录 + * @param id + * @return int + */ + int deleteById(@Param(value = "id") Long id); + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/SystemMapper.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/SystemMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..d3093303c1e171ef677e5ec754f6f92e5dd03319 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/SystemMapper.java @@ -0,0 +1,98 @@ +package com.coderman.infosys.auth.infrast.dao.mapper; + +import java.util.List; +import com.coderman.utils.commonbo.PageBO; +import com.coderman.infosys.auth.infrast.dao.dataobject.SystemDO; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + + + +/** +* @Description:系统表接口 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Mapper +public interface SystemMapper{ + + /** + * + * @Description 保存数据记录 + * @param systemDO + * @return long + */ + long insert(@Param(value = "systemDO") SystemDO systemDO); + + /** + * + * @Description 更新数据记录 + * @param systemDO + * @return int + */ + int update(@Param(value = "systemDO") SystemDO systemDO); + + /** + * + * @Description 获取所有数据记录 + * @return List + */ + List getAll(); + + /** + * + * @Description 根据ID获取单条记录 + * @param id + * @return SystemDO + */ + SystemDO getById(@Param(value = "id") Long id); + + /** + * + * @Description 根据ID删除单条记录 + * @param id + * @return int + */ + int deleteById(@Param(value = "id") Long id); + + /** + * + * @Description 查询 + * @param systemName + * @return List + */ + List getByName(@Param(value = "systemName") String systemName); + + /** + * + * @Description 查询 + * @param pageBO + * @return List + */ + List getPageList(@Param(value = "pageBO") PageBO pageBO); + + /** + * + * @Description 查询 + * @return List + */ + List queryByCondition(); + + /** + * + * @Description 查询 + * @param systemCode + * @return List + */ + List queryBySystemCode(@Param(value = "systemCode") String systemCode); + + /** + * + * @Description 查询 + * @return int + */ + int updateSystem(); + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/UserGroupMapper.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/UserGroupMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..6d9cbe8f711bc2e1591031dceed2f376972d9fc2 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/UserGroupMapper.java @@ -0,0 +1,59 @@ +package com.coderman.infosys.auth.infrast.dao.mapper; + +import java.util.List; +import com.coderman.infosys.auth.infrast.dao.dataobject.UserGroupDO; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + + + +/** +* @Description:用户组接口 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Mapper +public interface UserGroupMapper{ + + /** + * + * @Description 保存数据记录 + * @param userGroupDO + * @return long + */ + long insert(@Param(value = "userGroupDO") UserGroupDO userGroupDO); + + /** + * + * @Description 更新数据记录 + * @param userGroupDO + * @return int + */ + int update(@Param(value = "userGroupDO") UserGroupDO userGroupDO); + + /** + * + * @Description 获取所有数据记录 + * @return List + */ + List getAll(); + + /** + * + * @Description 根据ID获取单条记录 + * @param id + * @return UserGroupDO + */ + UserGroupDO getById(@Param(value = "id") Long id); + + /** + * + * @Description 根据ID删除单条记录 + * @param id + * @return int + */ + int deleteById(@Param(value = "id") Long id); + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/UserRoleMappingMapper.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/UserRoleMappingMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..b1adcd72507ed606246382a021b5788082d90899 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/UserRoleMappingMapper.java @@ -0,0 +1,59 @@ +package com.coderman.infosys.auth.infrast.dao.mapper; + +import java.util.List; +import com.coderman.infosys.auth.infrast.dao.dataobject.UserRoleMappingDO; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + + + +/** +* @Description:用户角色关联表接口 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Mapper +public interface UserRoleMappingMapper{ + + /** + * + * @Description 保存数据记录 + * @param userRoleMappingDO + * @return long + */ + long insert(@Param(value = "userRoleMappingDO") UserRoleMappingDO userRoleMappingDO); + + /** + * + * @Description 更新数据记录 + * @param userRoleMappingDO + * @return int + */ + int update(@Param(value = "userRoleMappingDO") UserRoleMappingDO userRoleMappingDO); + + /** + * + * @Description 获取所有数据记录 + * @return List + */ + List getAll(); + + /** + * + * @Description 根据ID获取单条记录 + * @param id + * @return UserRoleMappingDO + */ + UserRoleMappingDO getById(@Param(value = "id") Long id); + + /** + * + * @Description 根据ID删除单条记录 + * @param id + * @return int + */ + int deleteById(@Param(value = "id") Long id); + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/AuthorityConvert.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/AuthorityConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..a0947d130414f2b52bb3dc7954e68e5da4de1c13 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/AuthorityConvert.java @@ -0,0 +1,46 @@ +package com.coderman.infosys.auth.infrast.dataconvert; + +import com.coderman.infosys.auth.domain.bo.AuthorityBO; +import java.util.List; +import com.coderman.infosys.auth.infrast.dao.dataobject.AuthorityDO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:权限接口 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Mapper +public interface AuthorityConvert{ + AuthorityConvert INSTANCE = Mappers.getMapper(AuthorityConvert.class); + + /** + * + * @Description: + * @return AuthorityBO + */ + AuthorityBO do2bo(AuthorityDO authorityDO); + /** + * + * @Description: + * @return List + */ + List doList2boList(List authorityDOList); + /** + * + * @Description: + * @return AuthorityDO + */ + AuthorityDO bo2do(AuthorityBO authorityBO); + /** + * + * @Description: + * @return List + */ + List boList2doList(List authorityBOList); +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/DataAuthorityConvert.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/DataAuthorityConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..fc8053e007f58bca8c8308c6f8d2eb2d338c305b --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/DataAuthorityConvert.java @@ -0,0 +1,48 @@ +package com.coderman.infosys.auth.infrast.dataconvert; + +import com.coderman.infosys.auth.domain.bo.AuthorityBO; +import java.util.List; +import com.coderman.infosys.auth.infrast.dao.dataobject.DataAuthorityDO; +import com.coderman.infosys.auth.infrast.dao.dataobject.AuthorityDO; +import com.coderman.infosys.auth.domain.bo.DataAuthorityBO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:数据字段权限接口 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Mapper +public interface DataAuthorityConvert{ + DataAuthorityConvert INSTANCE = Mappers.getMapper(DataAuthorityConvert.class); + + /** + * + * @Description: + * @return DataAuthorityBO + */ + DataAuthorityBO do2bo(DataAuthorityDO dataAuthorityDO); + /** + * + * @Description: + * @return List + */ + List doList2boList(List dataAuthorityDOList); + /** + * + * @Description: + * @return DataAuthorityDO + */ + DataAuthorityDO bo2do(DataAuthorityBO dataAuthorityBO); + /** + * + * @Description: + * @return List + */ + List boList2doList(List dataAuthorityBOList); +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/DataColumnConvert.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/DataColumnConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..2921ed4be59f89b8b13a833d6790581d24f6fa2b --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/DataColumnConvert.java @@ -0,0 +1,46 @@ +package com.coderman.infosys.auth.infrast.dataconvert; + +import com.coderman.infosys.auth.infrast.dao.dataobject.DataColumnConfigDO; +import java.util.List; +import com.coderman.infosys.auth.domain.bo.DataColumnBO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:数据字段实体接口 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Mapper +public interface DataColumnConvert{ + DataColumnConvert INSTANCE = Mappers.getMapper(DataColumnConvert.class); + + /** + * + * @Description: + * @return DataColumnBO + */ + DataColumnBO do2bo(DataColumnConfigDO dataColumnConfigDO); + /** + * + * @Description: + * @return List + */ + List doList2boList(List dataColumnConfigDOList); + /** + * + * @Description: + * @return DataColumnConfigDO + */ + DataColumnConfigDO bo2do(DataColumnBO dataColumnBO); + /** + * + * @Description: + * @return List + */ + List boList2doList(List dataColumnBOList); +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/MenuConvert.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/MenuConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..8348b8812d726d6430100cee21cf6f09d5b4d5d1 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/MenuConvert.java @@ -0,0 +1,46 @@ +package com.coderman.infosys.auth.infrast.dataconvert; + +import com.coderman.infosys.auth.domain.bo.MenuBO; +import java.util.List; +import com.coderman.infosys.auth.infrast.dao.dataobject.MenuDO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:按钮管理接口 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Mapper +public interface MenuConvert{ + MenuConvert INSTANCE = Mappers.getMapper(MenuConvert.class); + + /** + * + * @Description: + * @return MenuBO + */ + MenuBO do2bo(MenuDO menuDO); + /** + * + * @Description: + * @return List + */ + List doList2boList(List menuDOList); + /** + * + * @Description: + * @return MenuDO + */ + MenuDO bo2do(MenuBO menuBO); + /** + * + * @Description: + * @return List + */ + List boList2doList(List menuBOList); +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/ModuleConvert.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/ModuleConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..9293261ec30ee0350816fc9603cd54ee41d67d2a --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/ModuleConvert.java @@ -0,0 +1,46 @@ +package com.coderman.infosys.auth.infrast.dataconvert; + +import com.coderman.infosys.auth.infrast.dao.dataobject.ModuleDO; +import java.util.List; +import com.coderman.infosys.auth.domain.bo.ModuleBO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:菜单/模块管理接口 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Mapper +public interface ModuleConvert{ + ModuleConvert INSTANCE = Mappers.getMapper(ModuleConvert.class); + + /** + * + * @Description: + * @return ModuleBO + */ + ModuleBO do2bo(ModuleDO moduleDO); + /** + * + * @Description: + * @return List + */ + List doList2boList(List moduleDOList); + /** + * + * @Description: + * @return ModuleDO + */ + ModuleDO bo2do(ModuleBO moduleBO); + /** + * + * @Description: + * @return List + */ + List boList2doList(List moduleBOList); +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/RoleConvert.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/RoleConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..03dd86b9c689c002138ba0a72c270dcef69c1494 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/RoleConvert.java @@ -0,0 +1,46 @@ +package com.coderman.infosys.auth.infrast.dataconvert; + +import java.util.List; +import com.coderman.infosys.auth.domain.bo.RoleBO; +import com.coderman.infosys.auth.infrast.dao.dataobject.RoleDO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:角色接口 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Mapper +public interface RoleConvert{ + RoleConvert INSTANCE = Mappers.getMapper(RoleConvert.class); + + /** + * + * @Description: + * @return RoleBO + */ + RoleBO do2bo(RoleDO roleDO); + /** + * + * @Description: + * @return List + */ + List doList2boList(List roleDOList); + /** + * + * @Description: + * @return RoleDO + */ + RoleDO bo2do(RoleBO roleBO); + /** + * + * @Description: + * @return List + */ + List boList2doList(List roleBOList); +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/RoleGroupConvert.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/RoleGroupConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..bc97ffe085e27bb168d67971cf67c5cdd97a70d0 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/RoleGroupConvert.java @@ -0,0 +1,46 @@ +package com.coderman.infosys.auth.infrast.dataconvert; + +import java.util.List; +import com.coderman.infosys.auth.domain.bo.RoleGroupBO; +import com.coderman.infosys.auth.infrast.dao.dataobject.RoleGroupDO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:角色组接口 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Mapper +public interface RoleGroupConvert{ + RoleGroupConvert INSTANCE = Mappers.getMapper(RoleGroupConvert.class); + + /** + * + * @Description: + * @return RoleGroupBO + */ + RoleGroupBO do2bo(RoleGroupDO roleGroupDO); + /** + * + * @Description: + * @return List + */ + List doList2boList(List roleGroupDOList); + /** + * + * @Description: + * @return RoleGroupDO + */ + RoleGroupDO bo2do(RoleGroupBO roleGroupBO); + /** + * + * @Description: + * @return List + */ + List boList2doList(List roleGroupBOList); +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/SystemAuthorityConvert.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/SystemAuthorityConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..fdd86864f74c217619112bcd998833b7d2027c8d --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/SystemAuthorityConvert.java @@ -0,0 +1,48 @@ +package com.coderman.infosys.auth.infrast.dataconvert; + +import com.coderman.infosys.auth.domain.bo.SystemAuthorityBO; +import com.coderman.infosys.auth.domain.bo.AuthorityBO; +import java.util.List; +import com.coderman.infosys.auth.infrast.dao.dataobject.AuthorityDO; +import com.coderman.infosys.auth.infrast.dao.dataobject.SystemAuthorityDO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:系统菜单权限接口 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Mapper +public interface SystemAuthorityConvert{ + SystemAuthorityConvert INSTANCE = Mappers.getMapper(SystemAuthorityConvert.class); + + /** + * + * @Description: + * @return SystemAuthorityBO + */ + SystemAuthorityBO do2bo(SystemAuthorityDO systemAuthorityDO); + /** + * + * @Description: + * @return List + */ + List doList2boList(List systemAuthorityDOList); + /** + * + * @Description: + * @return SystemAuthorityDO + */ + SystemAuthorityDO bo2do(SystemAuthorityBO systemAuthorityBO); + /** + * + * @Description: + * @return List + */ + List boList2doList(List systemAuthorityBOList); +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/SystemConvert.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/SystemConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..e80c7dee6610e5d58b2e810c962a6d1ee1ff9de4 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/SystemConvert.java @@ -0,0 +1,46 @@ +package com.coderman.infosys.auth.infrast.dataconvert; + +import java.util.List; +import com.coderman.infosys.auth.domain.bo.SystemBO; +import com.coderman.infosys.auth.infrast.dao.dataobject.SystemDO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:系统管理接口 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Mapper +public interface SystemConvert{ + SystemConvert INSTANCE = Mappers.getMapper(SystemConvert.class); + + /** + * + * @Description: + * @return SystemBO + */ + SystemBO do2bo(SystemDO systemDO); + /** + * + * @Description: + * @return List + */ + List doList2boList(List systemDOList); + /** + * + * @Description: + * @return SystemDO + */ + SystemDO bo2do(SystemBO systemBO); + /** + * + * @Description: + * @return List + */ + List boList2doList(List systemBOList); +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/UserGroupConvert.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/UserGroupConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..a85453dfe2b76f6ffec93340ee1a2d3c3620f730 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/UserGroupConvert.java @@ -0,0 +1,46 @@ +package com.coderman.infosys.auth.infrast.dataconvert; + +import java.util.List; +import com.coderman.infosys.auth.domain.bo.UserGroupBO; +import com.coderman.infosys.auth.infrast.dao.dataobject.UserGroupDO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:用户组接口 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Mapper +public interface UserGroupConvert{ + UserGroupConvert INSTANCE = Mappers.getMapper(UserGroupConvert.class); + + /** + * + * @Description: + * @return UserGroupBO + */ + UserGroupBO do2bo(UserGroupDO userGroupDO); + /** + * + * @Description: + * @return List + */ + List doList2boList(List userGroupDOList); + /** + * + * @Description: + * @return UserGroupDO + */ + UserGroupDO bo2do(UserGroupBO userGroupBO); + /** + * + * @Description: + * @return List + */ + List boList2doList(List userGroupBOList); +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/gatawayimpl/DataColumnGataWayImpl.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/gatawayimpl/DataColumnGataWayImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..2b3fd7269d90d157ddc05cf668c722473ae19b5a --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/gatawayimpl/DataColumnGataWayImpl.java @@ -0,0 +1,63 @@ +package com.coderman.infosys.auth.infrast.gatawayimpl; + +import java.util.List; +import com.coderman.utils.commonbo.PageBO; +import com.coderman.infosys.auth.domain.gataway.DataColumnGataWay; +import com.coderman.infosys.auth.domain.bo.DataColumnBO; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; + + +/** + * @Description:接口实现类 + * @Author： + * @CreateTime：2021-11-06 23:38:06 + * @version v1.0 + */ +@Service +public class DataColumnGataWayImpl implements DataColumnGataWay{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + + @Override + public Long saveDataColumn(DataColumnBO dataColumnBO){ + + return null; + } + + @Override + public Boolean saveBatchDataColumn(List list){ + + return null; + } + + @Override + public Long updateDataColumn(DataColumnBO dataColumnBO){ + + return null; + } + + @Override + public DataColumnBO getById(Long id){ + + return null; + } + + @Override + public List getByDBCode(String busDataBase){ + + return null; + } + + @Override + public List getPageList(PageBO pageBO){ + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/gatawayimpl/SystemModuleQueryGataWayImpl.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/gatawayimpl/SystemModuleQueryGataWayImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..a490f7d874c1151e42f11a93b69cbf31e491acbe --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/gatawayimpl/SystemModuleQueryGataWayImpl.java @@ -0,0 +1,113 @@ +package com.coderman.infosys.auth.infrast.gatawayimpl; + +import java.util.List; +import com.coderman.infosys.auth.domain.bo.MenuBO; +import com.coderman.utils.commonbo.PageBO; +import com.coderman.infosys.auth.domain.bo.SystemBO; +import com.coderman.infosys.auth.domain.bo.ModuleBO; +import com.coderman.infosys.auth.domain.gataway.SystemModuleQueryGataWay; +import com.coderman.infosys.auth.infrast.dao.dataobject.ModuleDO; +import com.coderman.infosys.auth.infrast.dao.mapper.ModuleMapper; +import com.coderman.infosys.auth.infrast.dao.dataobject.MenuDO; +import com.coderman.infosys.auth.infrast.dataconvert.ModuleConvert; +import com.coderman.infosys.auth.infrast.dataconvert.MenuConvert; +import com.coderman.infosys.auth.infrast.dataconvert.SystemConvert; +import com.coderman.infosys.auth.infrast.dao.mapper.SystemMapper; +import com.coderman.infosys.auth.infrast.dao.dataobject.SystemDO; +import com.coderman.infosys.auth.infrast.dao.mapper.MenuMapper; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; + + +/** + * @Description:接口实现类 + * @Author： + * @CreateTime：2021-11-06 23:38:06 + * @version v1.0 + */ +@Service +public class SystemModuleQueryGataWayImpl implements SystemModuleQueryGataWay{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + @Autowired + private SystemMapper systemMapper; + + @Autowired + private ModuleMapper moduleMapper; + + @Autowired + private MenuMapper menuMapper; + + + @Override + public List querySystemPage(PageBO pageBO){ + List systemDOList = systemMapper.getPageList(pageBO); + List systemBOList = SystemConvert.INSTANCE.doList2boList(systemDOList); + + return systemBOList; + } + + @Override + public List queryModulePage(){ + + return null; + } + + @Override + public SystemBO queryBySystemCode(String systemCode){ + List systemDOList = systemMapper.queryBySystemCode(systemCode); + SystemBO systemBO = SystemConvert.INSTANCE.do2bo(null); + + return systemBO; + } + + @Override + public List queryByCondition(String search){ + List systemDOList = systemMapper.queryByCondition(); + List systemBOList = SystemConvert.INSTANCE.doList2boList(systemDOList); + + return systemBOList; + } + + @Override + public List queryWithAll(String search){ + + return null; + } + + @Override + public SystemBO getSystemByCode(String systemCode){ + + return null; + } + + @Override + public ModuleBO getModuleByCode(String moduleCode){ + List moduleDOList = moduleMapper.getByName(null); + ModuleBO moduleBO = ModuleConvert.INSTANCE.do2bo(null); + List menuDOList = menuMapper.getListByModuleCode(null); + List menuBOList = MenuConvert.INSTANCE.doList2boList(menuDOList); + + return moduleBO; + } + + @Override + public MenuBO getMenu(String menuCode){ + + return null; + } + + @Override + public List getSystemByName(String systemName){ + List systemDOList = systemMapper.getByName(systemName); + List systemBOList = SystemConvert.INSTANCE.doList2boList(systemDOList); + + return systemBOList; + } + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/mq/consumer/DepartmentMqConsumer.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/mq/consumer/DepartmentMqConsumer.java new file mode 100644 index 0000000000000000000000000000000000000000..e9dcd92ddcab29e59be44bb70cc2826eef3144cf --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/mq/consumer/DepartmentMqConsumer.java @@ -0,0 +1,25 @@ +package com.coderman.infosys.auth.infrast.mq.consumer; + + +import org.springframework.stereotype.Service; + + /** + * @Description:DepartmentMqConsumer类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Service +public class DepartmentMqConsumer{ + + + /** + * + * @Description:监听组织状态变 + * @return void + */ + public void consumeDepartmentStatusChange(String mqBody){ + + } + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/mq/consumer/UserMqConsumer.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/mq/consumer/UserMqConsumer.java new file mode 100644 index 0000000000000000000000000000000000000000..7a7adaa5ca1464fc2a110478750fae8e92fd6154 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/mq/consumer/UserMqConsumer.java @@ -0,0 +1,25 @@ +package com.coderman.infosys.auth.infrast.mq.consumer; + + +import org.springframework.stereotype.Service; + + /** + * @Description:UserMqConsumer类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Service +public class UserMqConsumer{ + + + /** + * + * @Description:监听用户状态变 + * @return void + */ + public void consumeUserStatusChange(String mqBody){ + + } + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/mq/handler/UserMqHandler.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/mq/handler/UserMqHandler.java new file mode 100644 index 0000000000000000000000000000000000000000..0a6591466f27c6ae872c6884b3b9bad74b942e24 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/mq/handler/UserMqHandler.java @@ -0,0 +1,25 @@ +package com.coderman.infosys.auth.infrast.mq.handler; + + +import org.springframework.stereotype.Service; + + /** + * @Description:UserMqHandler类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Service +public class UserMqHandler{ + + + /** + * + * @Description:处理用户状态变更的权限信 + * @return void + */ + public void handleUserStatusChange(String mqBody){ + + } + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/mq/producer/AuthorityMqProducer.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/mq/producer/AuthorityMqProducer.java new file mode 100644 index 0000000000000000000000000000000000000000..c83dd08e9948fe85696f73b80d91373c697b8c40 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/mq/producer/AuthorityMqProducer.java @@ -0,0 +1,33 @@ +package com.coderman.infosys.auth.infrast.mq.producer; + + +import org.springframework.stereotype.Service; + + /** + * @Description:AuthorityMqProducer类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Service +public class AuthorityMqProducer{ + + + /** + * + * @Description:权限创 + * @return void + */ + public void authorityCreate(String authCode){ + + } + /** + * + * @Description:权限更 + * @return void + */ + public void authorityUpdate(String authCode){ + + } + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/mq/producer/SystemMqProducer.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/mq/producer/SystemMqProducer.java new file mode 100644 index 0000000000000000000000000000000000000000..653af71c264df8b4fe69b13033c751e7b6434643 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/mq/producer/SystemMqProducer.java @@ -0,0 +1,26 @@ +package com.coderman.infosys.auth.infrast.mq.producer; + +import com.coderman.infosys.auth.domain.event.MenuChangeEvent; + +import org.springframework.stereotype.Service; + + /** + * @Description:SystemMqProducer类 + * @Author:shenshuai + * @CreateTime:2021-11-06 23:38:06 + * @version v1.0 + */ +@Service +public class SystemMqProducer{ + + + /** + * + * @Description:事务提交后权限变更监 + * @return void + */ + public void systemChange(MenuChangeEvent event){ + + } + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/repositoryimpl/AuthorityRepositoryImpl.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/repositoryimpl/AuthorityRepositoryImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..2a5b1a7f547e770b889fd6149eecf687ed5fc1fe --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/repositoryimpl/AuthorityRepositoryImpl.java @@ -0,0 +1,56 @@ +package com.coderman.infosys.auth.infrast.repositoryimpl; + +import com.coderman.infosys.auth.domain.bo.AuthorityBO; +import com.coderman.infosys.auth.domain.bo.AuthorityUpdateRequestBO; +import com.coderman.infosys.auth.domain.gataway.AuthorityRepository; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; + + +/** + * @Description:接口实现类 + * @Author： + * @CreateTime：2021-11-06 23:38:06 + * @version v1.0 + */ +@Service +public class AuthorityRepositoryImpl implements AuthorityRepository{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + + @Override + public Boolean buildAuthority(AuthorityBO authorityBO){ + + return null; + } + + @Override + public Boolean updateAuthority(AuthorityUpdateRequestBO authorityUpdateRequestBO){ + + return null; + } + + @Override + public Boolean disableAuthority(String authorityCode){ + + return null; + } + + @Override + public AuthorityBO getByCode(String authorityCode){ + + return null; + } + + @Override + public AuthorityBO getByRoleCode(String roleCode){ + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/repositoryimpl/SystemModuleRepositoryImpl.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/repositoryimpl/SystemModuleRepositoryImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..cb2be0b9a396e6c4a0dc5ecf9ddbf68cda7c9875 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/repositoryimpl/SystemModuleRepositoryImpl.java @@ -0,0 +1,98 @@ +package com.coderman.infosys.auth.infrast.repositoryimpl; + +import com.coderman.infosys.auth.domain.bo.MenuBO; +import com.coderman.infosys.auth.domain.gataway.SystemModuleRepository; +import com.coderman.infosys.auth.domain.bo.SystemBO; +import com.coderman.infosys.auth.domain.bo.ModuleBO; +import com.coderman.infosys.auth.infrast.dao.dataobject.ModuleDO; +import com.coderman.infosys.auth.infrast.dao.mapper.ModuleMapper; +import com.coderman.infosys.auth.infrast.dao.dataobject.MenuDO; +import com.coderman.infosys.auth.infrast.dataconvert.ModuleConvert; +import com.coderman.infosys.auth.infrast.dataconvert.MenuConvert; +import com.coderman.infosys.auth.infrast.mq.producer.SystemMqProducer; +import com.coderman.infosys.auth.infrast.dataconvert.SystemConvert; +import com.coderman.infosys.auth.infrast.dao.mapper.SystemMapper; +import com.coderman.infosys.auth.infrast.dao.dataobject.SystemDO; +import com.coderman.infosys.auth.infrast.dao.mapper.MenuMapper; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; + + +/** + * @Description:接口实现类 + * @Author： + * @CreateTime：2021-11-06 23:38:06 + * @version v1.0 + */ +@Service +public class SystemModuleRepositoryImpl implements SystemModuleRepository{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + @Autowired + private SystemMapper systemMapper; + + @Autowired + private SystemMqProducer systemMqProducer; + + @Autowired + private ModuleMapper moduleMapper; + + @Autowired + private MenuMapper menuMapper; + + + @Override + public Long saveSystem(SystemBO systemBO){ + SystemDO systemDO = SystemConvert.INSTANCE.bo2do(systemBO); + long longVar = systemMapper.insert(systemDO); + systemMqProducer.systemChange(null); + + return null; + } + + @Override + public Integer updateSystem(SystemBO systemBO){ + SystemDO systemDO = SystemConvert.INSTANCE.bo2do(systemBO); + int intVar = systemMapper.updateSystem(); + + return null; + } + + @Override + public Long saveModule(ModuleBO moduleBO){ + ModuleDO moduleDO = ModuleConvert.INSTANCE.bo2do(moduleBO); + long longVar = moduleMapper.insert(moduleDO); + + return null; + } + + @Override + public Integer updateModule(ModuleBO moduleBO){ + ModuleDO moduleDO = ModuleConvert.INSTANCE.bo2do(moduleBO); + int intVar = moduleMapper.update(moduleDO); + + return null; + } + + @Override + public Long saveMenu(MenuBO moduleBO){ + MenuDO menuDO = MenuConvert.INSTANCE.bo2do(moduleBO); + long longVar = menuMapper.insert(menuDO); + + return null; + } + + @Override + public Integer updateMenu(MenuBO moduleBO){ + MenuDO menuDO = MenuConvert.INSTANCE.bo2do(moduleBO); + int intVar = menuMapper.update(menuDO); + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/repositoryimpl/UserRoleRepositoryImpl.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/repositoryimpl/UserRoleRepositoryImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..b531ee7b31d79f2f428be0b9536f9f4cebdf8024 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/repositoryimpl/UserRoleRepositoryImpl.java @@ -0,0 +1,89 @@ +package com.coderman.infosys.auth.infrast.repositoryimpl; + +import java.util.List; +import com.coderman.infosys.auth.domain.bo.UserGroupBO; +import com.coderman.utils.commonbo.PageBO; +import com.coderman.infosys.auth.domain.gataway.UserRoleRepository; +import com.coderman.infosys.auth.domain.bo.RoleBO; +import com.coderman.infosys.auth.domain.bo.RoleGroupBO; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; + + +/** + * @Description:接口实现类 + * @Author： + * @CreateTime：2021-11-06 23:38:06 + * @version v1.0 + */ +@Service +public class UserRoleRepositoryImpl implements UserRoleRepository{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + + @Override + public Long saveUserGroup(UserGroupBO userGroupBO){ + + return null; + } + + @Override + public Integer updateUserGroup(UserGroupBO userGroupBO){ + + return null; + } + + @Override + public Long saveRoleGroup(RoleGroupBO roleGroupBO){ + + return null; + } + + @Override + public Integer updateRoleGroup(RoleGroupBO roleGroupBO){ + + return null; + } + + @Override + public Long saveRole(RoleBO roleBO){ + + return null; + } + + @Override + public Integer updateRole(RoleBO roleBO){ + + return null; + } + + @Override + public List getPageList(PageBO pageBO){ + + return null; + } + + @Override + public UserGroupBO getByUserGroupCode(String userGroupCode){ + + return null; + } + + @Override + public RoleBO getByRoleCode(String roleCode){ + + return null; + } + + @Override + public RoleGroupBO getByRoleGroupCode(String roleGroupCode){ + + return null; + } + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/model/convert/AuthorityConverter.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/model/convert/AuthorityConverter.java new file mode 100644 index 0000000000000000000000000000000000000000..7006ca6489a3435267a04c1cec029bd4585b800c --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/model/convert/AuthorityConverter.java @@ -0,0 +1,46 @@ +package com.coderman.infosys.auth.model.convert; + +import java.util.List; +import com.coderman.infosys.auth.domain.bo.AuthorityBO; +import com.coderman.infosys.auth.adapter.vo.AuthorityVO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:AuthorityConvertervobo接口 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Mapper +public interface AuthorityConverter{ + AuthorityConverter INSTANCE = Mappers.getMapper(AuthorityConverter.class); + + /** + * + * @Description: + * @return List + */ + List volist2boList(List vOList); + /** + * + * @Description: + * @return AuthorityBO + */ + AuthorityBO vo2bo(AuthorityVO authorityVO); + /** + * + * @Description: + * @return List + */ + List BOs2VOs(List authorityBOList); + /** + * + * @Description: + * @return AuthorityVO + */ + AuthorityVO bo2VO(AuthorityBO authorityBO); +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/model/convert/DataAuthorityConverter.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/model/convert/DataAuthorityConverter.java new file mode 100644 index 0000000000000000000000000000000000000000..ebb5800cd05cc8eb1b6f16f2e67663e85b07c214 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/model/convert/DataAuthorityConverter.java @@ -0,0 +1,29 @@ +package com.coderman.infosys.auth.model.convert; + +import java.util.List; +import com.coderman.infosys.auth.domain.bo.AuthorityBO; +import com.coderman.infosys.auth.domain.bo.DataAuthorityBO; +import com.coderman.infosys.auth.adapter.vo.DataAuthorityResponseVO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:DataAuthorityConvertervobo接口 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Mapper +public interface DataAuthorityConverter{ + DataAuthorityConverter INSTANCE = Mappers.getMapper(DataAuthorityConverter.class); + + /** + * + * @Description: + * @return List + */ + List BOs2VOs(List dataAuthorityBOList); +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/model/convert/DataColumnConverter.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/model/convert/DataColumnConverter.java new file mode 100644 index 0000000000000000000000000000000000000000..ba59db1aa12d51c1ce4982ae226536d79abe1435 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/model/convert/DataColumnConverter.java @@ -0,0 +1,53 @@ +package com.coderman.infosys.auth.model.convert; + +import com.coderman.infosys.auth.adapter.vo.DataColumnVO; +import java.util.List; +import com.coderman.infosys.auth.adapter.vo.DataColumnResponseVO; +import com.coderman.infosys.auth.domain.bo.DataColumnBO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:DataColumnConvertervobo接口 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Mapper +public interface DataColumnConverter{ + DataColumnConverter INSTANCE = Mappers.getMapper(DataColumnConverter.class); + + /** + * + * @Description: + * @return DataColumnVO + */ + DataColumnVO bo2VO(DataColumnBO dataColumnBO); + /** + * + * @Description: + * @return List + */ + List voList2BoList(List vOList); + /** + * + * @Description: + * @return List + */ + List BOs2VOs(List dataColumnBOList); + /** + * + * @Description: + * @return DataColumnBO + */ + DataColumnBO vo2bo(DataColumnVO dataColumnVO); + /** + * + * @Description: + * @return List + */ + List boList2voList(List dataColumnBOList); +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/model/convert/MenuConverter.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/model/convert/MenuConverter.java new file mode 100644 index 0000000000000000000000000000000000000000..50d224eb5606d3c26bf154fb05e8c3f462dd14d2 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/model/convert/MenuConverter.java @@ -0,0 +1,72 @@ +package com.coderman.infosys.auth.model.convert; + +import com.coderman.infosys.auth.adapter.vo.MenuVO; +import com.coderman.infosys.auth.domain.bo.MenuBO; +import java.util.List; +import com.coderman.infosys.auth.adapter.vo.UpdateMenuRequestVO; +import com.coderman.infosys.auth.adapter.vo.CreateMenuRequestVO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:MenuConvertervobo接口 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Mapper +public interface MenuConverter{ + MenuConverter INSTANCE = Mappers.getMapper(MenuConverter.class); + + /** + * + * @Description: + * @return MenuBO + */ + MenuBO vo2bo(UpdateMenuRequestVO updateMenuRequestVO); + /** + * + * @Description: + * @return List + */ + List volist2boList(List createMenuRequestVOList); + /** + * + * @Description: + * @return List + */ + List voList2boList(List vOList); + /** + * + * @Description: + * @return MenuVO + */ + MenuVO bo2VO(MenuBO menuBO); + /** + * + * @Description: + * @return List + */ + List BOs2VOs(List menuBOList); + /** + * + * @Description: + * @return MenuBO + */ + MenuBO vo2bo(CreateMenuRequestVO createMenuRequestVO); + /** + * + * @Description: + * @return MenuBO + */ + MenuBO vo2bo(MenuVO menuVO); + /** + * + * @Description: + * @return List + */ + List voList2boList(List updateMenuRequestVOList); +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/model/convert/ModuleConverter.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/model/convert/ModuleConverter.java new file mode 100644 index 0000000000000000000000000000000000000000..a8a34c009b5beac59f46a075310566c2e1633f1c --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/model/convert/ModuleConverter.java @@ -0,0 +1,72 @@ +package com.coderman.infosys.auth.model.convert; + +import java.util.List; +import com.coderman.infosys.auth.adapter.vo.CreateModuleRequestVO; +import com.coderman.infosys.auth.adapter.vo.ModuleVO; +import com.coderman.infosys.auth.domain.bo.ModuleBO; +import com.coderman.infosys.auth.adapter.vo.UpdateModuleRequestVO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:ModuleConvertervobo接口 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Mapper +public interface ModuleConverter{ + ModuleConverter INSTANCE = Mappers.getMapper(ModuleConverter.class); + + /** + * + * @Description: + * @return List + */ + List VOs2BOs(List vOList); + /** + * + * @Description: + * @return List + */ + List vos2bos(List updateModuleRequestVOList); + /** + * + * @Description: + * @return ModuleBO + */ + ModuleBO vo2bo(ModuleVO moduleVO); + /** + * + * @Description: + * @return ModuleVO + */ + ModuleVO bo2VO(ModuleBO moduleBO); + /** + * + * @Description: + * @return List + */ + List BOs2VOs(List moduleBOList); + /** + * + * @Description: + * @return ModuleBO + */ + ModuleBO vo2bo(UpdateModuleRequestVO updateModuleRequestVO); + /** + * + * @Description: + * @return ModuleBO + */ + ModuleBO vo2bo(CreateModuleRequestVO createModuleRequestVO); + /** + * + * @Description: + * @return List + */ + List VOs2BOs(List createModuleRequestVOList); +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/model/convert/RoleConverter.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/model/convert/RoleConverter.java new file mode 100644 index 0000000000000000000000000000000000000000..92044a7df2bc1f7aa0f1355fd9dc9ddf2568bbdc --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/model/convert/RoleConverter.java @@ -0,0 +1,59 @@ +package com.coderman.infosys.auth.model.convert; + +import java.util.List; +import com.coderman.infosys.auth.domain.bo.RoleBO; +import com.coderman.infosys.auth.adapter.vo.CreateRoleRequestVO; +import com.coderman.infosys.auth.adapter.vo.RoleVO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:RoleConvertervobo接口 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Mapper +public interface RoleConverter{ + RoleConverter INSTANCE = Mappers.getMapper(RoleConverter.class); + + /** + * + * @Description: + * @return RoleVO + */ + RoleVO bo2VO(RoleBO roleBO); + /** + * + * @Description: + * @return List + */ + List VOs2BOs(List createRoleRequestVOList); + /** + * + * @Description: + * @return RoleBO + */ + RoleBO vo2bo(CreateRoleRequestVO createRoleRequestVO); + /** + * + * @Description: + * @return List + */ + List voList2boList(List vOList); + /** + * + * @Description: + * @return List + */ + List BOs2VOs(List roleBOList); + /** + * + * @Description: + * @return RoleBO + */ + RoleBO vo2bo(RoleVO roleVO); +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/model/convert/RoleGroupConverter.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/model/convert/RoleGroupConverter.java new file mode 100644 index 0000000000000000000000000000000000000000..cd3ab6f2116de80b599a2c74d6a1f339a7f16b03 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/model/convert/RoleGroupConverter.java @@ -0,0 +1,46 @@ +package com.coderman.infosys.auth.model.convert; + +import com.coderman.infosys.auth.adapter.vo.RoleGroupVO; +import java.util.List; +import com.coderman.infosys.auth.domain.bo.RoleGroupBO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:RoleGroupConvertervobo接口 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Mapper +public interface RoleGroupConverter{ + RoleGroupConverter INSTANCE = Mappers.getMapper(RoleGroupConverter.class); + + /** + * + * @Description: + * @return RoleGroupBO + */ + RoleGroupBO vo2bo(RoleGroupVO roleGroupVO); + /** + * + * @Description: + * @return RoleGroupVO + */ + RoleGroupVO bo2VO(RoleGroupBO roleGroupBO); + /** + * + * @Description: + * @return List + */ + List VOs2BOs(List vOList); + /** + * + * @Description: + * @return List + */ + List BOs2VOs(List roleGroupBOList); +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/model/convert/SystemAuthorityConverter.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/model/convert/SystemAuthorityConverter.java new file mode 100644 index 0000000000000000000000000000000000000000..6d327ae488c4923e6ba7611f693041525cf736ee --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/model/convert/SystemAuthorityConverter.java @@ -0,0 +1,47 @@ +package com.coderman.infosys.auth.model.convert; + +import com.coderman.infosys.auth.domain.bo.SystemAuthorityBO; +import com.coderman.infosys.auth.domain.bo.AuthorityBO; +import java.util.List; +import com.coderman.infosys.auth.adapter.vo.SystemAuthorityVO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:SystemAuthorityConvertervobo接口 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Mapper +public interface SystemAuthorityConverter{ + SystemAuthorityConverter INSTANCE = Mappers.getMapper(SystemAuthorityConverter.class); + + /** + * + * @Description: + * @return SystemAuthorityBO + */ + SystemAuthorityBO vo2bo(SystemAuthorityVO systemAuthorityVO); + /** + * + * @Description: + * @return SystemAuthorityVO + */ + SystemAuthorityVO bo2VO(SystemAuthorityBO systemAuthorityBO); + /** + * + * @Description: + * @return List + */ + List BOs2VOs(List systemAuthorityBOList); + /** + * + * @Description: + * @return List + */ + List vos2bos(List vOList); +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/model/convert/SystemConverter.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/model/convert/SystemConverter.java new file mode 100644 index 0000000000000000000000000000000000000000..31c9270a0b2883571ab8bcfe12310073361123f4 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/model/convert/SystemConverter.java @@ -0,0 +1,72 @@ +package com.coderman.infosys.auth.model.convert; + +import java.util.List; +import com.coderman.infosys.auth.adapter.vo.CreateSystemRequestVO; +import com.coderman.infosys.auth.adapter.vo.SystemVO; +import com.coderman.infosys.auth.domain.bo.SystemBO; +import com.coderman.infosys.auth.adapter.vo.UpdateSystemRequestVO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:SystemConvertervobo接口 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Mapper +public interface SystemConverter{ + SystemConverter INSTANCE = Mappers.getMapper(SystemConverter.class); + + /** + * + * @Description: + * @return List + */ + List voList2BoList(List updateSystemRequestVOList); + /** + * + * @Description: + * @return SystemBO + */ + SystemBO vo2bo(CreateSystemRequestVO createSystemRequestVO); + /** + * + * @Description: + * @return List + */ + List vos2bos(List vOList); + /** + * + * @Description: + * @return SystemVO + */ + SystemVO bo2VO(SystemBO systemBO); + /** + * + * @Description: + * @return List + */ + List bolist2voList(List systemBOList); + /** + * + * @Description: + * @return List + */ + List VOs2BOs(List createSystemRequestVOList); + /** + * + * @Description: + * @return SystemBO + */ + SystemBO vo2bo(SystemVO systemVO); + /** + * + * @Description: + * @return SystemBO + */ + SystemBO vo2bo(UpdateSystemRequestVO updateSystemRequestVO); +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/model/convert/UserGroupConverter.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/model/convert/UserGroupConverter.java new file mode 100644 index 0000000000000000000000000000000000000000..cc782e29bdc65443a5743e3e6f4702bf6be9d6fd --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/model/convert/UserGroupConverter.java @@ -0,0 +1,46 @@ +package com.coderman.infosys.auth.model.convert; + +import java.util.List; +import com.coderman.infosys.auth.domain.bo.UserGroupBO; +import com.coderman.infosys.auth.adapter.vo.UserGroupVO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:UserGroupConvertervobo接口 +* @Author: +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@Mapper +public interface UserGroupConverter{ + UserGroupConverter INSTANCE = Mappers.getMapper(UserGroupConverter.class); + + /** + * + * @Description: + * @return List + */ + List BOs2VOs(List userGroupBOList); + /** + * + * @Description: + * @return UserGroupVO + */ + UserGroupVO bo2VO(UserGroupBO userGroupBO); + /** + * + * @Description: + * @return UserGroupBO + */ + UserGroupBO vo2bo(UserGroupVO userGroupVO); + /** + * + * @Description: + * @return List + */ + List VOs2BOs(List vOList); +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/utils/SpringApplicationContext.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/utils/SpringApplicationContext.java new file mode 100644 index 0000000000000000000000000000000000000000..5ccb6b278c9ebd98d94bb08b762fbfd3d7fb6424 --- /dev/null +++ b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/utils/SpringApplicationContext.java @@ -0,0 +1,40 @@ +/* + * Copyright 2014 Jeanfrancois Arcand + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package com.coderman.infosys.auth.utils; + +import org.springframework.beans.BeansException; +import org.springframework.beans.factory.BeanFactory; +import org.springframework.beans.factory.BeanFactoryAware; +import org.springframework.stereotype.Component; + +@Component +public class SpringApplicationContext implements BeanFactoryAware { + + private static BeanFactory springBeanFactory; + + @Override + public synchronized void setBeanFactory(BeanFactory beanFactory) throws BeansException { + springBeanFactory = beanFactory; + } + + public synchronized static T getBean(Class klass) { + return springBeanFactory.getBean(klass); + } + + public synchronized static Object getBean(String beanName) { + return springBeanFactory.getBean(beanName); + } +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/controller/ClassController.java b/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/controller/ClassController.java deleted file mode 100644 index e5c558c2d676470616f8cf9d1a1e9b01bf00a6d2..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/controller/ClassController.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.lightsnail.schoolmanager.controller; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.lightsnail.schoolmanager.service.ClassService; -import com.lightsnail.schoolmanager.vo.ClassVO; - -import com.coderman.utils.response.ResultDataDto; -import com.coderman.utils.response.ResultDto; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - - -/** -* @Description:控制层 -* @Author:fanchunshuai -* @CreateTime:2021-06-25 16:08:54 -* @version v1.0 -*/ -@RestController -public class ClassController extends BaseController{ - - protected Logger logger = LoggerFactory.getLogger(ClassController.class); - - @Autowired - private ClassService classService; - - - /** - * @Description:新增 - * @version v1.0 - * @param classVO - * @return ResultDto - */ - @RequestMapping(value = "/class/add",method = RequestMethod.POST) - public ResultDto add(@RequestBody ClassVO classVO){ - //todo impl code - return new ResultDto(); - } - - /** - * @Description:修改 - * @version v1.0 - * @param classVO - * @return ResultDto - */ - @RequestMapping(value = "/class/update",method = RequestMethod.POST) - public ResultDto update(@RequestBody ClassVO classVO){ - //todo impl code - return new ResultDto(); - } - - /** - * @Description:根据id删除 - * @version v1.0 - * @param id - * @return ResultDto - */ - @PostMapping("/class/delete") - public ResultDto delete(@RequestParam(name = "id") Long id){ - //todo impl code - return new ResultDto(); - } - - /** - * @Description:根据ID获取单条记录 - * @version v1.0 - * @param id - * @return ResultDataDto - */ - @GetMapping("/class/get") - public ResultDataDto getById(@RequestParam(name = "id") Long id){ - //todo impl code - return new ResultDataDto(); - } - - /** - * @Description:分页获取记录 - * @version v1.0 - * @return ResultDataDto - */ - @GetMapping("/class/getpage") - public ResultDataDto getPage(){ - //todo impl code - return new ResultDataDto(); - } - - /** - * @Description:修改状态 - * @version v1.0 - * @param id - * @param status - * @return ResultDataDto - */ - @PostMapping("/class/changestatus") - public ResultDto changeStatus(@RequestParam(name = "id") Long id,@RequestParam(name = "status") int status){ - //todo impl code - return new ResultDto(); - } - -} diff --git a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/controller/ClassTeacherController.java b/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/controller/ClassTeacherController.java deleted file mode 100644 index 0b021eaad7a60d384f26850476cb1d5181a9ce06..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/controller/ClassTeacherController.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.lightsnail.schoolmanager.controller; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.lightsnail.schoolmanager.service.ClassTeacherService; -import com.lightsnail.schoolmanager.vo.ClassTeacherVO; - -import com.coderman.utils.response.ResultDataDto; -import com.coderman.utils.response.ResultDto; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - - -/** -* @Description:控制层 -* @Author:fanchunshuai -* @CreateTime:2021-06-25 16:08:54 -* @version v1.0 -*/ -@RestController -public class ClassTeacherController extends BaseController{ - - protected Logger logger = LoggerFactory.getLogger(ClassTeacherController.class); - - @Autowired - private ClassTeacherService classTeacherService; - - - /** - * @Description:新增 - * @version v1.0 - * @param classTeacherVO - * @return ResultDto - */ - @RequestMapping(value = "/classTeacher/add",method = RequestMethod.POST) - public ResultDto add(@RequestBody ClassTeacherVO classTeacherVO){ - //todo impl code - return new ResultDto(); - } - - /** - * @Description:修改 - * @version v1.0 - * @param classTeacherVO - * @return ResultDto - */ - @RequestMapping(value = "/classTeacher/update",method = RequestMethod.POST) - public ResultDto update(@RequestBody ClassTeacherVO classTeacherVO){ - //todo impl code - return new ResultDto(); - } - - /** - * @Description:根据id删除 - * @version v1.0 - * @param id - * @return ResultDto - */ - @PostMapping("/classTeacher/delete") - public ResultDto delete(@RequestParam(name = "id") Long id){ - //todo impl code - return new ResultDto(); - } - - /** - * @Description:根据ID获取单条记录 - * @version v1.0 - * @param id - * @return ResultDataDto - */ - @GetMapping("/classTeacher/get") - public ResultDataDto getById(@RequestParam(name = "id") Long id){ - //todo impl code - return new ResultDataDto(); - } - - /** - * @Description:分页获取记录 - * @version v1.0 - * @return ResultDataDto - */ - @GetMapping("/classTeacher/getpage") - public ResultDataDto getPage(){ - //todo impl code - return new ResultDataDto(); - } - - /** - * @Description:修改状态 - * @version v1.0 - * @param id - * @param status - * @return ResultDataDto - */ - @PostMapping("/classTeacher/changestatus") - public ResultDto changeStatus(@RequestParam(name = "id") Long id,@RequestParam(name = "status") int status){ - //todo impl code - return new ResultDto(); - } - -} diff --git a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/controller/StudentController.java b/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/controller/StudentController.java deleted file mode 100644 index 0bc3dbd29cdea7f4dba76e80fc902cb97f3ed824..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/controller/StudentController.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.lightsnail.schoolmanager.controller; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.lightsnail.schoolmanager.service.StudentService; -import com.lightsnail.schoolmanager.vo.StudentVO; - -import com.coderman.utils.response.ResultDataDto; -import com.coderman.utils.response.ResultDto; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - - -/** -* @Description:控制层 -* @Author:fanchunshuai -* @CreateTime:2021-06-25 16:08:54 -* @version v1.0 -*/ -@RestController -public class StudentController extends BaseController{ - - protected Logger logger = LoggerFactory.getLogger(StudentController.class); - - @Autowired - private StudentService studentService; - - - /** - * @Description:新增 - * @version v1.0 - * @param studentVO - * @return ResultDto - */ - @RequestMapping(value = "/student/add",method = RequestMethod.POST) - public ResultDto add(@RequestBody StudentVO studentVO){ - //todo impl code - return new ResultDto(); - } - - /** - * @Description:修改 - * @version v1.0 - * @param studentVO - * @return ResultDto - */ - @RequestMapping(value = "/student/update",method = RequestMethod.POST) - public ResultDto update(@RequestBody StudentVO studentVO){ - //todo impl code - return new ResultDto(); - } - - /** - * @Description:根据id删除 - * @version v1.0 - * @param id - * @return ResultDto - */ - @PostMapping("/student/delete") - public ResultDto delete(@RequestParam(name = "id") Long id){ - //todo impl code - return new ResultDto(); - } - - /** - * @Description:根据ID获取单条记录 - * @version v1.0 - * @param id - * @return ResultDataDto - */ - @GetMapping("/student/get") - public ResultDataDto getById(@RequestParam(name = "id") Long id){ - //todo impl code - return new ResultDataDto(); - } - - /** - * @Description:分页获取记录 - * @version v1.0 - * @return ResultDataDto - */ - @GetMapping("/student/getpage") - public ResultDataDto getPage(){ - //todo impl code - return new ResultDataDto(); - } - - /** - * @Description:修改状态 - * @version v1.0 - * @param id - * @param status - * @return ResultDataDto - */ - @PostMapping("/student/changestatus") - public ResultDto changeStatus(@RequestParam(name = "id") Long id,@RequestParam(name = "status") int status){ - //todo impl code - return new ResultDto(); - } - -} diff --git a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/controller/TeacherController.java b/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/controller/TeacherController.java deleted file mode 100644 index e28c0c25bbfc40e307ba266e9861503ac24c2edc..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/controller/TeacherController.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.lightsnail.schoolmanager.controller; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.lightsnail.schoolmanager.service.TeacherService; -import com.lightsnail.schoolmanager.vo.TeacherVO; - -import com.coderman.utils.response.ResultDataDto; -import com.coderman.utils.response.ResultDto; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - - -/** -* @Description:控制层 -* @Author:fanchunshuai -* @CreateTime:2021-06-25 16:08:53 -* @version v1.0 -*/ -@RestController -public class TeacherController extends BaseController{ - - protected Logger logger = LoggerFactory.getLogger(TeacherController.class); - - @Autowired - private TeacherService teacherService; - - - /** - * @Description:新增 - * @version v1.0 - * @param teacherVO - * @return ResultDto - */ - @RequestMapping(value = "/teacher/add",method = RequestMethod.POST) - public ResultDto add(@RequestBody TeacherVO teacherVO){ - //todo impl code - return new ResultDto(); - } - - /** - * @Description:修改 - * @version v1.0 - * @param teacherVO - * @return ResultDto - */ - @RequestMapping(value = "/teacher/update",method = RequestMethod.POST) - public ResultDto update(@RequestBody TeacherVO teacherVO){ - //todo impl code - return new ResultDto(); - } - - /** - * @Description:根据id删除 - * @version v1.0 - * @param id - * @return ResultDto - */ - @PostMapping("/teacher/delete") - public ResultDto delete(@RequestParam(name = "id") Long id){ - //todo impl code - return new ResultDto(); - } - - /** - * @Description:根据ID获取单条记录 - * @version v1.0 - * @param id - * @return ResultDataDto - */ - @GetMapping("/teacher/get") - public ResultDataDto getById(@RequestParam(name = "id") Long id){ - //todo impl code - return new ResultDataDto(); - } - - /** - * @Description:分页获取记录 - * @version v1.0 - * @return ResultDataDto - */ - @GetMapping("/teacher/getpage") - public ResultDataDto getPage(){ - //todo impl code - return new ResultDataDto(); - } - - /** - * @Description:修改状态 - * @version v1.0 - * @param id - * @param status - * @return ResultDataDto - */ - @PostMapping("/teacher/changestatus") - public ResultDto changeStatus(@RequestParam(name = "id") Long id,@RequestParam(name = "status") int status){ - //todo impl code - return new ResultDto(); - } - -} diff --git a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/entity/ClassEntity.java b/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/entity/ClassEntity.java deleted file mode 100644 index e350626e578a31b57c45c1c9d026196fa0011a4c..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/entity/ClassEntity.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.lightsnail.schoolmanager.entity; - -import java.util.Date; -import java.math.BigDecimal; - - /** - * @Description:Entity类 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 16:08:54 - * @version v1.0 - */ -public class ClassEntity{ - - /** **/ - private Long id; - /** **/ - private String manager; - /** **/ - private Integer studentCount; - /** 年级 **/ - private Integer gradeNum; - /** 班级 **/ - private Integer classNum; - - /** - * 描述： - */ - public Long getId() { - return id; - } - /** - * 描述： - */ - public void setId(Long id) { - this.id = id; - } - /** - * 描述： - */ - public String getManager() { - return manager; - } - /** - * 描述： - */ - public void setManager(String manager) { - this.manager = manager; - } - /** - * 描述： - */ - public Integer getStudentCount() { - return studentCount; - } - /** - * 描述： - */ - public void setStudentCount(Integer studentCount) { - this.studentCount = studentCount; - } - /** - * 描述：年级 - */ - public Integer getGradeNum() { - return gradeNum; - } - /** - * 描述：年级 - */ - public void setGradeNum(Integer gradeNum) { - this.gradeNum = gradeNum; - } - /** - * 描述：班级 - */ - public Integer getClassNum() { - return classNum; - } - /** - * 描述：班级 - */ - public void setClassNum(Integer classNum) { - this.classNum = classNum; - } -} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/entity/ClassTeacherEntity.java b/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/entity/ClassTeacherEntity.java deleted file mode 100644 index fe653d8542241a3036cef14eba818ad0f5645aed..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/entity/ClassTeacherEntity.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.lightsnail.schoolmanager.entity; - -import java.util.Date; -import java.math.BigDecimal; - - /** - * @Description:Entity类 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 16:08:54 - * @version v1.0 - */ -public class ClassTeacherEntity{ - - /** **/ - private Long id; - /** **/ - private Long classId; - /** **/ - private Long teacherId; - - /** - * 描述： - */ - public Long getId() { - return id; - } - /** - * 描述： - */ - public void setId(Long id) { - this.id = id; - } - /** - * 描述： - */ - public Long getClassId() { - return classId; - } - /** - * 描述： - */ - public void setClassId(Long classId) { - this.classId = classId; - } - /** - * 描述： - */ - public Long getTeacherId() { - return teacherId; - } - /** - * 描述： - */ - public void setTeacherId(Long teacherId) { - this.teacherId = teacherId; - } -} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/entity/StudentEntity.java b/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/entity/StudentEntity.java deleted file mode 100644 index 0c927ba8911a338b454c3991679b3592f500c523..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/entity/StudentEntity.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.lightsnail.schoolmanager.entity; - -import java.util.Date; -import java.math.BigDecimal; - - /** - * @Description:Entity类 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 16:08:54 - * @version v1.0 - */ -public class StudentEntity{ - - /** **/ - private Long id; - /** **/ - private String studentName; - /** **/ - private String studentCode; - /** **/ - private String sex; - /** **/ - private Integer age; - /** 班级ID **/ - private Long classId; - - /** - * 描述： - */ - public Long getId() { - return id; - } - /** - * 描述： - */ - public void setId(Long id) { - this.id = id; - } - /** - * 描述： - */ - public String getStudentName() { - return studentName; - } - /** - * 描述： - */ - public void setStudentName(String studentName) { - this.studentName = studentName; - } - /** - * 描述： - */ - public String getStudentCode() { - return studentCode; - } - /** - * 描述： - */ - public void setStudentCode(String studentCode) { - this.studentCode = studentCode; - } - /** - * 描述： - */ - public String getSex() { - return sex; - } - /** - * 描述： - */ - public void setSex(String sex) { - this.sex = sex; - } - /** - * 描述： - */ - public Integer getAge() { - return age; - } - /** - * 描述： - */ - public void setAge(Integer age) { - this.age = age; - } - /** - * 描述：班级ID - */ - public Long getClassId() { - return classId; - } - /** - * 描述：班级ID - */ - public void setClassId(Long classId) { - this.classId = classId; - } -} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/entity/TeacherEntity.java b/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/entity/TeacherEntity.java deleted file mode 100644 index 809d9410aa01f57811be700dc0bdea04068facf2..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/entity/TeacherEntity.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.lightsnail.schoolmanager.entity; - -import java.util.Date; -import java.math.BigDecimal; - - /** - * @Description:Entity类 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 16:08:53 - * @version v1.0 - */ -public class TeacherEntity{ - - /** **/ - private Long id; - /** **/ - private String teacherName; - /** **/ - private Integer age; - /** **/ - private Integer sex; - - /** - * 描述： - */ - public Long getId() { - return id; - } - /** - * 描述： - */ - public void setId(Long id) { - this.id = id; - } - /** - * 描述： - */ - public String getTeacherName() { - return teacherName; - } - /** - * 描述： - */ - public void setTeacherName(String teacherName) { - this.teacherName = teacherName; - } - /** - * 描述： - */ - public Integer getAge() { - return age; - } - /** - * 描述： - */ - public void setAge(Integer age) { - this.age = age; - } - /** - * 描述： - */ - public Integer getSex() { - return sex; - } - /** - * 描述： - */ - public void setSex(Integer sex) { - this.sex = sex; - } -} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/mapper/ClassMapper.java b/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/mapper/ClassMapper.java deleted file mode 100644 index 79a0f78857ab5e8dc398721d8ab82626ccc001fc..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/mapper/ClassMapper.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.lightsnail.schoolmanager.mapper; - -import java.util.List; -import com.lightsnail.schoolmanager.entity.ClassEntity; - - -/** - * @Description:mapperDAO接口 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 16:08:54 - * @version v1.0 - */ -public interface ClassMapper{ - - /** - * - * @Title: save - * @Description:新增或修改 - * @author: - * @param @param classEntity - * @return int - * @throws - */ - public int insert(ClassEntity classEntity); - - /** - * - * @Title: delete - * @Description: 通过id删除数据 - * @author: - * @param @param id - * @return int - * @throws - */ - public int deleteById(Long id); - - /** - * - * @Title: getById - * @Description: 通过id查询 - * @author: - * @param @param id - * @return ResultDataDto 返回类型 - * @throws - */ - public ClassEntity getById(Long id); - - /** - * - * @Title: getAll - * @Description:查询所有数据 - * @author: - * @return List getAll(); - - /** - * - * @Title: update - * @Description:新增或修改 - * @author: - * @param @param classEntity - * @return int - * @throws - */ - public int update(ClassEntity classEntity); - -} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/mapper/ClassTeacherMapper.java b/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/mapper/ClassTeacherMapper.java deleted file mode 100644 index 56a6eb6c7e7d2d9d5882297f355a827dfec1758a..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/mapper/ClassTeacherMapper.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.lightsnail.schoolmanager.mapper; - -import java.util.List; -import com.lightsnail.schoolmanager.entity.ClassTeacherEntity; - - -/** - * @Description:mapperDAO接口 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 16:08:54 - * @version v1.0 - */ -public interface ClassTeacherMapper{ - - /** - * - * @Title: save - * @Description:新增或修改 - * @author: - * @param @param classTeacherEntity - * @return int - * @throws - */ - public int insert(ClassTeacherEntity classTeacherEntity); - - /** - * - * @Title: delete - * @Description: 通过id删除数据 - * @author: - * @param @param id - * @return int - * @throws - */ - public int deleteById(Long id); - - /** - * - * @Title: getById - * @Description: 通过id查询 - * @author: - * @param @param id - * @return ResultDataDto 返回类型 - * @throws - */ - public ClassTeacherEntity getById(Long id); - - /** - * - * @Title: getAll - * @Description:查询所有数据 - * @author: - * @return List getAll(); - - /** - * - * @Title: update - * @Description:新增或修改 - * @author: - * @param @param classTeacherEntity - * @return int - * @throws - */ - public int update(ClassTeacherEntity classTeacherEntity); - -} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/mapper/StudentMapper.java b/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/mapper/StudentMapper.java deleted file mode 100644 index 2e6a005c797aa0acc114c6939c63877be103187d..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/mapper/StudentMapper.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.lightsnail.schoolmanager.mapper; - -import java.util.List; -import com.lightsnail.schoolmanager.entity.StudentEntity; - - -/** - * @Description:mapperDAO接口 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 16:08:54 - * @version v1.0 - */ -public interface StudentMapper{ - - /** - * - * @Title: save - * @Description:新增或修改 - * @author: - * @param @param studentEntity - * @return int - * @throws - */ - public int insert(StudentEntity studentEntity); - - /** - * - * @Title: delete - * @Description: 通过id删除数据 - * @author: - * @param @param id - * @return int - * @throws - */ - public int deleteById(Long id); - - /** - * - * @Title: getById - * @Description: 通过id查询 - * @author: - * @param @param id - * @return ResultDataDto 返回类型 - * @throws - */ - public StudentEntity getById(Long id); - - /** - * - * @Title: getAll - * @Description:查询所有数据 - * @author: - * @return List getAll(); - - /** - * - * @Title: update - * @Description:新增或修改 - * @author: - * @param @param studentEntity - * @return int - * @throws - */ - public int update(StudentEntity studentEntity); - -} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/mapper/TeacherMapper.java b/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/mapper/TeacherMapper.java deleted file mode 100644 index 76f899473279cb5fec145546c828b4100831751f..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/mapper/TeacherMapper.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.lightsnail.schoolmanager.mapper; - -import java.util.List; -import com.lightsnail.schoolmanager.entity.TeacherEntity; - - -/** - * @Description:mapperDAO接口 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 16:08:53 - * @version v1.0 - */ -public interface TeacherMapper{ - - /** - * - * @Title: save - * @Description:新增或修改 - * @author: - * @param @param teacherEntity - * @return int - * @throws - */ - public int insert(TeacherEntity teacherEntity); - - /** - * - * @Title: delete - * @Description: 通过id删除数据 - * @author: - * @param @param id - * @return int - * @throws - */ - public int deleteById(Long id); - - /** - * - * @Title: getById - * @Description: 通过id查询 - * @author: - * @param @param id - * @return ResultDataDto 返回类型 - * @throws - */ - public TeacherEntity getById(Long id); - - /** - * - * @Title: getAll - * @Description:查询所有数据 - * @author: - * @return List getAll(); - - /** - * - * @Title: update - * @Description:新增或修改 - * @author: - * @param @param teacherEntity - * @return int - * @throws - */ - public int update(TeacherEntity teacherEntity); - -} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/service.impl/ClassServiceImpl.java b/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/service.impl/ClassServiceImpl.java deleted file mode 100644 index dea339c19e97fa8c71653de4545861560a5982a4..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/service.impl/ClassServiceImpl.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.lightsnail.schoolmanager.service.impl; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.coderman.utils.response.ResultDataDto; -import com.coderman.utils.response.ResultDto; - -import com.lightsnail.schoolmanager.mapper.ClassMapper; -import com.lightsnail.schoolmanager.service.ClassService; -import com.lightsnail.schoolmanager.vo.ClassVO; -import com.lightsnail.schoolmanager.entity.ClassEntity; - -import java.util.List; -import org.apache.commons.lang3.StringUtils; -import com.alibaba.fastjson.JSONObject; - -/** - * @Description:Service接口实现类 - * @Author：fanchunshuai - * @CreateTime：2021-06-25 16:08:54 - * @version v1.0 - */ -@Service -public class ClassServiceImpl implements ClassService{ - - private Logger logger = LoggerFactory.getLogger(this.getClass()); - - @Autowired - private ClassMapper classMapper; - - @Override - public ResultDto save(ClassVO vo) { - ResultDto resultDto = new ResultDto(); - //todo impl code - return resultDto; - } - - @Override - public ResultDto delete(Long id) { - ResultDto resultDto = new ResultDto(); - logger.info("classService.delete,id="+id); - //todo impl code - return resultDto; - } - - @Override - public ResultDataDto getById(Long id) { - ResultDataDto resultDataDto = new ResultDataDto(); - logger.info("classService.getById,id="+id); - //todo impl code - return resultDataDto; - } - - @Override - public ResultDataDto> getAll() { - ResultDataDto> resultDataDto = new ResultDataDto>(); - //todo impl code - return resultDataDto; - } - - @Override - public ResultDto update(ClassVO vo) { - ResultDto resultDto = new ResultDto(); - //todo impl code - return resultDto; - } - -} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/service.impl/ClassTeacherServiceImpl.java b/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/service.impl/ClassTeacherServiceImpl.java deleted file mode 100644 index 707140260641439bbe2eb6b316e8997a50e0c1f1..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/service.impl/ClassTeacherServiceImpl.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.lightsnail.schoolmanager.service.impl; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.coderman.utils.response.ResultDataDto; -import com.coderman.utils.response.ResultDto; - -import com.lightsnail.schoolmanager.mapper.ClassTeacherMapper; -import com.lightsnail.schoolmanager.service.ClassTeacherService; -import com.lightsnail.schoolmanager.vo.ClassTeacherVO; -import com.lightsnail.schoolmanager.entity.ClassTeacherEntity; - -import java.util.List; -import org.apache.commons.lang3.StringUtils; -import com.alibaba.fastjson.JSONObject; - -/** - * @Description:Service接口实现类 - * @Author：fanchunshuai - * @CreateTime：2021-06-25 16:08:54 - * @version v1.0 - */ -@Service -public class ClassTeacherServiceImpl implements ClassTeacherService{ - - private Logger logger = LoggerFactory.getLogger(this.getClass()); - - @Autowired - private ClassTeacherMapper classTeacherMapper; - - @Override - public ResultDto save(ClassTeacherVO vo) { - ResultDto resultDto = new ResultDto(); - //todo impl code - return resultDto; - } - - @Override - public ResultDto delete(Long id) { - ResultDto resultDto = new ResultDto(); - logger.info("classTeacherService.delete,id="+id); - //todo impl code - return resultDto; - } - - @Override - public ResultDataDto getById(Long id) { - ResultDataDto resultDataDto = new ResultDataDto(); - logger.info("classTeacherService.getById,id="+id); - //todo impl code - return resultDataDto; - } - - @Override - public ResultDataDto> getAll() { - ResultDataDto> resultDataDto = new ResultDataDto>(); - //todo impl code - return resultDataDto; - } - - @Override - public ResultDto update(ClassTeacherVO vo) { - ResultDto resultDto = new ResultDto(); - //todo impl code - return resultDto; - } - -} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/service.impl/StudentServiceImpl.java b/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/service.impl/StudentServiceImpl.java deleted file mode 100644 index 854968205b688195f80f96d6a16f6cd7802ec6c0..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/service.impl/StudentServiceImpl.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.lightsnail.schoolmanager.service.impl; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.coderman.utils.response.ResultDataDto; -import com.coderman.utils.response.ResultDto; - -import com.lightsnail.schoolmanager.mapper.StudentMapper; -import com.lightsnail.schoolmanager.service.StudentService; -import com.lightsnail.schoolmanager.vo.StudentVO; -import com.lightsnail.schoolmanager.entity.StudentEntity; - -import java.util.List; -import org.apache.commons.lang3.StringUtils; -import com.alibaba.fastjson.JSONObject; - -/** - * @Description:Service接口实现类 - * @Author：fanchunshuai - * @CreateTime：2021-06-25 16:08:54 - * @version v1.0 - */ -@Service -public class StudentServiceImpl implements StudentService{ - - private Logger logger = LoggerFactory.getLogger(this.getClass()); - - @Autowired - private StudentMapper studentMapper; - - @Override - public ResultDto save(StudentVO vo) { - ResultDto resultDto = new ResultDto(); - //todo impl code - return resultDto; - } - - @Override - public ResultDto delete(Long id) { - ResultDto resultDto = new ResultDto(); - logger.info("studentService.delete,id="+id); - //todo impl code - return resultDto; - } - - @Override - public ResultDataDto getById(Long id) { - ResultDataDto resultDataDto = new ResultDataDto(); - logger.info("studentService.getById,id="+id); - //todo impl code - return resultDataDto; - } - - @Override - public ResultDataDto> getAll() { - ResultDataDto> resultDataDto = new ResultDataDto>(); - //todo impl code - return resultDataDto; - } - - @Override - public ResultDto update(StudentVO vo) { - ResultDto resultDto = new ResultDto(); - //todo impl code - return resultDto; - } - -} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/service.impl/TeacherServiceImpl.java b/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/service.impl/TeacherServiceImpl.java deleted file mode 100644 index 8e7df61a9e1f894abaaade2838812a8b5e72c92d..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/service.impl/TeacherServiceImpl.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.lightsnail.schoolmanager.service.impl; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.coderman.utils.response.ResultDataDto; -import com.coderman.utils.response.ResultDto; - -import com.lightsnail.schoolmanager.mapper.TeacherMapper; -import com.lightsnail.schoolmanager.service.TeacherService; -import com.lightsnail.schoolmanager.vo.TeacherVO; -import com.lightsnail.schoolmanager.entity.TeacherEntity; - -import java.util.List; -import org.apache.commons.lang3.StringUtils; -import com.alibaba.fastjson.JSONObject; - -/** - * @Description:Service接口实现类 - * @Author：fanchunshuai - * @CreateTime：2021-06-25 16:08:53 - * @version v1.0 - */ -@Service -public class TeacherServiceImpl implements TeacherService{ - - private Logger logger = LoggerFactory.getLogger(this.getClass()); - - @Autowired - private TeacherMapper teacherMapper; - - @Override - public ResultDto save(TeacherVO vo) { - ResultDto resultDto = new ResultDto(); - //todo impl code - return resultDto; - } - - @Override - public ResultDto delete(Long id) { - ResultDto resultDto = new ResultDto(); - logger.info("teacherService.delete,id="+id); - //todo impl code - return resultDto; - } - - @Override - public ResultDataDto getById(Long id) { - ResultDataDto resultDataDto = new ResultDataDto(); - logger.info("teacherService.getById,id="+id); - //todo impl code - return resultDataDto; - } - - @Override - public ResultDataDto> getAll() { - ResultDataDto> resultDataDto = new ResultDataDto>(); - //todo impl code - return resultDataDto; - } - - @Override - public ResultDto update(TeacherVO vo) { - ResultDto resultDto = new ResultDto(); - //todo impl code - return resultDto; - } - -} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/service/ClassService.java b/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/service/ClassService.java deleted file mode 100644 index 5a9db0617ba21acf6618b0aabb9d93970471e113..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/service/ClassService.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.lightsnail.schoolmanager.service; - -import java.util.List; -import com.coderman.utils.response.ResultDataDto; -import com.coderman.utils.response.ResultDto; - -import com.lightsnail.schoolmanager.vo.ClassVO; - -/** - * @Description:Service接口 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 16:08:54 - * @version v1.0 - */ -public interface ClassService{ - - /** - * - * @Title: save - * @Description:新增 - * @author: - * @param @param dto - * @param @param userId - * @return ResultDto 返回类型 - * @throws - */ - public ResultDto save(ClassVO dto) throws Exception; - - /** - * - * @Title: delete - * @Description: 通过id删除数据 - * @author: - * @param @param id - * @return ResultDto 返回类型 - * @throws - */ - public ResultDto delete(Long id); - - /** - * - * @Title: getById - * @Description: 通过id查询 - * @author: - * @param @param id - * @return ResultDataDto - * @throws - */ - public ResultDataDto getById(Long id) throws Exception; - - /** - * - * @Title: getAll - * @Description:查询所有数据 - * @author: - * @return ResultDataDto> - * @throws - */ - public ResultDataDto> getAll() throws Exception; - - /** - * - * @Title: update - * @Description:修改 - * @author: - * @param @param classEntity - * @return int - * @throws - */ - public ResultDto update(ClassVO classVO) throws Exception; - -} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/service/StudentService.java b/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/service/StudentService.java deleted file mode 100644 index 4aa10fcd08196dfe2e5fff04137cbb7efdac06aa..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/service/StudentService.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.lightsnail.schoolmanager.service; - -import java.util.List; -import com.coderman.utils.response.ResultDataDto; -import com.coderman.utils.response.ResultDto; - -import com.lightsnail.schoolmanager.vo.StudentVO; - -/** - * @Description:Service接口 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 16:08:54 - * @version v1.0 - */ -public interface StudentService{ - - /** - * - * @Title: save - * @Description:新增 - * @author: - * @param @param dto - * @param @param userId - * @return ResultDto 返回类型 - * @throws - */ - public ResultDto save(StudentVO dto) throws Exception; - - /** - * - * @Title: delete - * @Description: 通过id删除数据 - * @author: - * @param @param id - * @return ResultDto 返回类型 - * @throws - */ - public ResultDto delete(Long id); - - /** - * - * @Title: getById - * @Description: 通过id查询 - * @author: - * @param @param id - * @return ResultDataDto - * @throws - */ - public ResultDataDto getById(Long id) throws Exception; - - /** - * - * @Title: getAll - * @Description:查询所有数据 - * @author: - * @return ResultDataDto> - * @throws - */ - public ResultDataDto> getAll() throws Exception; - - /** - * - * @Title: update - * @Description:修改 - * @author: - * @param @param studentEntity - * @return int - * @throws - */ - public ResultDto update(StudentVO studentVO) throws Exception; - -} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/service/TeacherService.java b/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/service/TeacherService.java deleted file mode 100644 index 87c23232ef7ef0e058e8e33615baa94d22f583b7..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/service/TeacherService.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.lightsnail.schoolmanager.service; - -import java.util.List; -import com.coderman.utils.response.ResultDataDto; -import com.coderman.utils.response.ResultDto; - -import com.lightsnail.schoolmanager.vo.TeacherVO; - -/** - * @Description:Service接口 - * @Author:fanchunshuai - * @CreateTime:2021-06-25 16:08:53 - * @version v1.0 - */ -public interface TeacherService{ - - /** - * - * @Title: save - * @Description:新增 - * @author: - * @param @param dto - * @param @param userId - * @return ResultDto 返回类型 - * @throws - */ - public ResultDto save(TeacherVO dto) throws Exception; - - /** - * - * @Title: delete - * @Description: 通过id删除数据 - * @author: - * @param @param id - * @return ResultDto 返回类型 - * @throws - */ - public ResultDto delete(Long id); - - /** - * - * @Title: getById - * @Description: 通过id查询 - * @author: - * @param @param id - * @return ResultDataDto - * @throws - */ - public ResultDataDto getById(Long id) throws Exception; - - /** - * - * @Title: getAll - * @Description:查询所有数据 - * @author: - * @return ResultDataDto> - * @throws - */ - public ResultDataDto> getAll() throws Exception; - - /** - * - * @Title: update - * @Description:修改 - * @author: - * @param @param teacherEntity - * @return int - * @throws - */ - public ResultDto update(TeacherVO teacherVO) throws Exception; - -} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/vo/ClassTeacherVO.java b/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/vo/ClassTeacherVO.java deleted file mode 100644 index 603ccb81ab210d02ab21ab560f35e7af7a438e41..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/vo/ClassTeacherVO.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.lightsnail.schoolmanager.vo; - -import java.util.Date; -import java.math.BigDecimal; - -/** -* @Description:VO类 -* @Author:fanchunshuai -* @CreateTime:2021-06-25 16:08:54 -* @version v1.0 -*/ -public class ClassTeacherVO{ - - /** **/ - private Long id; - /** **/ - private Long classId; - /** **/ - private Long teacherId; - - /** - * 描述： - */ - public Long getId() { - return id; - } - /** - * 描述： - */ - public void setId(Long id) { - this.id = id; - } - /** - * 描述： - */ - public Long getClassId() { - return classId; - } - /** - * 描述： - */ - public void setClassId(Long classId) { - this.classId = classId; - } - /** - * 描述： - */ - public Long getTeacherId() { - return teacherId; - } - /** - * 描述： - */ - public void setTeacherId(Long teacherId) { - this.teacherId = teacherId; - } -} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/vo/ClassVO.java b/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/vo/ClassVO.java deleted file mode 100644 index 9d9b1e191dddc06e9daeea68c323f2af2db9c005..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/vo/ClassVO.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.lightsnail.schoolmanager.vo; - -import java.util.Date; -import java.math.BigDecimal; - -/** -* @Description:VO类 -* @Author:fanchunshuai -* @CreateTime:2021-06-25 16:08:54 -* @version v1.0 -*/ -public class ClassVO{ - - /** **/ - private Long id; - /** **/ - private String manager; - /** **/ - private Integer studentCount; - /** 年级 **/ - private Integer gradeNum; - /** 班级 **/ - private Integer classNum; - - /** - * 描述： - */ - public Long getId() { - return id; - } - /** - * 描述： - */ - public void setId(Long id) { - this.id = id; - } - /** - * 描述： - */ - public String getManager() { - return manager; - } - /** - * 描述： - */ - public void setManager(String manager) { - this.manager = manager; - } - /** - * 描述： - */ - public Integer getStudentCount() { - return studentCount; - } - /** - * 描述： - */ - public void setStudentCount(Integer studentCount) { - this.studentCount = studentCount; - } - /** - * 描述：年级 - */ - public Integer getGradeNum() { - return gradeNum; - } - /** - * 描述：年级 - */ - public void setGradeNum(Integer gradeNum) { - this.gradeNum = gradeNum; - } - /** - * 描述：班级 - */ - public Integer getClassNum() { - return classNum; - } - /** - * 描述：班级 - */ - public void setClassNum(Integer classNum) { - this.classNum = classNum; - } -} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/vo/StudentVO.java b/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/vo/StudentVO.java deleted file mode 100644 index a0d83b34de291bcdf52172661c569991e4269ec2..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/vo/StudentVO.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.lightsnail.schoolmanager.vo; - -import java.util.Date; -import java.math.BigDecimal; - -/** -* @Description:VO类 -* @Author:fanchunshuai -* @CreateTime:2021-06-25 16:08:54 -* @version v1.0 -*/ -public class StudentVO{ - - /** **/ - private Long id; - /** **/ - private String studentName; - /** **/ - private String studentCode; - /** **/ - private String sex; - /** **/ - private Integer age; - /** 班级ID **/ - private Long classId; - - /** - * 描述： - */ - public Long getId() { - return id; - } - /** - * 描述： - */ - public void setId(Long id) { - this.id = id; - } - /** - * 描述： - */ - public String getStudentName() { - return studentName; - } - /** - * 描述： - */ - public void setStudentName(String studentName) { - this.studentName = studentName; - } - /** - * 描述： - */ - public String getStudentCode() { - return studentCode; - } - /** - * 描述： - */ - public void setStudentCode(String studentCode) { - this.studentCode = studentCode; - } - /** - * 描述： - */ - public String getSex() { - return sex; - } - /** - * 描述： - */ - public void setSex(String sex) { - this.sex = sex; - } - /** - * 描述： - */ - public Integer getAge() { - return age; - } - /** - * 描述： - */ - public void setAge(Integer age) { - this.age = age; - } - /** - * 描述：班级ID - */ - public Long getClassId() { - return classId; - } - /** - * 描述：班级ID - */ - public void setClassId(Long classId) { - this.classId = classId; - } -} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/vo/TeacherVO.java b/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/vo/TeacherVO.java deleted file mode 100644 index 2ca81610ef2047b296d25ea4ee29a348551901e0..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/lightsnail/schoolmanager/vo/TeacherVO.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.lightsnail.schoolmanager.vo; - -import java.util.Date; -import java.math.BigDecimal; - -/** -* @Description:VO类 -* @Author:fanchunshuai -* @CreateTime:2021-06-25 16:08:54 -* @version v1.0 -*/ -public class TeacherVO{ - - /** **/ - private Long id; - /** **/ - private String teacherName; - /** **/ - private Integer age; - /** **/ - private Integer sex; - - /** - * 描述： - */ - public Long getId() { - return id; - } - /** - * 描述： - */ - public void setId(Long id) { - this.id = id; - } - /** - * 描述： - */ - public String getTeacherName() { - return teacherName; - } - /** - * 描述： - */ - public void setTeacherName(String teacherName) { - this.teacherName = teacherName; - } - /** - * 描述： - */ - public Integer getAge() { - return age; - } - /** - * 描述： - */ - public void setAge(Integer age) { - this.age = age; - } - /** - * 描述： - */ - public Integer getSex() { - return sex; - } - /** - * 描述： - */ - public void setSex(Integer sex) { - this.sex = sex; - } -} \ No newline at end of file diff --git a/codemaker-springboot/src/main/resources/erpicture/infosys_auth.puml b/codemaker-springboot/src/main/resources/erpicture/infosys_auth.puml new file mode 100644 index 0000000000000000000000000000000000000000..ec48036076ccd696194b744870f16fccce5cfa99 --- /dev/null +++ b/codemaker-springboot/src/main/resources/erpicture/infosys_auth.puml @@ -0,0 +1,149 @@ +@startuml +' hide the spot +hide circle + +' avoid problems with angled crows feet +skinparam linetype ortho + +entity " user_role_mapping 用户角色关联表" as user_role_mapping { + id: 主键/bigint(20) unsigned + user_id: 用户ID/bigint(20) + role_code: 角色code/varchar(50) +} + +entity " user_group 用户组" as user_group { + id: 主键/bigint(20) unsigned + group_name: 用户组名/varchar(50) + group_code: 用户组编码/varchar(50) + status: 用户组状态/bigint(20) + user_list: 用户组内用户列表/varchar(2000) + date_create: 创建时间/timestamp + date_update: 修改时间/timestamp + update_user_id: 修改人/bigint(20) + create_user_id: 创建人/bigint(20) +} + +entity " data_column_config 数据字段管理表" as data_column_config { + id: 主键/bigint(20) unsigned + bus_database: 数据库业务系统名称/varchar(60) + table_name: 表名称/varchar(60) + table_desc: 表描述/varchar(60) + column_name: 字段名称/varchar(60) + column_desc: 字段描述/varchar(60) + bus_model: 业务模块/varchar(60) + field_name: 业务属性名称/varchar(60) + date_create: 创建时间/timestamp + date_update: 修改时间/timestamp + update_user_id: 修改人/bigint(20) + create_user_id: 创建人/bigint(20) +} + +entity " role 角色表" as role { + id: 主键/bigint(20) unsigned + role_name: 角色名称/varchar(50) + role_code: 角色编码/varchar(50) + status: 角色组状态/bigint(20) + date_create: 创建时间/timestamp + date_update: 修改时间/timestamp + update_user_id: 修改人/bigint(20) + create_user_id: 创建人/bigint(20) +} + +entity " system 系统表" as system { + id: 主键/bigint(20) unsigned + system_name: 系统名称/varchar(50) + system_code: 系统编码/varchar(50) + system_url: 系统域名/varchar(50) + system_picurl: 系统图标/varchar(50) + tec_admin_user_id: 系统技术负责人/bigint(20) + bus_admin_user_id: 系统业务负责人/bigint(20) + department_id: 系统所属部门/bigint(20) + date_create: 创建时间/timestamp + create_user_id: 创建人/bigint(20) +} + +entity " role_group 角色组" as role_group { + id: 主键/bigint(20) unsigned + group_name: 角色组名/varchar(50) + group_code: 角色组编码/varchar(50) + role_code_list: 角色列表/varchar(2000) + date_create: 创建时间/timestamp + date_update: 修改时间/timestamp + update_user_id: 修改人/bigint(20) + create_user_id: 创建人/bigint(20) +} + +entity " system_authority 系统菜单权限表" as system_authority { + id: 主键/bigint(20) unsigned + auth_code: 权限标示/varchar(50) + system_code: 系统编码/varchar(50) + module_code: 菜单编码/varchar(50) + menu_code: 按钮编码/varchar(50) + date_create: 创建时间/timestamp + create_user_id: 创建人/bigint(20) +} + +entity " admin_authority 行政数据权限" as admin_authority { + id: 主键/bigint(20) unsigned + auth_code: 权限标示/varchar(50) + department_id: 组织部门ID/bigint(20) + city_id: 城市权限/bigint(20) + date_create: 创建时间/timestamp + date_update: 修改时间/timestamp + update_user_id: 修改人/bigint(20) + create_user_id: 创建人/bigint(20) +} + +entity " authority 抽象权限表" as authority { + id: 主键/bigint(20) unsigned + auth_code: 权限编码/varchar(50) + authority_type: 权限类型/tinyint(4) + role_code: 关联角色编码/varchar(50) + role_group_code: 关联角色组/varchar(50) + status: 权限状态/tinyint(4) + date_create: 创建时间/timestamp + date_update: 修改时间/timestamp + update_user_id: 修改人/bigint(20) + create_user_id: 创建人/bigint(20) +} + +entity " module 菜单模块表" as module { + id: 主键/bigint(20) unsigned + module_name: 菜单名称/varchar(50) + module_code: 菜单编码/varchar(50) + system_code: 系统编码/varchar(50) + module_url: 菜单链接/varchar(50) + date_create: 创建时间/timestamp + date_update: 修改时间/timestamp + update_user_id: 修改人/bigint(20) + create_user_id: 创建人/bigint(20) +} + +entity " menu 按钮表" as menu { + id: 主键/bigint(20) unsigned + menu_name: 按钮名称/varchar(50) + menu_code: 按钮编码/varchar(50) + module_code: 所属菜单编码/varchar(50) + system_code: 所属系统编码/varchar(50) + module_url: 菜单链接/varchar(50) + date_create: 创建时间/timestamp + date_update: 修改时间/timestamp + update_user_id: 修改人/bigint(20) + create_user_id: 创建人/bigint(20) +} + +entity " data_authority 数据字段权限" as data_authority { + id: 主键/bigint(20) unsigned + auth_code: 权限标示/varchar(50) + data_column_id: 业务数据库标示/varchar(50) + date_create: 创建时间/timestamp + date_update: 修改时间/timestamp + update_user_id: 修改人/bigint(20) + create_user_id: 创建人/bigint(20) +} + + + + + +@enduml \ No newline at end of file diff --git a/codemaker-springboot/src/main/resources/erpicture/school_manager.puml b/codemaker-springboot/src/main/resources/erpicture/school_manager.puml index 86d4abddc72271bb7da721e394a3b0fa90e8ef85..0af688dbd77cddf059a2c50cf7132cf2b41295e1 100644 --- a/codemaker-springboot/src/main/resources/erpicture/school_manager.puml +++ b/codemaker-springboot/src/main/resources/erpicture/school_manager.puml @@ -5,8 +5,40 @@ hide circle ' avoid problems with angled crows feet skinparam linetype ortho +entity " teacher " as teacher { + id: /bigint(20) + teacher_name: /varchar(255) + age: /int(11) + sex: /int(11) +} +entity " student " as student { + id: /bigint(20) unsigned + student_name: /varchar(255) + student_code: /varchar(255) + sex: /varchar(255) + age: /int(11) + class_id: 班级ID/bigint(20) +} +entity " class_teacher " as class_teacher { + id: /bigint(20) + class_id: /bigint(20) + teacher_id: /bigint(20) +} + +entity " class " as class { + id: /bigint(11) + manager: /varchar(255) + student_count: /int(11) + grade_num: 年级/int(11) + class_num: 班级/int(11) +} + + + +teacher ||--o{ class_teacher +class ||--o{ class_teacher @enduml \ No newline at end of file diff --git a/codemaker-springboot/src/main/resources/mapper/AdminAuthorityMapper.xml b/codemaker-springboot/src/main/resources/mapper/AdminAuthorityMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..e3b5a31dd23a2da5cb3c7c16bcd1de7b4b9dcaf8 --- /dev/null +++ b/codemaker-springboot/src/main/resources/mapper/AdminAuthorityMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id,auth_code,department_id,city_id,date_create,date_update,update_user_id,create_user_id + + + + insert into admin_authority( + auth_code,department_id,city_id,date_create,date_update,update_user_id,create_user_id + ) + values( + #{auth_code},#{department_id},#{city_id},#{date_create},#{date_update},#{update_user_id},#{create_user_id} + ) + + + + update admin_authority + set + auth_code=#{auth_code},department_id=#{department_id},city_id=#{city_id},date_create=#{date_create},date_update=#{date_update},update_user_id=#{update_user_id},create_user_id=#{create_user_id} + where id = #{id} + + + + + + + + delete from admin_authority where id = #{id} + + + + + + + diff --git a/codemaker-springboot/src/main/resources/mapper/AuthorityMapper.xml b/codemaker-springboot/src/main/resources/mapper/AuthorityMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..29c84a2c191e1c16d63cfbe0ff6fad29f9373829 --- /dev/null +++ b/codemaker-springboot/src/main/resources/mapper/AuthorityMapper.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id,auth_code,authority_type,role_code,role_group_code,status,date_create,date_update,update_user_id,create_user_id + + + + insert into authority( + auth_code,authority_type,role_code,role_group_code,status,date_create,date_update,update_user_id,create_user_id + ) + values( + #{auth_code},#{authority_type},#{role_code},#{role_group_code},#{status},#{date_create},#{date_update},#{update_user_id},#{create_user_id} + ) + + + + update authority + set + auth_code=#{auth_code},authority_type=#{authority_type},role_code=#{role_code},role_group_code=#{role_group_code},status=#{status},date_create=#{date_create},date_update=#{date_update},update_user_id=#{update_user_id},create_user_id=#{create_user_id} + where id = #{id} + + + + + + + + delete from authority where id = #{id} + + + + + + + diff --git a/codemaker-springboot/src/main/resources/mapper/ClassMapper.xml b/codemaker-springboot/src/main/resources/mapper/ClassMapper.xml index 6200f24d4ba8d41d66c6402dbe4c756eb9a20b04..162def4e29869b827ec970920f12315a79271a68 100644 --- a/codemaker-springboot/src/main/resources/mapper/ClassMapper.xml +++ b/codemaker-springboot/src/main/resources/mapper/ClassMapper.xml @@ -1,11 +1,11 @@ - + - + @@ -16,47 +16,31 @@ - id, - manager, - student_count, - grade_num, - class_num, + id,manager,student_count,grade_num,class_num - + insert into class( - id, - manager, - student_count, - grade_num, - class_num, + manager,student_count,grade_num,class_num ) values( - #{id}, - #{manager}, - #{studentCount}, - #{gradeNum}, - #{classNum}, + #{manager},#{student_count},#{grade_num},#{class_num} ) - + update class set - id=#{id}, - manager=#{manager}, - student_count=#{studentCount}, - grade_num=#{gradeNum}, - class_num=#{classNum}, + manager=#{manager},student_count=#{student_count},grade_num=#{grade_num},class_num=#{class_num} where id = #{id} - select from class - select from class where id = #{id} @@ -64,4 +48,8 @@ delete from class where id = #{id} + + diff --git a/codemaker-springboot/src/main/resources/mapper/ClassTeacherMapper.xml b/codemaker-springboot/src/main/resources/mapper/ClassTeacherMapper.xml index d76babae6b9b632c5353a5cb5cd68796d1816ad5..e3fd270b47c5b9f34ca57b58ca8d15d0ab773617 100644 --- a/codemaker-springboot/src/main/resources/mapper/ClassTeacherMapper.xml +++ b/codemaker-springboot/src/main/resources/mapper/ClassTeacherMapper.xml @@ -1,11 +1,11 @@ - + - + @@ -14,39 +14,31 @@ - id, - class_id, - teacher_id, + id,class_id,teacher_id - + insert into class_teacher( - id, - class_id, - teacher_id, + class_id,teacher_id ) values( - #{id}, - #{classId}, - #{teacherId}, + #{class_id},#{teacher_id} ) - + update class_teacher set - id=#{id}, - class_id=#{classId}, - teacher_id=#{teacherId}, + class_id=#{class_id},teacher_id=#{teacher_id} where id = #{id} - select from class_teacher - select from class_teacher where id = #{id} @@ -54,4 +46,8 @@ delete from class_teacher where id = #{id} + + diff --git a/codemaker-springboot/src/main/resources/mapper/DataAuthorityMapper.xml b/codemaker-springboot/src/main/resources/mapper/DataAuthorityMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..3235c31f59c904ccf3d66dd4c314ab9a20970a6b --- /dev/null +++ b/codemaker-springboot/src/main/resources/mapper/DataAuthorityMapper.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id,auth_code,data_column_id,date_create,date_update,update_user_id,create_user_id + + + + insert into data_authority( + auth_code,data_column_id,date_create,date_update,update_user_id,create_user_id + ) + values( + #{auth_code},#{data_column_id},#{date_create},#{date_update},#{update_user_id},#{create_user_id} + ) + + + + update data_authority + set + auth_code=#{auth_code},data_column_id=#{data_column_id},date_create=#{date_create},date_update=#{date_update},update_user_id=#{update_user_id},create_user_id=#{create_user_id} + where id = #{id} + + + + + + + + delete from data_authority where id = #{id} + + + + + + + diff --git a/codemaker-springboot/src/main/resources/mapper/DataColumnConfigMapper.xml b/codemaker-springboot/src/main/resources/mapper/DataColumnConfigMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..287b31a5082292542817008d9e365abc4e968517 --- /dev/null +++ b/codemaker-springboot/src/main/resources/mapper/DataColumnConfigMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id,bus_database,table_name,table_desc,column_name,column_desc,bus_model,field_name,date_create,date_update,update_user_id,create_user_id + + + + insert into data_column_config( + bus_database,table_name,table_desc,column_name,column_desc,bus_model,field_name,date_create,date_update,update_user_id,create_user_id + ) + values( + #{bus_database},#{table_name},#{table_desc},#{column_name},#{column_desc},#{bus_model},#{field_name},#{date_create},#{date_update},#{update_user_id},#{create_user_id} + ) + + + + update data_column_config + set + bus_database=#{bus_database},table_name=#{table_name},table_desc=#{table_desc},column_name=#{column_name},column_desc=#{column_desc},bus_model=#{bus_model},field_name=#{field_name},date_create=#{date_create},date_update=#{date_update},update_user_id=#{update_user_id},create_user_id=#{create_user_id} + where id = #{id} + + + + + + + + delete from data_column_config where id = #{id} + + + + + + + diff --git a/codemaker-springboot/src/main/resources/mapper/MenuMapper.xml b/codemaker-springboot/src/main/resources/mapper/MenuMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..98387fbbd63e4afeee1df0e92bc7a912eeedcf36 --- /dev/null +++ b/codemaker-springboot/src/main/resources/mapper/MenuMapper.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id,menu_name,menu_code,module_code,system_code,module_url,date_create,date_update,update_user_id,create_user_id + + + + insert into menu( + menu_name,menu_code,module_code,system_code,module_url,date_create,date_update,update_user_id,create_user_id + ) + values( + #{menu_name},#{menu_code},#{module_code},#{system_code},#{module_url},#{date_create},#{date_update},#{update_user_id},#{create_user_id} + ) + + + + update menu + set + menu_name=#{menu_name},menu_code=#{menu_code},module_code=#{module_code},system_code=#{system_code},module_url=#{module_url},date_create=#{date_create},date_update=#{date_update},update_user_id=#{update_user_id},create_user_id=#{create_user_id} + where id = #{id} + + + + + + + + delete from menu where id = #{id} + + + + + + + diff --git a/codemaker-springboot/src/main/resources/mapper/ModuleMapper.xml b/codemaker-springboot/src/main/resources/mapper/ModuleMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..ec9f69e788eae2b607fb9bc0fd23aa66b7c93d95 --- /dev/null +++ b/codemaker-springboot/src/main/resources/mapper/ModuleMapper.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id,module_name,module_code,system_code,module_url,date_create,date_update,update_user_id,create_user_id + + + + insert into module( + module_name,module_code,system_code,module_url,date_create,date_update,update_user_id,create_user_id + ) + values( + #{module_name},#{module_code},#{system_code},#{module_url},#{date_create},#{date_update},#{update_user_id},#{create_user_id} + ) + + + + update module + set + module_name=#{module_name},module_code=#{module_code},system_code=#{system_code},module_url=#{module_url},date_create=#{date_create},date_update=#{date_update},update_user_id=#{update_user_id},create_user_id=#{create_user_id} + where id = #{id} + + + + + + + + delete from module where id = #{id} + + + + + + + diff --git a/codemaker-springboot/src/main/resources/mapper/RoleGroupMapper.xml b/codemaker-springboot/src/main/resources/mapper/RoleGroupMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..968f59e75bddb204244e12a9062884dbf1d85dc4 --- /dev/null +++ b/codemaker-springboot/src/main/resources/mapper/RoleGroupMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id,group_name,group_code,role_code_list,date_create,date_update,update_user_id,create_user_id + + + + insert into role_group( + group_name,group_code,role_code_list,date_create,date_update,update_user_id,create_user_id + ) + values( + #{group_name},#{group_code},#{role_code_list},#{date_create},#{date_update},#{update_user_id},#{create_user_id} + ) + + + + update role_group + set + group_name=#{group_name},group_code=#{group_code},role_code_list=#{role_code_list},date_create=#{date_create},date_update=#{date_update},update_user_id=#{update_user_id},create_user_id=#{create_user_id} + where id = #{id} + + + + + + + + delete from role_group where id = #{id} + + + + + + + diff --git a/codemaker-springboot/src/main/resources/mapper/RoleMapper.xml b/codemaker-springboot/src/main/resources/mapper/RoleMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..08f103a1a8f5b4e69d1ba3a7f3a974d754150edb --- /dev/null +++ b/codemaker-springboot/src/main/resources/mapper/RoleMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id,role_name,role_code,status,date_create,date_update,update_user_id,create_user_id + + + + insert into role( + role_name,role_code,status,date_create,date_update,update_user_id,create_user_id + ) + values( + #{role_name},#{role_code},#{status},#{date_create},#{date_update},#{update_user_id},#{create_user_id} + ) + + + + update role + set + role_name=#{role_name},role_code=#{role_code},status=#{status},date_create=#{date_create},date_update=#{date_update},update_user_id=#{update_user_id},create_user_id=#{create_user_id} + where id = #{id} + + + + + + + + delete from role where id = #{id} + + + + + + + diff --git a/codemaker-springboot/src/main/resources/mapper/StudentMapper.xml b/codemaker-springboot/src/main/resources/mapper/StudentMapper.xml index 0442f15e2b632b05f11560c3a2960e98b18a9236..10233adffb6efb45aa6aec7831e5be0a1235ac4d 100644 --- a/codemaker-springboot/src/main/resources/mapper/StudentMapper.xml +++ b/codemaker-springboot/src/main/resources/mapper/StudentMapper.xml @@ -1,11 +1,11 @@ - + - + @@ -17,51 +17,31 @@ - id, - student_name, - student_code, - sex, - age, - class_id, + id,student_name,student_code,sex,age,class_id - + insert into student( - id, - student_name, - student_code, - sex, - age, - class_id, + student_name,student_code,sex,age,class_id ) values( - #{id}, - #{studentName}, - #{studentCode}, - #{sex}, - #{age}, - #{classId}, + #{student_name},#{student_code},#{sex},#{age},#{class_id} ) - + update student set - id=#{id}, - student_name=#{studentName}, - student_code=#{studentCode}, - sex=#{sex}, - age=#{age}, - class_id=#{classId}, + student_name=#{student_name},student_code=#{student_code},sex=#{sex},age=#{age},class_id=#{class_id} where id = #{id} - select from student - select from student where id = #{id} @@ -69,4 +49,8 @@ delete from student where id = #{id} + + diff --git a/codemaker-springboot/src/main/resources/mapper/SystemAuthorityMapper.xml b/codemaker-springboot/src/main/resources/mapper/SystemAuthorityMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..d2194168db93234dcca21982b49f6cf2123a51ef --- /dev/null +++ b/codemaker-springboot/src/main/resources/mapper/SystemAuthorityMapper.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id,auth_code,system_code,module_code,menu_code,date_create,create_user_id + + + + insert into system_authority( + auth_code,system_code,module_code,menu_code,date_create,create_user_id + ) + values( + #{auth_code},#{system_code},#{module_code},#{menu_code},#{date_create},#{create_user_id} + ) + + + + update system_authority + set + auth_code=#{auth_code},system_code=#{system_code},module_code=#{module_code},menu_code=#{menu_code},date_create=#{date_create},create_user_id=#{create_user_id} + where id = #{id} + + + + + + + + delete from system_authority where id = #{id} + + + + + + + diff --git a/codemaker-springboot/src/main/resources/mapper/SystemMapper.xml b/codemaker-springboot/src/main/resources/mapper/SystemMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..87b7c92093231f259c95be2949e836e522eb29c5 --- /dev/null +++ b/codemaker-springboot/src/main/resources/mapper/SystemMapper.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id,system_name,system_code,system_url,system_picurl,tec_admin_user_id,bus_admin_user_id,department_id,date_create,create_user_id + + + + insert into system( + system_name,system_code,system_url,system_picurl,tec_admin_user_id,bus_admin_user_id,department_id,date_create,create_user_id + ) + values( + #{system_name},#{system_code},#{system_url},#{system_picurl},#{tec_admin_user_id},#{bus_admin_user_id},#{department_id},#{date_create},#{create_user_id} + ) + + + + update system + set + system_name=#{system_name},system_code=#{system_code},system_url=#{system_url},system_picurl=#{system_picurl},tec_admin_user_id=#{tec_admin_user_id},bus_admin_user_id=#{bus_admin_user_id},department_id=#{department_id},date_create=#{date_create},create_user_id=#{create_user_id} + where id = #{id} + + + + + + + + delete from system where id = #{id} + + + + + + + diff --git a/codemaker-springboot/src/main/resources/mapper/TeacherMapper.xml b/codemaker-springboot/src/main/resources/mapper/TeacherMapper.xml index 943af7043b4d84292345467063aba9f8d376eeed..2dcc080db1ea26a3c747812ba7e55ea8b8018b2a 100644 --- a/codemaker-springboot/src/main/resources/mapper/TeacherMapper.xml +++ b/codemaker-springboot/src/main/resources/mapper/TeacherMapper.xml @@ -1,11 +1,11 @@ - + - + @@ -15,43 +15,31 @@ - id, - teacher_name, - age, - sex, + id,teacher_name,age,sex - + insert into teacher( - id, - teacher_name, - age, - sex, + teacher_name,age,sex ) values( - #{id}, - #{teacherName}, - #{age}, - #{sex}, + #{teacher_name},#{age},#{sex} ) - + update teacher set - id=#{id}, - teacher_name=#{teacherName}, - age=#{age}, - sex=#{sex}, + teacher_name=#{teacher_name},age=#{age},sex=#{sex} where id = #{id} - select from teacher - select from teacher where id = #{id} @@ -59,4 +47,8 @@ delete from teacher where id = #{id} + + diff --git a/codemaker-springboot/src/main/resources/mapper/UserGroupMapper.xml b/codemaker-springboot/src/main/resources/mapper/UserGroupMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..d9441a973f286f90ac5c7ce16ba1a5321a7b9e9a --- /dev/null +++ b/codemaker-springboot/src/main/resources/mapper/UserGroupMapper.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id,group_name,group_code,status,user_list,date_create,date_update,update_user_id,create_user_id + + + + insert into user_group( + group_name,group_code,status,user_list,date_create,date_update,update_user_id,create_user_id + ) + values( + #{group_name},#{group_code},#{status},#{user_list},#{date_create},#{date_update},#{update_user_id},#{create_user_id} + ) + + + + update user_group + set + group_name=#{group_name},group_code=#{group_code},status=#{status},user_list=#{user_list},date_create=#{date_create},date_update=#{date_update},update_user_id=#{update_user_id},create_user_id=#{create_user_id} + where id = #{id} + + + + + + + + delete from user_group where id = #{id} + + + + + + + diff --git a/codemaker-springboot/src/main/resources/mapper/UserRoleMappingMapper.xml b/codemaker-springboot/src/main/resources/mapper/UserRoleMappingMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..3892d15b65cd2a1491a4a6a4dc54e9a970ea39ef --- /dev/null +++ b/codemaker-springboot/src/main/resources/mapper/UserRoleMappingMapper.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + id,user_id,role_code + + + + insert into user_role_mapping( + user_id,role_code + ) + values( + #{user_id},#{role_code} + ) + + + + update user_role_mapping + set + user_id=#{user_id},role_code=#{role_code} + where id = #{id} + + + + + + + + delete from user_role_mapping where id = #{id} + + + + + + + diff --git a/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/AdminAuthorityServiceTest.java b/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/AdminAuthorityServiceTest.java new file mode 100644 index 0000000000000000000000000000000000000000..815effa2ffa2dd9d2f3780e557a01c70306c30ef --- /dev/null +++ b/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/AdminAuthorityServiceTest.java @@ -0,0 +1,107 @@ +package com.coderman.infosys.auth.service.test; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.infosys.auth.service.AdminAuthorityService; +import com.coderman.infosys.auth.vo.AdminAuthorityVO; +import com.coderman.infosys.auth.Application; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.utils.response.ResultDto; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.alibaba.fastjson.JSON; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.test.context.junit4.SpringRunner; + +/** +* @Description:行政数据权限单元测试 +* @Author:shenshuai +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@RunWith(SpringRunner.class) +@SpringBootTest(webEnvironment= SpringBootTest.WebEnvironment.RANDOM_PORT,classes = {Application.class}) +public class AdminAuthorityServiceTest{ + + protected Logger logger = LoggerFactory.getLogger(AdminAuthorityServiceTest.class); + + @Autowired + private AdminAuthorityService adminAuthorityService; + @Autowired + private TestRestTemplate restTemplate; + + /** + * @Description:测试新增行政数据权限 接口 + */ + @Test + public void testAdd(){ + //todo test code + AdminAuthorityVO vo = new AdminAuthorityVO(); + + ResultDto resultDto = restTemplate.postForEntity("/adminAuthority/add",vo, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:测试修改行政数据权限 + */ + @Test + public void testUpdate(){ + //todo test code + AdminAuthorityVO vo = new AdminAuthorityVO(); + ResultDto resultDto = restTemplate.postForEntity("/adminAuthority/update",vo, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:测试删除根据id删除行政数据权限 + */ + @Test + public void testDelete(){ + //todo test code + long id = 1L; + ResultDto resultDto = restTemplate.postForEntity("/adminAuthority/delete",id, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:但是根据ID获取行政数据权限单条记录 + */ + @Test + public void testGetById(){ + //todo test code + ResultDataDto resultDataDto = restTemplate.getForEntity("/adminAuthority/get?id=1",ResultDataDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDataDto)); + } + + /** + * @Description:测试分页获取行政数据权限记录 + */ + @Test + public void getPage(){ + //todo test code + } + + /** + * @Description:测试禁用行政数据权限状态 + */ + @Test + public void testDisable(){ + //todo test code + } + /** + * @Description:测试启用行政数据权限状态 + */ + @Test + public void testEnable(){ + //todo test code + } +} diff --git a/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/AuthorityServiceTest.java b/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/AuthorityServiceTest.java new file mode 100644 index 0000000000000000000000000000000000000000..08e2e1e4aa0e22c5a369e384bb35803571a7aa82 --- /dev/null +++ b/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/AuthorityServiceTest.java @@ -0,0 +1,107 @@ +package com.coderman.infosys.auth.service.test; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.infosys.auth.service.AuthorityService; +import com.coderman.infosys.auth.vo.AuthorityVO; +import com.coderman.infosys.auth.Application; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.utils.response.ResultDto; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.alibaba.fastjson.JSON; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.test.context.junit4.SpringRunner; + +/** +* @Description:抽象权限表单元测试 +* @Author:shenshuai +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@RunWith(SpringRunner.class) +@SpringBootTest(webEnvironment= SpringBootTest.WebEnvironment.RANDOM_PORT,classes = {Application.class}) +public class AuthorityServiceTest{ + + protected Logger logger = LoggerFactory.getLogger(AuthorityServiceTest.class); + + @Autowired + private AuthorityService authorityService; + @Autowired + private TestRestTemplate restTemplate; + + /** + * @Description:测试新增抽象权限表 接口 + */ + @Test + public void testAdd(){ + //todo test code + AuthorityVO vo = new AuthorityVO(); + + ResultDto resultDto = restTemplate.postForEntity("/authority/add",vo, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:测试修改抽象权限表 + */ + @Test + public void testUpdate(){ + //todo test code + AuthorityVO vo = new AuthorityVO(); + ResultDto resultDto = restTemplate.postForEntity("/authority/update",vo, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:测试删除根据id删除抽象权限表 + */ + @Test + public void testDelete(){ + //todo test code + long id = 1L; + ResultDto resultDto = restTemplate.postForEntity("/authority/delete",id, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:但是根据ID获取抽象权限表单条记录 + */ + @Test + public void testGetById(){ + //todo test code + ResultDataDto resultDataDto = restTemplate.getForEntity("/authority/get?id=1",ResultDataDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDataDto)); + } + + /** + * @Description:测试分页获取抽象权限表记录 + */ + @Test + public void getPage(){ + //todo test code + } + + /** + * @Description:测试禁用抽象权限表状态 + */ + @Test + public void testDisable(){ + //todo test code + } + /** + * @Description:测试启用抽象权限表状态 + */ + @Test + public void testEnable(){ + //todo test code + } +} diff --git a/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/ClassServiceTest.java b/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/ClassServiceTest.java new file mode 100644 index 0000000000000000000000000000000000000000..f161090639feab41c5b37c98072430ac1f5af58d --- /dev/null +++ b/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/ClassServiceTest.java @@ -0,0 +1,107 @@ +package com.coderman.infosys.auth.service.test; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.infosys.auth.service.ClassService; +import com.coderman.infosys.auth.vo.ClassVO; +import com.coderman.infosys.auth.Application; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.utils.response.ResultDto; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.alibaba.fastjson.JSON; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.test.context.junit4.SpringRunner; + +/** +* @Description:单元测试 +* @Author:shenshuai +* @CreateTime:2021-10-27 11:12:40 +* @version v1.0 +*/ +@RunWith(SpringRunner.class) +@SpringBootTest(webEnvironment= SpringBootTest.WebEnvironment.RANDOM_PORT,classes = {Application.class}) +public class ClassServiceTest{ + + protected Logger logger = LoggerFactory.getLogger(ClassServiceTest.class); + + @Autowired + private ClassService classService; + @Autowired + private TestRestTemplate restTemplate; + + /** + * @Description:测试新增 接口 + */ + @Test + public void testAdd(){ + //todo test code + ClassVO vo = new ClassVO(); + + ResultDto resultDto = restTemplate.postForEntity("/class/add",vo, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:测试修改 + */ + @Test + public void testUpdate(){ + //todo test code + ClassVO vo = new ClassVO(); + ResultDto resultDto = restTemplate.postForEntity("/class/update",vo, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:测试删除根据id删除 + */ + @Test + public void testDelete(){ + //todo test code + long id = 1L; + ResultDto resultDto = restTemplate.postForEntity("/class/delete",id, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:但是根据ID获取单条记录 + */ + @Test + public void testGetById(){ + //todo test code + ResultDataDto resultDataDto = restTemplate.getForEntity("/class/get?id=1",ResultDataDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDataDto)); + } + + /** + * @Description:测试分页获取记录 + */ + @Test + public void getPage(){ + //todo test code + } + + /** + * @Description:测试禁用状态 + */ + @Test + public void testDisable(){ + //todo test code + } + /** + * @Description:测试启用状态 + */ + @Test + public void testEnable(){ + //todo test code + } +} diff --git a/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/ClassTeacherServiceTest.java b/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/ClassTeacherServiceTest.java new file mode 100644 index 0000000000000000000000000000000000000000..f891d6d83c2e47a7fa2c46452096e45b2012e8cc --- /dev/null +++ b/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/ClassTeacherServiceTest.java @@ -0,0 +1,107 @@ +package com.coderman.infosys.auth.service.test; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.infosys.auth.service.ClassTeacherService; +import com.coderman.infosys.auth.vo.ClassTeacherVO; +import com.coderman.infosys.auth.Application; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.utils.response.ResultDto; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.alibaba.fastjson.JSON; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.test.context.junit4.SpringRunner; + +/** +* @Description:单元测试 +* @Author:shenshuai +* @CreateTime:2021-10-27 11:12:40 +* @version v1.0 +*/ +@RunWith(SpringRunner.class) +@SpringBootTest(webEnvironment= SpringBootTest.WebEnvironment.RANDOM_PORT,classes = {Application.class}) +public class ClassTeacherServiceTest{ + + protected Logger logger = LoggerFactory.getLogger(ClassTeacherServiceTest.class); + + @Autowired + private ClassTeacherService classTeacherService; + @Autowired + private TestRestTemplate restTemplate; + + /** + * @Description:测试新增 接口 + */ + @Test + public void testAdd(){ + //todo test code + ClassTeacherVO vo = new ClassTeacherVO(); + + ResultDto resultDto = restTemplate.postForEntity("/classTeacher/add",vo, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:测试修改 + */ + @Test + public void testUpdate(){ + //todo test code + ClassTeacherVO vo = new ClassTeacherVO(); + ResultDto resultDto = restTemplate.postForEntity("/classTeacher/update",vo, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:测试删除根据id删除 + */ + @Test + public void testDelete(){ + //todo test code + long id = 1L; + ResultDto resultDto = restTemplate.postForEntity("/classTeacher/delete",id, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:但是根据ID获取单条记录 + */ + @Test + public void testGetById(){ + //todo test code + ResultDataDto resultDataDto = restTemplate.getForEntity("/classTeacher/get?id=1",ResultDataDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDataDto)); + } + + /** + * @Description:测试分页获取记录 + */ + @Test + public void getPage(){ + //todo test code + } + + /** + * @Description:测试禁用状态 + */ + @Test + public void testDisable(){ + //todo test code + } + /** + * @Description:测试启用状态 + */ + @Test + public void testEnable(){ + //todo test code + } +} diff --git a/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/DataAuthorityServiceTest.java b/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/DataAuthorityServiceTest.java new file mode 100644 index 0000000000000000000000000000000000000000..ec9bd4c8259316c236379c01ad968dd250f3a6f5 --- /dev/null +++ b/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/DataAuthorityServiceTest.java @@ -0,0 +1,107 @@ +package com.coderman.infosys.auth.service.test; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.infosys.auth.service.DataAuthorityService; +import com.coderman.infosys.auth.vo.DataAuthorityVO; +import com.coderman.infosys.auth.Application; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.utils.response.ResultDto; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.alibaba.fastjson.JSON; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.test.context.junit4.SpringRunner; + +/** +* @Description:数据字段权限单元测试 +* @Author:shenshuai +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@RunWith(SpringRunner.class) +@SpringBootTest(webEnvironment= SpringBootTest.WebEnvironment.RANDOM_PORT,classes = {Application.class}) +public class DataAuthorityServiceTest{ + + protected Logger logger = LoggerFactory.getLogger(DataAuthorityServiceTest.class); + + @Autowired + private DataAuthorityService dataAuthorityService; + @Autowired + private TestRestTemplate restTemplate; + + /** + * @Description:测试新增数据字段权限 接口 + */ + @Test + public void testAdd(){ + //todo test code + DataAuthorityVO vo = new DataAuthorityVO(); + + ResultDto resultDto = restTemplate.postForEntity("/dataAuthority/add",vo, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:测试修改数据字段权限 + */ + @Test + public void testUpdate(){ + //todo test code + DataAuthorityVO vo = new DataAuthorityVO(); + ResultDto resultDto = restTemplate.postForEntity("/dataAuthority/update",vo, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:测试删除根据id删除数据字段权限 + */ + @Test + public void testDelete(){ + //todo test code + long id = 1L; + ResultDto resultDto = restTemplate.postForEntity("/dataAuthority/delete",id, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:但是根据ID获取数据字段权限单条记录 + */ + @Test + public void testGetById(){ + //todo test code + ResultDataDto resultDataDto = restTemplate.getForEntity("/dataAuthority/get?id=1",ResultDataDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDataDto)); + } + + /** + * @Description:测试分页获取数据字段权限记录 + */ + @Test + public void getPage(){ + //todo test code + } + + /** + * @Description:测试禁用数据字段权限状态 + */ + @Test + public void testDisable(){ + //todo test code + } + /** + * @Description:测试启用数据字段权限状态 + */ + @Test + public void testEnable(){ + //todo test code + } +} diff --git a/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/DataColumnConfigServiceTest.java b/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/DataColumnConfigServiceTest.java new file mode 100644 index 0000000000000000000000000000000000000000..25642c520e3edd19c3a358aa8a975db3941aa1b5 --- /dev/null +++ b/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/DataColumnConfigServiceTest.java @@ -0,0 +1,107 @@ +package com.coderman.infosys.auth.service.test; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.infosys.auth.service.DataColumnConfigService; +import com.coderman.infosys.auth.vo.DataColumnConfigVO; +import com.coderman.infosys.auth.Application; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.utils.response.ResultDto; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.alibaba.fastjson.JSON; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.test.context.junit4.SpringRunner; + +/** +* @Description:数据字段管理表单元测试 +* @Author:shenshuai +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@RunWith(SpringRunner.class) +@SpringBootTest(webEnvironment= SpringBootTest.WebEnvironment.RANDOM_PORT,classes = {Application.class}) +public class DataColumnConfigServiceTest{ + + protected Logger logger = LoggerFactory.getLogger(DataColumnConfigServiceTest.class); + + @Autowired + private DataColumnConfigService dataColumnConfigService; + @Autowired + private TestRestTemplate restTemplate; + + /** + * @Description:测试新增数据字段管理表 接口 + */ + @Test + public void testAdd(){ + //todo test code + DataColumnConfigVO vo = new DataColumnConfigVO(); + + ResultDto resultDto = restTemplate.postForEntity("/dataColumnConfig/add",vo, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:测试修改数据字段管理表 + */ + @Test + public void testUpdate(){ + //todo test code + DataColumnConfigVO vo = new DataColumnConfigVO(); + ResultDto resultDto = restTemplate.postForEntity("/dataColumnConfig/update",vo, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:测试删除根据id删除数据字段管理表 + */ + @Test + public void testDelete(){ + //todo test code + long id = 1L; + ResultDto resultDto = restTemplate.postForEntity("/dataColumnConfig/delete",id, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:但是根据ID获取数据字段管理表单条记录 + */ + @Test + public void testGetById(){ + //todo test code + ResultDataDto resultDataDto = restTemplate.getForEntity("/dataColumnConfig/get?id=1",ResultDataDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDataDto)); + } + + /** + * @Description:测试分页获取数据字段管理表记录 + */ + @Test + public void getPage(){ + //todo test code + } + + /** + * @Description:测试禁用数据字段管理表状态 + */ + @Test + public void testDisable(){ + //todo test code + } + /** + * @Description:测试启用数据字段管理表状态 + */ + @Test + public void testEnable(){ + //todo test code + } +} diff --git a/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/MenuServiceTest.java b/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/MenuServiceTest.java new file mode 100644 index 0000000000000000000000000000000000000000..51466f870111f32ade4763d14fe6c7148b6c7d80 --- /dev/null +++ b/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/MenuServiceTest.java @@ -0,0 +1,107 @@ +package com.coderman.infosys.auth.service.test; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.infosys.auth.service.MenuService; +import com.coderman.infosys.auth.vo.MenuVO; +import com.coderman.infosys.auth.Application; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.utils.response.ResultDto; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.alibaba.fastjson.JSON; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.test.context.junit4.SpringRunner; + +/** +* @Description:按钮表单元测试 +* @Author:shenshuai +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@RunWith(SpringRunner.class) +@SpringBootTest(webEnvironment= SpringBootTest.WebEnvironment.RANDOM_PORT,classes = {Application.class}) +public class MenuServiceTest{ + + protected Logger logger = LoggerFactory.getLogger(MenuServiceTest.class); + + @Autowired + private MenuService menuService; + @Autowired + private TestRestTemplate restTemplate; + + /** + * @Description:测试新增按钮表 接口 + */ + @Test + public void testAdd(){ + //todo test code + MenuVO vo = new MenuVO(); + + ResultDto resultDto = restTemplate.postForEntity("/menu/add",vo, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:测试修改按钮表 + */ + @Test + public void testUpdate(){ + //todo test code + MenuVO vo = new MenuVO(); + ResultDto resultDto = restTemplate.postForEntity("/menu/update",vo, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:测试删除根据id删除按钮表 + */ + @Test + public void testDelete(){ + //todo test code + long id = 1L; + ResultDto resultDto = restTemplate.postForEntity("/menu/delete",id, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:但是根据ID获取按钮表单条记录 + */ + @Test + public void testGetById(){ + //todo test code + ResultDataDto resultDataDto = restTemplate.getForEntity("/menu/get?id=1",ResultDataDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDataDto)); + } + + /** + * @Description:测试分页获取按钮表记录 + */ + @Test + public void getPage(){ + //todo test code + } + + /** + * @Description:测试禁用按钮表状态 + */ + @Test + public void testDisable(){ + //todo test code + } + /** + * @Description:测试启用按钮表状态 + */ + @Test + public void testEnable(){ + //todo test code + } +} diff --git a/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/ModuleServiceTest.java b/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/ModuleServiceTest.java new file mode 100644 index 0000000000000000000000000000000000000000..c92791e7cf79b8c420b574c5b3e2d2f561f6f0a1 --- /dev/null +++ b/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/ModuleServiceTest.java @@ -0,0 +1,107 @@ +package com.coderman.infosys.auth.service.test; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.infosys.auth.service.ModuleService; +import com.coderman.infosys.auth.vo.ModuleVO; +import com.coderman.infosys.auth.Application; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.utils.response.ResultDto; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.alibaba.fastjson.JSON; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.test.context.junit4.SpringRunner; + +/** +* @Description:菜单模块表单元测试 +* @Author:shenshuai +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@RunWith(SpringRunner.class) +@SpringBootTest(webEnvironment= SpringBootTest.WebEnvironment.RANDOM_PORT,classes = {Application.class}) +public class ModuleServiceTest{ + + protected Logger logger = LoggerFactory.getLogger(ModuleServiceTest.class); + + @Autowired + private ModuleService moduleService; + @Autowired + private TestRestTemplate restTemplate; + + /** + * @Description:测试新增菜单模块表 接口 + */ + @Test + public void testAdd(){ + //todo test code + ModuleVO vo = new ModuleVO(); + + ResultDto resultDto = restTemplate.postForEntity("/module/add",vo, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:测试修改菜单模块表 + */ + @Test + public void testUpdate(){ + //todo test code + ModuleVO vo = new ModuleVO(); + ResultDto resultDto = restTemplate.postForEntity("/module/update",vo, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:测试删除根据id删除菜单模块表 + */ + @Test + public void testDelete(){ + //todo test code + long id = 1L; + ResultDto resultDto = restTemplate.postForEntity("/module/delete",id, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:但是根据ID获取菜单模块表单条记录 + */ + @Test + public void testGetById(){ + //todo test code + ResultDataDto resultDataDto = restTemplate.getForEntity("/module/get?id=1",ResultDataDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDataDto)); + } + + /** + * @Description:测试分页获取菜单模块表记录 + */ + @Test + public void getPage(){ + //todo test code + } + + /** + * @Description:测试禁用菜单模块表状态 + */ + @Test + public void testDisable(){ + //todo test code + } + /** + * @Description:测试启用菜单模块表状态 + */ + @Test + public void testEnable(){ + //todo test code + } +} diff --git a/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/RoleGroupServiceTest.java b/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/RoleGroupServiceTest.java new file mode 100644 index 0000000000000000000000000000000000000000..adfe9c6185c65de1f344a428d1f92ad323e95af2 --- /dev/null +++ b/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/RoleGroupServiceTest.java @@ -0,0 +1,107 @@ +package com.coderman.infosys.auth.service.test; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.infosys.auth.service.RoleGroupService; +import com.coderman.infosys.auth.vo.RoleGroupVO; +import com.coderman.infosys.auth.Application; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.utils.response.ResultDto; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.alibaba.fastjson.JSON; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.test.context.junit4.SpringRunner; + +/** +* @Description:角色组单元测试 +* @Author:shenshuai +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@RunWith(SpringRunner.class) +@SpringBootTest(webEnvironment= SpringBootTest.WebEnvironment.RANDOM_PORT,classes = {Application.class}) +public class RoleGroupServiceTest{ + + protected Logger logger = LoggerFactory.getLogger(RoleGroupServiceTest.class); + + @Autowired + private RoleGroupService roleGroupService; + @Autowired + private TestRestTemplate restTemplate; + + /** + * @Description:测试新增角色组 接口 + */ + @Test + public void testAdd(){ + //todo test code + RoleGroupVO vo = new RoleGroupVO(); + + ResultDto resultDto = restTemplate.postForEntity("/roleGroup/add",vo, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:测试修改角色组 + */ + @Test + public void testUpdate(){ + //todo test code + RoleGroupVO vo = new RoleGroupVO(); + ResultDto resultDto = restTemplate.postForEntity("/roleGroup/update",vo, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:测试删除根据id删除角色组 + */ + @Test + public void testDelete(){ + //todo test code + long id = 1L; + ResultDto resultDto = restTemplate.postForEntity("/roleGroup/delete",id, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:但是根据ID获取角色组单条记录 + */ + @Test + public void testGetById(){ + //todo test code + ResultDataDto resultDataDto = restTemplate.getForEntity("/roleGroup/get?id=1",ResultDataDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDataDto)); + } + + /** + * @Description:测试分页获取角色组记录 + */ + @Test + public void getPage(){ + //todo test code + } + + /** + * @Description:测试禁用角色组状态 + */ + @Test + public void testDisable(){ + //todo test code + } + /** + * @Description:测试启用角色组状态 + */ + @Test + public void testEnable(){ + //todo test code + } +} diff --git a/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/RoleServiceTest.java b/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/RoleServiceTest.java new file mode 100644 index 0000000000000000000000000000000000000000..c78469a6d2ffdd7ff0a227464b711577d33933ce --- /dev/null +++ b/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/RoleServiceTest.java @@ -0,0 +1,107 @@ +package com.coderman.infosys.auth.service.test; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.infosys.auth.service.RoleService; +import com.coderman.infosys.auth.vo.RoleVO; +import com.coderman.infosys.auth.Application; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.utils.response.ResultDto; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.alibaba.fastjson.JSON; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.test.context.junit4.SpringRunner; + +/** +* @Description:角色表单元测试 +* @Author:shenshuai +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@RunWith(SpringRunner.class) +@SpringBootTest(webEnvironment= SpringBootTest.WebEnvironment.RANDOM_PORT,classes = {Application.class}) +public class RoleServiceTest{ + + protected Logger logger = LoggerFactory.getLogger(RoleServiceTest.class); + + @Autowired + private RoleService roleService; + @Autowired + private TestRestTemplate restTemplate; + + /** + * @Description:测试新增角色表 接口 + */ + @Test + public void testAdd(){ + //todo test code + RoleVO vo = new RoleVO(); + + ResultDto resultDto = restTemplate.postForEntity("/role/add",vo, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:测试修改角色表 + */ + @Test + public void testUpdate(){ + //todo test code + RoleVO vo = new RoleVO(); + ResultDto resultDto = restTemplate.postForEntity("/role/update",vo, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:测试删除根据id删除角色表 + */ + @Test + public void testDelete(){ + //todo test code + long id = 1L; + ResultDto resultDto = restTemplate.postForEntity("/role/delete",id, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:但是根据ID获取角色表单条记录 + */ + @Test + public void testGetById(){ + //todo test code + ResultDataDto resultDataDto = restTemplate.getForEntity("/role/get?id=1",ResultDataDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDataDto)); + } + + /** + * @Description:测试分页获取角色表记录 + */ + @Test + public void getPage(){ + //todo test code + } + + /** + * @Description:测试禁用角色表状态 + */ + @Test + public void testDisable(){ + //todo test code + } + /** + * @Description:测试启用角色表状态 + */ + @Test + public void testEnable(){ + //todo test code + } +} diff --git a/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/StudentServiceTest.java b/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/StudentServiceTest.java new file mode 100644 index 0000000000000000000000000000000000000000..6979ce0c78764c44a9b6f96057f9562156d23824 --- /dev/null +++ b/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/StudentServiceTest.java @@ -0,0 +1,107 @@ +package com.coderman.infosys.auth.service.test; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.infosys.auth.service.StudentService; +import com.coderman.infosys.auth.vo.StudentVO; +import com.coderman.infosys.auth.Application; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.utils.response.ResultDto; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.alibaba.fastjson.JSON; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.test.context.junit4.SpringRunner; + +/** +* @Description:单元测试 +* @Author:shenshuai +* @CreateTime:2021-10-27 11:12:40 +* @version v1.0 +*/ +@RunWith(SpringRunner.class) +@SpringBootTest(webEnvironment= SpringBootTest.WebEnvironment.RANDOM_PORT,classes = {Application.class}) +public class StudentServiceTest{ + + protected Logger logger = LoggerFactory.getLogger(StudentServiceTest.class); + + @Autowired + private StudentService studentService; + @Autowired + private TestRestTemplate restTemplate; + + /** + * @Description:测试新增 接口 + */ + @Test + public void testAdd(){ + //todo test code + StudentVO vo = new StudentVO(); + + ResultDto resultDto = restTemplate.postForEntity("/student/add",vo, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:测试修改 + */ + @Test + public void testUpdate(){ + //todo test code + StudentVO vo = new StudentVO(); + ResultDto resultDto = restTemplate.postForEntity("/student/update",vo, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:测试删除根据id删除 + */ + @Test + public void testDelete(){ + //todo test code + long id = 1L; + ResultDto resultDto = restTemplate.postForEntity("/student/delete",id, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:但是根据ID获取单条记录 + */ + @Test + public void testGetById(){ + //todo test code + ResultDataDto resultDataDto = restTemplate.getForEntity("/student/get?id=1",ResultDataDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDataDto)); + } + + /** + * @Description:测试分页获取记录 + */ + @Test + public void getPage(){ + //todo test code + } + + /** + * @Description:测试禁用状态 + */ + @Test + public void testDisable(){ + //todo test code + } + /** + * @Description:测试启用状态 + */ + @Test + public void testEnable(){ + //todo test code + } +} diff --git a/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/SystemAuthorityServiceTest.java b/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/SystemAuthorityServiceTest.java new file mode 100644 index 0000000000000000000000000000000000000000..cdf489d5317b3181221f2d7cb04456f3f15f6f26 --- /dev/null +++ b/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/SystemAuthorityServiceTest.java @@ -0,0 +1,107 @@ +package com.coderman.infosys.auth.service.test; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.infosys.auth.service.SystemAuthorityService; +import com.coderman.infosys.auth.vo.SystemAuthorityVO; +import com.coderman.infosys.auth.Application; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.utils.response.ResultDto; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.alibaba.fastjson.JSON; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.test.context.junit4.SpringRunner; + +/** +* @Description:系统菜单权限表单元测试 +* @Author:shenshuai +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@RunWith(SpringRunner.class) +@SpringBootTest(webEnvironment= SpringBootTest.WebEnvironment.RANDOM_PORT,classes = {Application.class}) +public class SystemAuthorityServiceTest{ + + protected Logger logger = LoggerFactory.getLogger(SystemAuthorityServiceTest.class); + + @Autowired + private SystemAuthorityService systemAuthorityService; + @Autowired + private TestRestTemplate restTemplate; + + /** + * @Description:测试新增系统菜单权限表 接口 + */ + @Test + public void testAdd(){ + //todo test code + SystemAuthorityVO vo = new SystemAuthorityVO(); + + ResultDto resultDto = restTemplate.postForEntity("/systemAuthority/add",vo, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:测试修改系统菜单权限表 + */ + @Test + public void testUpdate(){ + //todo test code + SystemAuthorityVO vo = new SystemAuthorityVO(); + ResultDto resultDto = restTemplate.postForEntity("/systemAuthority/update",vo, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:测试删除根据id删除系统菜单权限表 + */ + @Test + public void testDelete(){ + //todo test code + long id = 1L; + ResultDto resultDto = restTemplate.postForEntity("/systemAuthority/delete",id, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:但是根据ID获取系统菜单权限表单条记录 + */ + @Test + public void testGetById(){ + //todo test code + ResultDataDto resultDataDto = restTemplate.getForEntity("/systemAuthority/get?id=1",ResultDataDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDataDto)); + } + + /** + * @Description:测试分页获取系统菜单权限表记录 + */ + @Test + public void getPage(){ + //todo test code + } + + /** + * @Description:测试禁用系统菜单权限表状态 + */ + @Test + public void testDisable(){ + //todo test code + } + /** + * @Description:测试启用系统菜单权限表状态 + */ + @Test + public void testEnable(){ + //todo test code + } +} diff --git a/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/SystemServiceTest.java b/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/SystemServiceTest.java new file mode 100644 index 0000000000000000000000000000000000000000..7a691614bcc9a9b31a2adee5c84f89e08f6d0382 --- /dev/null +++ b/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/SystemServiceTest.java @@ -0,0 +1,107 @@ +package com.coderman.infosys.auth.service.test; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.infosys.auth.service.SystemService; +import com.coderman.infosys.auth.vo.SystemVO; +import com.coderman.infosys.auth.Application; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.utils.response.ResultDto; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.alibaba.fastjson.JSON; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.test.context.junit4.SpringRunner; + +/** +* @Description:系统表单元测试 +* @Author:shenshuai +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@RunWith(SpringRunner.class) +@SpringBootTest(webEnvironment= SpringBootTest.WebEnvironment.RANDOM_PORT,classes = {Application.class}) +public class SystemServiceTest{ + + protected Logger logger = LoggerFactory.getLogger(SystemServiceTest.class); + + @Autowired + private SystemService systemService; + @Autowired + private TestRestTemplate restTemplate; + + /** + * @Description:测试新增系统表 接口 + */ + @Test + public void testAdd(){ + //todo test code + SystemVO vo = new SystemVO(); + + ResultDto resultDto = restTemplate.postForEntity("/system/add",vo, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:测试修改系统表 + */ + @Test + public void testUpdate(){ + //todo test code + SystemVO vo = new SystemVO(); + ResultDto resultDto = restTemplate.postForEntity("/system/update",vo, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:测试删除根据id删除系统表 + */ + @Test + public void testDelete(){ + //todo test code + long id = 1L; + ResultDto resultDto = restTemplate.postForEntity("/system/delete",id, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:但是根据ID获取系统表单条记录 + */ + @Test + public void testGetById(){ + //todo test code + ResultDataDto resultDataDto = restTemplate.getForEntity("/system/get?id=1",ResultDataDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDataDto)); + } + + /** + * @Description:测试分页获取系统表记录 + */ + @Test + public void getPage(){ + //todo test code + } + + /** + * @Description:测试禁用系统表状态 + */ + @Test + public void testDisable(){ + //todo test code + } + /** + * @Description:测试启用系统表状态 + */ + @Test + public void testEnable(){ + //todo test code + } +} diff --git a/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/TeacherServiceTest.java b/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/TeacherServiceTest.java new file mode 100644 index 0000000000000000000000000000000000000000..1a592a9ba01095122311364e78838a734362450e --- /dev/null +++ b/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/TeacherServiceTest.java @@ -0,0 +1,107 @@ +package com.coderman.infosys.auth.service.test; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.infosys.auth.service.TeacherService; +import com.coderman.infosys.auth.vo.TeacherVO; +import com.coderman.infosys.auth.Application; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.utils.response.ResultDto; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.alibaba.fastjson.JSON; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.test.context.junit4.SpringRunner; + +/** +* @Description:单元测试 +* @Author:shenshuai +* @CreateTime:2021-10-27 11:12:40 +* @version v1.0 +*/ +@RunWith(SpringRunner.class) +@SpringBootTest(webEnvironment= SpringBootTest.WebEnvironment.RANDOM_PORT,classes = {Application.class}) +public class TeacherServiceTest{ + + protected Logger logger = LoggerFactory.getLogger(TeacherServiceTest.class); + + @Autowired + private TeacherService teacherService; + @Autowired + private TestRestTemplate restTemplate; + + /** + * @Description:测试新增 接口 + */ + @Test + public void testAdd(){ + //todo test code + TeacherVO vo = new TeacherVO(); + + ResultDto resultDto = restTemplate.postForEntity("/teacher/add",vo, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:测试修改 + */ + @Test + public void testUpdate(){ + //todo test code + TeacherVO vo = new TeacherVO(); + ResultDto resultDto = restTemplate.postForEntity("/teacher/update",vo, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:测试删除根据id删除 + */ + @Test + public void testDelete(){ + //todo test code + long id = 1L; + ResultDto resultDto = restTemplate.postForEntity("/teacher/delete",id, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:但是根据ID获取单条记录 + */ + @Test + public void testGetById(){ + //todo test code + ResultDataDto resultDataDto = restTemplate.getForEntity("/teacher/get?id=1",ResultDataDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDataDto)); + } + + /** + * @Description:测试分页获取记录 + */ + @Test + public void getPage(){ + //todo test code + } + + /** + * @Description:测试禁用状态 + */ + @Test + public void testDisable(){ + //todo test code + } + /** + * @Description:测试启用状态 + */ + @Test + public void testEnable(){ + //todo test code + } +} diff --git a/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/UserGroupServiceTest.java b/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/UserGroupServiceTest.java new file mode 100644 index 0000000000000000000000000000000000000000..e6c5bcbf6b47d23056387e7d0a750173b9da36da --- /dev/null +++ b/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/UserGroupServiceTest.java @@ -0,0 +1,107 @@ +package com.coderman.infosys.auth.service.test; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.infosys.auth.service.UserGroupService; +import com.coderman.infosys.auth.vo.UserGroupVO; +import com.coderman.infosys.auth.Application; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.utils.response.ResultDto; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.alibaba.fastjson.JSON; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.test.context.junit4.SpringRunner; + +/** +* @Description:用户组单元测试 +* @Author:shenshuai +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@RunWith(SpringRunner.class) +@SpringBootTest(webEnvironment= SpringBootTest.WebEnvironment.RANDOM_PORT,classes = {Application.class}) +public class UserGroupServiceTest{ + + protected Logger logger = LoggerFactory.getLogger(UserGroupServiceTest.class); + + @Autowired + private UserGroupService userGroupService; + @Autowired + private TestRestTemplate restTemplate; + + /** + * @Description:测试新增用户组 接口 + */ + @Test + public void testAdd(){ + //todo test code + UserGroupVO vo = new UserGroupVO(); + + ResultDto resultDto = restTemplate.postForEntity("/userGroup/add",vo, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:测试修改用户组 + */ + @Test + public void testUpdate(){ + //todo test code + UserGroupVO vo = new UserGroupVO(); + ResultDto resultDto = restTemplate.postForEntity("/userGroup/update",vo, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:测试删除根据id删除用户组 + */ + @Test + public void testDelete(){ + //todo test code + long id = 1L; + ResultDto resultDto = restTemplate.postForEntity("/userGroup/delete",id, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:但是根据ID获取用户组单条记录 + */ + @Test + public void testGetById(){ + //todo test code + ResultDataDto resultDataDto = restTemplate.getForEntity("/userGroup/get?id=1",ResultDataDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDataDto)); + } + + /** + * @Description:测试分页获取用户组记录 + */ + @Test + public void getPage(){ + //todo test code + } + + /** + * @Description:测试禁用用户组状态 + */ + @Test + public void testDisable(){ + //todo test code + } + /** + * @Description:测试启用用户组状态 + */ + @Test + public void testEnable(){ + //todo test code + } +} diff --git a/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/UserRoleMappingServiceTest.java b/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/UserRoleMappingServiceTest.java new file mode 100644 index 0000000000000000000000000000000000000000..1005d510023e7bfb576ae55489a77a8a6c7e4181 --- /dev/null +++ b/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/UserRoleMappingServiceTest.java @@ -0,0 +1,107 @@ +package com.coderman.infosys.auth.service.test; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.coderman.infosys.auth.service.UserRoleMappingService; +import com.coderman.infosys.auth.vo.UserRoleMappingVO; +import com.coderman.infosys.auth.Application; + +import com.coderman.utils.response.ResultDataDto; +import com.coderman.utils.response.ResultDto; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.alibaba.fastjson.JSON; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.test.context.junit4.SpringRunner; + +/** +* @Description:用户角色关联表单元测试 +* @Author:shenshuai +* @CreateTime:2021-11-06 23:38:07 +* @version v1.0 +*/ +@RunWith(SpringRunner.class) +@SpringBootTest(webEnvironment= SpringBootTest.WebEnvironment.RANDOM_PORT,classes = {Application.class}) +public class UserRoleMappingServiceTest{ + + protected Logger logger = LoggerFactory.getLogger(UserRoleMappingServiceTest.class); + + @Autowired + private UserRoleMappingService userRoleMappingService; + @Autowired + private TestRestTemplate restTemplate; + + /** + * @Description:测试新增用户角色关联表 接口 + */ + @Test + public void testAdd(){ + //todo test code + UserRoleMappingVO vo = new UserRoleMappingVO(); + + ResultDto resultDto = restTemplate.postForEntity("/userRoleMapping/add",vo, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:测试修改用户角色关联表 + */ + @Test + public void testUpdate(){ + //todo test code + UserRoleMappingVO vo = new UserRoleMappingVO(); + ResultDto resultDto = restTemplate.postForEntity("/userRoleMapping/update",vo, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:测试删除根据id删除用户角色关联表 + */ + @Test + public void testDelete(){ + //todo test code + long id = 1L; + ResultDto resultDto = restTemplate.postForEntity("/userRoleMapping/delete",id, ResultDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDto)); + } + + /** + * @Description:但是根据ID获取用户角色关联表单条记录 + */ + @Test + public void testGetById(){ + //todo test code + ResultDataDto resultDataDto = restTemplate.getForEntity("/userRoleMapping/get?id=1",ResultDataDto.class).getBody(); + System.out.println(JSON.toJSONString(resultDataDto)); + } + + /** + * @Description:测试分页获取用户角色关联表记录 + */ + @Test + public void getPage(){ + //todo test code + } + + /** + * @Description:测试禁用用户角色关联表状态 + */ + @Test + public void testDisable(){ + //todo test code + } + /** + * @Description:测试启用用户角色关联表状态 + */ + @Test + public void testEnable(){ + //todo test code + } +} diff --git a/todoList b/todoList index 22d3d70214e445178e99200fc4c87abdd42ab194..d1a664f9e7a85ec79c3a181d6e37ed1692862909 100644 --- a/todoList +++ b/todoList @@ -15,12 +15,54 @@ 10. verison 1.2.1-beta 变更(todo) - 1.支持默认带工具类SpringEventPublisher帮助事件发布与消费异步化 - 2.支持事件发布异步化的代码绘制(产生事件->发布->消费事件) - 3.重构读取plantUML文件的相关逻辑降低复杂度 - 4.重新梳理读取plantUML文件的相关路径,优化为按项目维度分别存放 - 5.支持复杂场景下的代码绘制能力,进行精细化控制(如listbo,listvo的转换,代码参数动态绘制引用等) - 6.支持Page对象生成到代码里 - 7.支持通过时序图的调用方法列表补充构建接口和类的方法，辅助完善业务调用流程(如xxMapper.getByCode不在XXMapper里，则通过时序图里的信息进行动态补充) - 8.根据动态调用方法绘制内容将return body也进行动态化绘制 - 9.增加对基础设施层-适配层的调用绘制 \ No newline at end of file + 1.支持默认带工具类SpringEventPublisher帮助事件发布与消费异步化(down) + 2.重构读取plantUML文件的相关逻辑降低复杂度(down) + 3.重新梳理读取plantUML文件的相关路径,优化为按项目维度分别存放(down) + 4.支持复杂场景下的代码绘制能力,进行精细化控制(如listbo,listvo的转换,代码参数动态绘制引用等)(down) + 5.支持分页PageVO,PageDTO,PageBO生成到接口方法里(down) + 6.支持通过时序图的调用方法列表补充构建接口和类的方法，辅助完善业务调用流程(如xxMapper.getByCode不在XXMapper里，则通过时序图里的信息进行动态补充)(down) + 7.根据动态调用方法绘制内容将return body也进行动态化绘制(down) + 8.增加适配模块解除对codemaker本身的定制化类的依赖(ResultDto,ResultDataDto,PageVO,PageDTO)，可辅助二次开发增加企业适配能力(down) + 9.基于数据库生成模式下的底层增加分页page查询方法和count查询方法(down) + 10.重构app层下的springboot,cola,dubbo写文件实现逻辑，降低复杂度(down) + 11.重构service层下的模版方法模式和建造者模式代码逻辑，降低复杂度(down) + 12.增加mapper接口和controller接口的参数校验注解(要引用的注解类可先写死，后续优化)(down) + 13.增加时序图调用方法参数动态推导功能(如xxxGataWay.getBySystemName没有在领域文档中定义，在时序图中有定义但是没有写明参数，这里可以做动态推导) + 14.补充bo关联表时缺失的主键id(down) + 15.增加!字符屏蔽不需要解析的planUML文档内容,便于调试代码生成(down) + + +1.2.2 版本(主要支持配置化，插件化，模块化架构,去除对coderutils的完全依赖) + 1.支持按领域上下文和request,response分包策略，达到动态分包的效果 + 2.增加接口按服务维度持久化功能,基于文件(辅助对上下游适配层进行方法生成) + 3.重构包动态引用模块，支持自定义引用包配置化,配置文件配置,支持插件化架构 + 4.支持从plantuml领域文档中导出接口文档 + 5.支持动态query查询对象完善动态查询逻辑 + 6.增加openfeign接口生成支持,进而支持springcloud框架体系 + 7.增加自定义class类模版，注册其他外部jar包类或者公共业务类，如PageBO,XxxUtils,MybatisConfig或者CommonService等 + 8.支持业务领域动词注册功能，扩展读写场景模式校验 ReadWriteTypeEnum + 9.增加cache类代码元素 + 10.增加create,response bo-->dto/vo的关联类型推导，辅助完善dto/vo模型 + 11.支持事件发布异步化的代码绘制(产生事件->发布->消费事件) + +1.3.0 版本(进行一次整体的架构升级) + + 1.支持在调用时序中增加自定义流程控制语句如if else,fori,fore,fors,filter,mappingby,groupby + 2.支持可配置化的多种入参校验模式策略 + 3.支持在plantuml领域文档中增加方法注解并解析生成到项目代码里(transactional,lock,aop注解等) + 4.增加对基础设施层-下游适配层的调用绘制(springboot,dubbo) + 5.降低对数据库链接的强依赖，以数据库e-r图或者excel表作为数据库元数据信息的来源 + 6.支持 + 基于数据库模式， + 基于e-r图模式， + 基于领域文档模式， + 基于领域文档+数据库模式， + 基于领域文档+数据库/e-r图模式+调用时序文档模式 + +1.4 平台化,是否具有平台化的能力 + 1.持久层存储 + 2.页面交互设计 + + + + diff --git "a/\345\212\250\346\200\201\350\260\203\347\224\250\346\212\200\346\234\257\346\226\207\346\241\243" "b/\345\212\250\346\200\201\350\260\203\347\224\250\346\212\200\346\234\257\346\226\207\346\241\243" index 7c84101489da2813ca86d2f7fb2884b23b3894b5..ee49feea306017eb437be926bccea891b08dfb96 100644 --- "a/\345\212\250\346\200\201\350\260\203\347\224\250\346\212\200\346\234\257\346\226\207\346\241\243" +++ "b/\345\212\250\346\200\201\350\260\203\347\224\250\346\212\200\346\234\257\346\226\207\346\241\243" @@ -33,3 +33,4 @@ 8.应用层(app_http)->应用层(app_rpc)-->是否需要？ 读:被调用方返回值转:bo->vo 写:调用方参数转:vo->bo,bo->cmd,vo->cmd,cmd->event,event->msgbody +