diff --git a/CHANGELIST.md b/CHANGELIST.md new file mode 100644 index 0000000000000000000000000000000000000000..168520231a429eeb8129e7dfbe88be1bc061aa0c --- /dev/null +++ b/CHANGELIST.md @@ -0,0 +1,130 @@ +# codeMaker + +## 版本变更说明 + +### V1.0.0 +1. 实现codermaker-core代码生成功能 +2. 实现数据库表sql生成功能 + +### V1.0.1 +1. 实现数据库表e-r图生成功能 + +### V1.0.2 +1. 实现代码生成极速模式 + +### V1.0.3 +1. 重构代码生成逻辑核心服务,引入应用层，支持多应用类型代码生成架构 +2. 支持一套api操作接口生成dubbo,springboot应用代码 +3. 增加dubbo应用的代码模板，支持maven多模块 +4. 引入bo,facade,facadeimpl,aop,dto等代码类生成模板 +5. dubbo项目支持facade层和service层双服务层业务架构 +6. application.properties增加application.type属性，值为springboot,dubbo,cola +7. 增加projecttemplate-dubbo.properties属性文件，支持dubbo项目代码生成 +8. 原有配置文件projecttemplate.properties改名为projecttemplate-springboot.properties +9. 修复若干其他bug + +### V1.0.4 +1. 基于plantUML文档生成代码，基于ddd思想和模式生成模块级的代码内容 +2. 增加makeddd接口，支持生成dynamicddd模块的代码 +3. 引入支持ddd代码生成的配置(projecttemplate-dynamicddd.properties)和代码模板(template/dynamicddd) +4. codemaker-core模块resources目录增加ddd-plantuml目录存放plantUML类图 +5. 支持ddd的一些模式代码生成：实体模式,值对象模式,聚合根模式,工厂模式,仓库模式,防腐层模式,服务模式,模块模式,CQE模式,领域网关 +6. 产出部分公共代码生成服务方法 +7. 优化代码生成核心链路代码模型，针对ddd代码生成做了分层处理 +8. 修复若干其他bug + +### V1.1.0 +1. 支持cola应用架构代码生成,增加cola应用的template代码模板 +2. 增加基于plantuml类图的领域服务代码生成接口 + + /getproject/valueobject + /getproject/msgbody + /getproject/gataway + /getproject/acladapter + /getproject/command + /getproject/executor + /getproject/factory + /getproject/dtoboconvert + /getproject/voboconvert + /getproject/doboconvert +3. 精简不同应用框架的代码生成配置 + + 在每个应用框架配置下增加dubbo.domain.plantuml配置项,配置plantuml类图文件名称,支持基于类图-ddd的代码生成 + 如果不配置则不能借助plantuml类图生成基于领域服务ddd的代码，而是生成基于数据库表的常规代码 + 去除以下三个配置，集中到application.properties文件中 + *.global.package + *.global.author + *.global.applicationName + +4. 在springboot,cola,dubbo的代码模板目录下增加ddd元素的tempalte代码模板 +5. 将dynamic-ddd的代码生成服务整合到springboot,cola,dubbo的代码生成服务中，支持基于DDD思想的代码生成 +6. 扩展plantuml中类图标签,基于BO派生多个代码生成对象（vo,dto,facade,doboconvert,controller,voboconvert,dtoboconvert） +7. 整合底层代码支持一套api,一套服务支撑springboot,cola,dubbo应用级代码生成和dynamic-ddd模块级代码生成 +8. 修复多个兼容性bug +9. 整体上支持基于数据库表结构的代码生成和基于plantUML类图文档的代码生成 + + +### V0.0.2 +1. 本次版本新增codemaker-dberparse模块，支持plantuml er图解析为sql ddl create语句，已集成到codemaker-dbops + 模块中。 + + +### V1.2.0-alpha +1. 支持event模型生成, +2. 支持mqconsumer,applistener,mqproducer,mqhandler生成 +3. 屏蔽扩展类dto带有bo属性的字段 +4. 增加对plantuml domain类图内容的校验，比如重复字段和重复方法 +5. 扩展动态ddd的代码生成能力，比如一个BO下出现多个facade,controller的接口 +6. 提高plantuml内容的解析兼容性和稳定性 +7. 支持动态链路调用plantuml-调用链路图解析 +8. 支持读写分离的dubbo,restController接口调用 +9. 支持将领域值对象枚举类暴露到dubbo client端 +10. 优化convert代码生成 +11. gatawayimpl 与 repositoryimpl分开生成 +12. 优化包路径生成模式 +13. 优化访问描述符和代码注释 +14. 读取plantuml文件对于方法的解析将方法参数独立解析出来 + + +### V1.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.2.2 版本(主要支持配置化，组件插件化，模块化架构,去除对coderutils的强依赖) +1. 支持按领域上下文和request,response分包策略，达到动态分包的效果(可全部平铺也可以按上下文分子包) +2. 增加接口按服务维度持久化功能,基于文件(辅助对上下游适配层进行方法生成)，api文件生成-->集中式(这里持久化可能不是最优方案，已通过组件化架构升级解决) +3. 重构包动态引用模块，支持自定义引用包配置化,配置文件配置,支持组件插件化架构(已通过组件化架构升级解决) +4. 支持从plantuml领域文档中导出接口文档 +5. 支持动态query查询对象完善动态查询逻辑 +6. 增加自定义class类模版组件类，注册其他外部jar包类或者公共业务类，如PageBO,XxxUtils,MybatisConfig或者CommonService等(已通过组件化架构升级解决) +7. 支持业务领域DSL统一语言(读写操作)注册功能，扩展读写场景模式校验 ReadWriteTypeEnum-->基于自定义配置 +8. 增加cache类代码元素生成 +9. 支持事件发布异步化的代码绘制(产生事件->发布->消费事件) +10. 增加多个配置项支持组件插件化-->具体配置项 +11. 去除IClazzAdapter包模块，升级为plantUML文档依赖的可配置包 +12. 去除对coderman-utils包的强依赖,将其通过组件化架构改为弱依赖 +13. 通过派生类上下文对象提前初始化重构类转换工厂，减少冗余代码 +14. 对相对独立的工具类代码进行组件化管理，按场景需要进行动态化配置 +15. 删除相对独立的工具类代码生成逻辑，根据16条整体改善 +16. 增加cola应用的cola-feign-api模块，支持spring cloud 远程调用 +17. 增加codemaker-springcloud应用，来专门支持springcloud技术栈 +18. 增加feign类代码元素，与dubbo类似，提供api接口和参数并提供动态生成能力 +19. 重构codeMaker模块,增加codemaker-api,codemaker-apiImpl模块开放低代码设计模型,组件扫描,代码元素装饰接口能力 +20. 根据20条的改动整体支持组件化和提供二次开发能力 + diff --git a/COMPOENTREGIST.md b/COMPOENTREGIST.md new file mode 100644 index 0000000000000000000000000000000000000000..76202353b60827f342be15e86160c5951fbc2a5d --- /dev/null +++ b/COMPOENTREGIST.md @@ -0,0 +1,97 @@ +# 组件注册流程 +## 说明 +本次版本迭代主要涉及组件化架构升级，因此这里需要说明一下如何注册并引入组件的过程，以下是操作过程。因为时间的关系没有用流程图来表达，后续补充上。 + +## 注册步骤 +### 注册框架级组件(dubbo) +当前codemaker-core默认的框架级组件支持dubbo和spring-web，开发者可以基于此进行二次开发来适配自己的技术栈 + +1. 在codemaker-core/src/main/resources/component目录下新建组件名称目录如dubbo +2. 创建组件属性文件如dubbo.properties文件 +3. 文件内容如下： +``` +#Generated by Maven +#Fri Sep 20 00:50:48 CST 2019 +version=2.7.3 +groupId=org.apache.dubbo +artifactId=dubbo +packageName=org.apache.dubbo.config.annotation +compSite=https://dubbo.apache.org/zh/ +compDesc=Apache Dubbo是一款分布式RPC框架(就是组件描述) +annotation1=Service +annotation2=Reference +``` +4. 由于是框架级组件，codeMaker对框架级组件的定位为应用工程生成依赖的底座，所以需要在 +codemaker-apiImpl工程下实现对应的组件扫描和代码装饰过程，参考dubbo实现 + +5. 在codemaker-core的application.properties文件中配置框架级扫描和装饰bean实现,已有默认实现 + +6. 在对应的projecttemplate-dubbo.properties文件或者projecttemplate-cola.properties文件 +配置组件依赖 + +### 注册应用工具包级组件(hutool-core或者infosysuser) +这里的hutool-core是工具类级别的封装jar包,infosysuser是infosysauth依赖的用户组件api + +1. 在codemaker-core/src/main/resources/component目录下新建组件名称目录如hutool-core或者infosysuser + +2. 创建对应的组件属性文件如hutool-core.properties文件 +3. 文件内容如下： +``` +#Generated by Maven +#Fri Sep 20 00:50:48 CST 2019 +version=5.3.10 +groupId=cn.hutool +artifactId=hutool-core +serviceName=hutool +packageName=cn.hutool.core.map +compType=tool +compSite=https://www.hutool.cn/ +compDesc=一款工具包 +``` +4. 这里需要说明的是对于应用级组件来说不需要自己实现组件扫描和装饰,对于应用级组件的定位是在渲染调用时序图的时候会扫描依赖到的组件服务 +并自动引入，独立工具类或者封装工具类组件也一样。当然如果需要这个应用组件对某个代码元素做统一的装饰 +比如mybatis-plus的数据模型注解，swagger-api注解等等，那可以将这个组件定位为框架级组件。 + +### 注册独立工具类或者封装类级组件(AppEventPublisher) + +这里的独立工具类组件或者封装类组件其实比较广泛，可以理解为只要是工具类或者基于某框架封装的工具操作类都可以注册 +区别就是这里的独立工具类不是一个jar包，而上面的组件是一个jar或者多个jar. + +1. 在codemaker-core/src/main/resources/component目录下找到singleClass文件夹 +2. 创建对应的组件属性文件如AppEventPublisher.properties文件 +3. 文件内容如下： +``` +packageName=${package}.domain.support.utils +classType=class +method1=void publish(T t) +``` +4. 由于独立类组件比较多也比较丰富，这里就单独列了一个singleClass文件夹来存放所有的独立类配置，因此独立类配置在 +codeMaker中是自动注册的不需要开发者显示注册，后续可以在各自的组件文件夹中存放基于本组件封装的工具类。 + +### 把独立工具类或者封装的工具类复制到项目里(如AppEventPublisher) + +这里的独立工具类或者封装的工具类与上面的不同之处在于项目可能只会引用但是不会复制到自己项目里，另外一种就是我既需要 +引用也需要复制。比如项目初始化的时候需要依赖很多自己封装的或者别的项目里有的工具类，用着顺手。 + +那这种场景就需要把独立类注册为ftl模板，注册步骤如下： +1. 在codemaker-core/src/main/resources/template目录下找到singleClass文件夹 +2. 创建对应的独立工具类ftl文件模板，如AppEventPublisher.ftl +3. 将独立工具类整体内容复制到文件模板中 +4. 修改独立类的所属包名,如(package ${package}.domain.support.utils) +5. 在对应的projecttemplate-applicationType.properties配置文件中配置需要初始化的组件(参考配置格式) + + +### 在调用过程中显示注册引用包(如JDK的常用类) + +由于codeMaker在使用plantUMl进行绘制的时候有些场景需要依赖JDK等封装的类，做包引用，因此这里做了一个配置文件 +是codemaker-core/src/main/resources/class-import.properties文件 +这个文件主要用于进行快速的类-包引用，内容如下： +``` +ResultDataDto=com.coderman.utils.response.ResultDataDto +ResultDto=com.coderman.utils.response.ResultDto +PageDTO=com.coderman.utils.response.PageDTO +PageVO=com.coderman.utils.response.PageVO +``` +上面的包内容也可以是JDK的其他工具类如LinkedList,当plantUML中定义了特定的类需要引入的时候就可以借助这个方式，降低手动引入 +或者idea自动引入带来的潜在修改麻烦。 + diff --git a/CONFIG.md b/CONFIG.md new file mode 100644 index 0000000000000000000000000000000000000000..4a67e80e8e1fd182a5ca21868f3497db095bc74c --- /dev/null +++ b/CONFIG.md @@ -0,0 +1,244 @@ +# 天画-codeMaker 应用配置说明 + +## application.properties +codeMaker代码生成服务的核心配置 +``` +# FREEMARKER (FreeMarkerAutoConfiguration) +# 太多了,不是重点,忽略 +server.port=8099 +management.port=8073 + +# 跨域(需要集成到公司服务的可以配置) +endpoints.cors.allowed-origins=http://127.0.0.1:8083 +endpoints.cors.allowed-methods=GET,POST + +#-------------以下是生成代码相关的业务配置---------- +#数据库配置 +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +spring.datasource.url=jdbc:mysql://localhost:3306/school_manager?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=UTC +#生成的项目需要链接项目的mysql数据库 +spring.datasource.username= +spring.datasource.password= + +#配置.xml文件路径 +mybatis.config-locations=classpath:mybatis-config.xml +mybatis.mapper-locations=classpath:mapper/*.xml +#配置模型路径 +mybatis.type-aliases-package=com.coderman.codemaker.bean +spring.application.name=codemaker +#生成的应用类型，支持springboot,dubbo,cola,springcloud +application.type=dubbo + + +#目标应用根包名称 +application.global.package=com.coderman.infosys.auth +#作者 +application.global.author=shenshuai + +#接口方法返回声明需要依赖的包信息，适配实现 +application.global.package.adapterbean=defaultClazzWrapperImpl + +#组件化需要的maven repository本地路径,用来扫描依赖的组件jar包 +application.maven.repo.path=jar:file://C:\\.m2\\repository + +#代码生成需要的全局组件，框架中间件可以放到全局组件依赖配置里,类似于脚手架,或者自己封装的业务组件框架 +application.component.scan.config=dubbo,spring-web,openfeign + +#自定义的组件扫描bean,defaultCompScanService为codeMaker默认实现支持全局组件的配置，开发者可以参考进行自定义扫描组件实现替代掉默认的 +application.component.scan.bean=defaultCompScanService + +#自定义的组件装饰bean,defaultCompDecorateService默认实现支持全局组件的装饰，开发者可以参考进行自定义扫描组件实现替代掉默认的 +application.component.decorate.bean=defaultCompDecorateService + +``` + + +## projecttemplate-dubbo.properties +生成dubbo应用代码的配置 +``` +#数据库名称 +dubbo.global.dbName=school_manager +#目标工程输出目录，这里填写对应的工程的绝对路径 +dubbo.code.outpath.dubbo-common=E:\\workspace\\tianhua-workspace\\code-maker\\codemaker-dubbo\\dubbo-common +dubbo.code.outpath.dubbo-api=E:\\workspace\\tianhua-workspace\\code-maker\\codemaker-dubbo\\dubbo-api +dubbo.code.outpath.dubbo-core=E:\\workspace\\tianhua-workspace\\code-maker\\codemaker-dubbo\\dubbo-core +#应用服务的plantUML类图文件,不配置则走基于数据表的方式生成代码 +codemaker.domain.plantuml= + + +#是否构建api 文档，否则进行构建,默认构建 +dubbo.api.generator=true + +#是否需要根据该参数设置请求参数的最后一级包名为request,默认false +dubbo.subpackage.request=false + +#是否需要根据该参数设置相应参数的最后一级包名为response,默认false +dubbo.subpackage.response=false + + +#需要导入的组件列表，多个逗号分割 +dubbo.component.scan.config=apiresult,infosysuser,hutool-core + +#需要在领域文档和调用时序文档中识别的读操作统一语言 +dubbo.component.dsl.read=check + +#需要在领域文档和调用时序文档中识别的写操作统一语言 +dubbo.component.dsl.write=settle + + +#应用级组件中间件工具包的组件扫描bean配置 +dubbo.component.scan.beans=appCompScanService + +#应用级组件中间件工具包的组件装饰bean配置 +dubbo.component.decorate.beans=appCompDecorateService + +#应用级代码工具类注册，项目初始化时可以帮助初始化对应的工具类 +#后面生成代码的时候可以删掉工具类，只专注于生成业务代码 +#格式说明 eg:BaseEvent:core 前面是需要初始化的类，后面是这个类放到哪个模块下 +dubbo.component.init.clazz=BaseEvent:core,Application:core,SpringApplicationContext:core,AppEventPublisher:core + +``` + +## projecttemplate-springboot.properties +生成springboot应用代码的配置 +``` +#数据库名称 +codemaker.global.dbName=school_manager +#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=E:\\workspace\\tianhua-workspace\\code-maker\\codemaker-springboot +#应用服务的plantUML类图文件,不配置则走基于数据表的方式生成代码 +codemaker.domain.plantuml= + +``` + +## projecttemplate-dynamicddd.properties + +生成dynamicddd模块的代码配置 +``` +#目标工程根包名称 +dynamicddd.global.package=com.lightsnail.snailapp.usercrm +#作者 +dynamicddd.global.author=fanchunshuai + +#目标工程输出目录，这里填写对应的codemaker-dynamicddd工程的绝对路径 +dynamicddd.code.outpath=E:\\workspace\\tianhua-workspace\\code-maker\\codemaker-dynamicddd +#领域plantUML 类图 +dynamicddd.domain.plantuml=CommonAuth.puml +``` + +## projecttemplate-cola.properties + +生成cola应用的代码配置 +``` +#数据库名称 +cola.global.dbName=school_manager + +cola.global.applicationName=school-manager + +#目标工程输出目录，这里填写对应的工程的绝对路径 +cola.code.outpath.cola-adapter=E:\\workspace\\tianhua-workspace\\code-maker\\codemaker-cola\\cola-adapter +cola.code.outpath.cola-infrast=E:\\workspace\\tianhua-workspace\\code-maker\\codemaker-cola\\cola-infrast +cola.code.outpath.cola-app=E:\\workspace\\tianhua-workspace\\code-maker\\codemaker-cola\\cola-app +cola.code.outpath.cola-domain=E:\\workspace\\tianhua-workspace\\code-maker\\codemaker-cola\\cola-domain +cola.code.outpath.cola-client=E:\\workspace\\tianhua-workspace\\code-maker\\codemaker-cola\\cola-client + +#应用服务的plantUML类图文件,不配置则走基于数据表的方式生成代码 +cola.domain.plantuml= + +#是否构建api 文档，否则进行构建,默认构建 +cola.api.generator=true + +#需要导入的组件列表，多个逗号分割,适用于cola模块下依赖的业务组件包或者对外api接口包，或者cola项目本身已有的代码类,或者其他偏业务的工具类组件等等。 +#如要生成的项目会依赖 infosys-user 服务的api则在这里定义即可。 +cola.component.scan.config=apiresult,infosysuser,hutool-core + +#需要在领域文档和调用时序文档中识别的读操作统一语言 +cola.component.dsl.read=check + +#需要在领域文档和调用时序文档中识别的写操作统一语言 +cola.component.dsl.write=settle,apply + +#是否需要根据该参数设置请求参数的最后一级包名为request,默认false +cola.subpackage.request=true + +#是否需要根据该参数设置相应参数的最后一级包名为response,默认false +cola.subpackage.response=true + + + +#应用级组件中间件工具包的组件扫描bean配置 +cola.component.scan.beans=appCompScanService + +#应用级组件中间件工具包的组件装饰bean配置 +cola.component.decorate.beans=appCompDecorateService + +#应用级代码工具类注册，项目初始化时可以帮助初始化对应的工具类 +#后面生成代码的时候可以删掉工具类，只专注于生成业务代码 +#格式说明 eg:BaseEvent:core 前面是需要初始化的类，后面是这个类放到哪个模块下 +cola.component.init.clazz=BaseEvent:domain,Application:start,BaseController:adapter,SpringApplicationContext:domain,AppEventPublisher:domain + +``` + +## projecttemplate-springcloud.properties +生成springcloud应用代码的配置 + +生成cola应用的代码配置 +``` +#数据库名称 +springcloud.global.dbName=infosys_auth + +#项目名称 +springcloud.global.applicationName=infosys-auth + +#maven坐标-GAV +springcloud.pom.groupId=com.snail.school.manager +springcloud.pom.artifactId=schoolmanager-web +springcloud.pom.version=1.0.0.SNAPSHOT +#目标工程输出目录，这里填写对应的codemaker-web工程的绝对路径 +springcloud.code.feign-api=E:\\workspace\\tianhua-workspace\\code-maker\\codemaker-springcloud\\springcloud-api +springcloud.code.feign-provider=E:\\workspace\\tianhua-workspace\\code-maker\\codemaker-springcloud\\springcloud-provider + +#应用服务的plantUML类图文件,不配置则走基于数据表的方式生成代码 +springcloud.domain.plantuml=auth-domainV4-feign.puml +#springcloud.domain.plantuml=SchoolManager.puml + + +#是否构建api 文档，否则进行构建,默认构建 +springcloud.api.generator=true + +#需要导入的组件列表，多个逗号分割,适用于cola模块下依赖的业务组件包或者对外api接口包，或者cola项目本身已有的代码类,或者其他偏业务的工具类组件等等。 +#如要生成的项目会依赖 infosys-user 服务的api则在这里定义即可 +springcloud.component.scan.config=apiresult + + +#需要在领域文档和调用时序文档中识别的读操作统一语言 +springcloud.component.dsl.read=check + +#需要在领域文档和调用时序文档中识别的写操作统一语言 +springcloud.component.dsl.write=settle + +#是否需要根据该参数设置请求参数的最后一级包名为request,默认false +springcloud.subpackage.request=false + +#是否需要根据该参数设置相应参数的最后一级包名为response,默认false +springcloud.subpackage.response=false + + + +#应用级组件中间件工具包的组件扫描bean配置,如无特定技术栈，无需更换该组件 +springcloud.component.scan.beans=appCompScanService + + +#应用级组件中间件工具包的组件装饰bean配置,如无特定技术栈，无需更换该组件 +springcloud.component.decorate.beans=appCompDecorateService + + +#应用级代码工具类注册，项目初始化时可以帮助初始化对应的工具类 +#后面生成代码的时候可以删掉工具类，只专注于生成业务代码 +#格式说明 eg:BaseEvent:core 前面是需要初始化的类，后面是这个类放到哪个模块下 +springcloud.component.init.clazz=BaseEvent:provider,Application:provider,SpringApplicationContext:provider,AppEventPublisher:provider +``` \ No newline at end of file diff --git a/DDDPLANTUMLDOC.md b/DDDPLANTUMLDOC.md new file mode 100644 index 0000000000000000000000000000000000000000..b4dbc267eea674c2ec21aeec5631230e1df7d9da --- /dev/null +++ b/DDDPLANTUMLDOC.md @@ -0,0 +1,30 @@ +#基于PlantUML的领域文档使用说明 + +## 说明 +由于CodeMaker会依赖PLANTUML文档进行代码构建，所以开发者可以把PLANTUML文档 +当作代码绘制的蓝图或者画板,来构建代码元素和代码调用内容。 + +这里如果需要可视化文档的话建议安装一下相关idea或者eclipse插件,由于大型plantUML +文档可能会很大会比较占用内存,所以熟悉plantUML语法的话可以先在文本编辑器上编辑好再 +复制到plantUML文档中. + +在/ddd-plantuml/infosys-auth/auth-domain.puml等plantUML文件中 +只使用plantUML的一些少量关键字来构建,因为不是专门解析plantUML的工具,所以这里就自己做了解析,同时按照 +低代码的场景来在BO类中扩展了很多key在下面的列表中将重点介绍一些这些key的使用说明。 +## 扩展key使用说明 +#### tableKey +用来标示该BO(领域实体)关联的表名 +#### controllerKey +用来标示该BO扩展出来的controllerAPI,可以多个如读写分离 +#### dtoKeyList +用来标示该BO扩展出来的DTO +#### voKeyList +用来标示该BO扩展出来的VO +#### queryDtoKey +用来标示该BO扩展出来的查询DTO对象 +#### queryVoKey +用来标示该BO扩展出来的查询VO对象 +#### invokeFileKey +用来标示该BO对应的调用时序图文档,可以多个 +#### contextKey +用来标示BO或者接口所属的上下文,支持按上下文分包 diff --git a/MODULE.md b/MODULE.md new file mode 100644 index 0000000000000000000000000000000000000000..e1eac2df527beed654f249b954cf795e59ef6623 --- /dev/null +++ b/MODULE.md @@ -0,0 +1,89 @@ +# codeMaker + +## 模块说明 + +### 1. maven模块架构 +![image](doc/img/codeMaker模块包.png) + +### 2. 模块说明(浅红色部分) + +#### 2.1 codermaker-parent + +codeMaker项目核心模块 + +##### 2.1.1 codermaker-api +codeMaker对外开放的低代码设计模型和二次开发接口,主要是组件扫描和代码元素装饰 + +##### 2.1.2 codermaker-apiImpl +codeMaker对外开放的默认组件扫描和代码装饰实现,可以在这个模块里实现二次开发 + +##### 2.1.3 codermaker-core +codeMaker的核心逻辑,支持多模式，多场景，多架构的Java后端代码生成核心实现模块 + +#### 2.2 codermaker-dberparse +codermaker的组成套件 支持从plantUML文件中读取e-r数据库表结构图，构建sql DDDL + +#### 2.3 codermaker-dberPicture +codermaker的组成套件 支持导出目标数据库中的DDL模型到Plant UML文件中 + +#### 2.4 codermaker-dbops +codermaker的组成套件 数据库表结构运维工具,根据配置的sql字段内容生成单表或者多表或者分库分表的sql脚本 + + +### 3. 模块说明(浅蓝色部分) + +#### 3.1 codermaker-springboot + +基于springboot应用生成的代码会放在这里 + +#### 3.2 codermaker-dubbo + +基于dubbo应用框架生成的代码会放在这里 + +##### 3.2.1 dubbo-api + +dubbo应用的consumer接口声明子模块 + +##### 3.2.2 dubbo-common + +dubbo应用的持久化层子模块 + +##### 3.2.3 dubbo-core + +dubbo应用的provider实现层子模块 + +#### 3.3 codermaker-dynamicddd +基于plantUML类图+DDD思想生成的代码会放在这里,不依赖具体数据库, +存粹用来展示基于DDD的PlantUML建模文档生成的DDD代码是否符合预期 + +#### 3.4 codermaker-cola +基于cola应用框架生成的代码会放在这里 +##### 3.4.1 cola-client + +cola应用的rpc接口声明子模块 + +##### 3.4.2 cola-adapter + +cola应用的适配层子模块 + +##### 3.4.3 cola-app + +cola应用的应用层子模块 + +##### 3.4.4 cola-infrast + +cola应用的基础设施层子模块 + +##### 3.4.5 cola-domain + +cola应用的领域层子模块 + +##### 3.4.6 cola-start + +cola应用的启动子模块 + + +##### 3.4.7 cola-feign-api + +cola应用的springcloud支持feign调用模块 + diff --git a/README.md b/README.md index 131086857e1c8e6f0040009c2fb52da0c49e3cdf..8c566f0e142cfd8aba31f1d135fbbe63e6c8669a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# codeMaker +#天画-codeMaker #### 介绍 @@ -12,15 +12,13 @@ coderMaker 立足于低代码平台，致力于解决软件开发过程中的效 5. 为高并发,分布式,大数据等场景提供业务应用代码支持,辅助学习者方便快捷构建大量分布式微服务应用。 6. 支持多框架应用+动态ddd+动态调用方法绘制的Java代码生成平台 -#### 项目计划 -1. 参考todoList文件内容 -2. 参考changeList文件内容 #### 设计理念 1. 所建即所得，文档即代码 2. 数据库模型与领域模型同步支持 3. 不做任何脚手架,不依赖任何特定框架版本 4. 按开发者习惯支持多模式生成 +5. 兼容并蓄,在codemaker的组件化架构设计中一切业务组件，中间件，脚手架都是组件都是可配置可融入到代码生成流程的。 #### 功能列表 1. 提供数据库字段文本转sql脚本的能力 @@ -30,42 +28,70 @@ coderMaker 立足于低代码平台，致力于解决软件开发过程中的效 5. 提供基于plantuml类图的dynamic-ddd模块级的代码生成服务 6. 支持基于数据库表的代码生成和支持plantuml领域文档的代码生成服务 7. 支持基于数据库表+DDD+plantUML类图文档+plantUML调用时序文档的代码生成服务 -8. 支持可适配可拔插的组件化模块化代码生成(待架构升级) +8. 支持可适配可拔插的组件化模块化代码生成 #### 软件架构 -1. 整个项目分为多个工程模块 +##### 1. 工程模块架构 -codermaker-core:代码生成的核心模块 +![image](doc/img/codeMaker模块包.png) +1. 粉红色为codeMaker提供的平台能力工程 +2. 浅蓝色为生成代码架构的模板工程 -codermaker-dberPicture:根据数据库表结构或者按照指定数据接口生成对应数据模型e-r图(基于plantUML) +[模块详细说明](MODULE.md) -codermaker-dbops:数据库表结构运维工具,根据配置的sql字段内容生成单表或者多表或者分库分表的sql脚本 +##### 2. 架构图 + 1. v1版本 +![image](doc/img/天画-低代码平台(codeMaker).png) -codermaker-springboot:基于springboot应用生成的代码会放在这里 + 2. v2版本 +![image](doc/img/天画-低代码平台(codeMaker)-v3.png) -codemaker-dubbo:基于dubbo应用框架生成的代码会放在这里 - 1. dubbo-api:dubbo应用的consumer接口声明子模块 - 2. dubbo-common:dubbo应用的持久化层子模块 - 3. dubbo-core:dubbo应用的provider实现层子模块 - -codemaker-dynamicddd:基于plantUML类图+DDD思想生成的代码会放在这里 + 3. v3预览版本 +![image](doc/img/天画-低代码平台(codeMaker)-v3-预览版.png) -codemaker-cola:基于cola应用框架生成的代码会放在这里 - 1. cola-client:cola应用的rpc接口声明子模块 - 2. cola-adapter:cola应用的适配层子模块 - 3. cola-app:cola应用的应用层子模块 - 4. cola-infrast:cola应用的基础设施层子模块 - 5. cola-domain:cola应用的领域层子模块 - -2. 架构图 +##### 3. 使用流程图 1. v1版本 -![image](doc/img/天画-低代码平台(codeMaker).png) +![image](doc/img/天画-快速生成springboot微服务工程流程图.png) 2. v2版本 -![image](doc/img/天画-低代码平台(codeMaker)-v3.png) +![image](doc/img/天画-快速生成java微服务工程流程图.png) + + +#### 技术文章 + +##### 背景说明 +[天画总体技术背景](https://blog.csdn.net/u010504064/article/details/111767823) + + +##### 版本1的技术方案设计 +[codeMaker技术方案设计&背景](https://blog.csdn.net/u010504064/article/details/111828100) + +[codeMaker-dbops技术方案设计&背景](https://blog.csdn.net/u010504064/article/details/111938103) + +[codeMaker-er图生成技术设计与实现](https://blog.csdn.net/u010504064/article/details/111876499) + + +##### 版本2的技术方案设计 +[codeMaker-支持动态DDD代码生成](https://blog.csdn.net/u010504064/article/details/119177677) + +##### 版本3的技术方案设计 +[codeMaker-支持动态调用时序代码生成](https://mp.weixin.qq.com/s?__biz=MzI2OTE2OTc3MQ==&mid=2247484106&idx=1&sn=acacbf015246351c7662c900d878e6af&chksm=eae527cedd92aed8de8452dd83061bc729a3007d30d3bbe786abca08c7337530f214a8334f98&token=1918485743&lang=zh_CN#rd) -#### 版本变更 +#### 使用手册 +codeMaker支持多模式进行代码生成，具体看下列文档 +##### [纯数据库模式](USEDBYONLYDB.md) + +##### [基于PlantUML 的动态DDD模式](USEDBYDYNAMICDDD.md) + +##### [基于PlantUML 的动态DDD+数据库模式](USEDBYDBANDDDD.md) + +##### [基于PlantUML 的动态DDD+数据库+plantUML调用时序图文档模式](USEDBYDBANDPLANTUML.md) + +##### 基于PlantUML 的动态DDD+基于PlantUML的E-R数据模型模式(todo) + + +#### [版本变更-详细内容](CHANGELIST.md) ##### 版本-1.0.0 @@ -81,16 +107,7 @@ codemaker-cola:基于cola应用框架生成的代码会放在这里 简介: 实现dubbo应用的代码生成 ##### 版本-1.0.4 -简介: 实现ddd业务模型的代码生成 - -1. 基于plantUML文档生成代码，基于ddd思想和模式生成模块级的代码内容 -2. 增加makeddd接口，支持生成dynamicddd模块的代码 -3. 引入支持ddd代码生成的配置(projecttemplate-dynamicddd.properties)和代码模板(template/dynamicddd) -4. codemaker-core模块resources目录增加ddd-plantuml目录存放plantUML类图 -5. 支持ddd的一些模式代码生成：实体模式,值对象模式,聚合根模式,工厂模式,仓库模式,防腐层模式,服务模式,模块模式,CQE模式,领域网关 -6. 产出部分公共代码生成服务方法 -7. 优化代码生成核心链路代码模型，针对ddd代码生成做了分层处理 -8. 修复若干其他bug +简介: 实现ddd业务模型的代码生成 ##### 版本-0.0.2 简介: 本次版本新增codemaker-dberparse模块，支持plantuml er图解析为sql ddl create语句，已集成到codemaker-dbops @@ -98,178 +115,27 @@ codemaker-cola:基于cola应用框架生成的代码会放在这里 ##### 版本-1.1.0 简介: 实现springboot,cola,dubbo+ddd的代码生成 -1. 支持cola应用架构代码生成,增加cola应用的template代码模板 -2. 增加基于plantuml类图的领域服务代码生成接口 - /getproject/valueobject - /getproject/msgbody - /getproject/gataway - /getproject/acladapter - /getproject/command - /getproject/executor - /getproject/factory - /getproject/dtoboconvert - /getproject/voboconvert - /getproject/doboconvert -3. 精简不同应用框架的代码生成配置 - 在每个应用框架配置下增加dubbo.domain.plantuml配置项,配置plantuml类图文件名称,支持基于类图-ddd的代码生成 - 如果不配置则不能借助plantuml类图生成基于领域服务ddd的代码，而是生成基于数据库表的常规代码 - 去除以下三个配置，集中到application.properties文件中 - *.global.package - *.global.author - *.global.applicationName - -4. 在springboot,cola,dubbo的代码模板目录下增加ddd元素的tempalte代码模板 -5. 将dynamic-ddd的代码生成服务整合到springboot,cola,dubbo的代码生成服务中，支持基于DDD思想的代码生成 -6. 扩展plantuml中类图标签,基于BO派生多个代码生成对象（vo,dto,facade,doboconvert,controller,voboconvert,dtoboconvert） -7. 整合底层代码支持一套api,一套服务支撑springboot,cola,dubbo应用级代码生成和dynamic-ddd模块级代码生成 -8. 修复多个兼容性bug -9. 整体上支持基于数据库表结构的代码生成和基于plantUML类图文档的代码生成 - ##### 版本-1.2.0-alpha 简介: 实现springboot,cola,dubbo+ddd的代码生成的基础上增加解析调用时序图的逻辑，将调用时序代码逻辑融入到生成的代码方法里 -1. 支持event模型生成, -2. 支持mqconsumer,applistener,mqproducer,mqhandler生成 -3. 屏蔽扩展类dto带有bo属性的字段 -4. 增加对plantuml domain类图内容的校验，比如重复字段和重复方法 -5. 扩展动态ddd的代码生成能力，比如一个BO下出现多个facade,controller的接口 -6. 提高plantuml内容的解析兼容性和稳定性 -7. 增加解析plantUML调用时序文档的能力，并将调用逻辑融入代码生成的方法里 -8. 支持读写分离的dubbo,restController接口调用 -9. 支持将领域值对象枚举类暴露到rpc client端 -10. 优化convert代码生成 -11. gatawayimpl 与 repositoryimpl分开生成 -12. 优化包路径生成模式 -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文档内容,便于调试代码生成 +简介: 重构codeMaker整体代码内容，降低代码复杂度，增强基于调用时序文档构建代码的能力 + +##### 版本-1.2.2 +简介: 进行组件化架构升级,开放低代码模型和扩展接口能力,增加springcloud-feign应用框架代码生成能力 + + +#### 项目计划 +1. 参考todoList文件内容 +2. [参考changeList文件内容](CHANGELIST.md) #### 配置文件说明 -1.application.properties:代码生成服务的核心配置 -``` -# FREEMARKER (FreeMarkerAutoConfiguration) -spring.freemarker.allow-request-override=false -spring.freemarker.allow-session-override=false -spring.freemarker.cache=false -spring.freemarker.charset=UTF-8 -spring.freemarker.check-template-location=true -spring.freemarker.content-type=text/html -spring.freemarker.enabled=true -spring.freemarker.expose-request-attributes=false -spring.freemarker.expose-session-attributes=false -spring.freemarker.expose-spring-macro-helpers=true -spring.freemarker.prefer-file-system-access=true -# 这是重点， 会过滤.ftl后缀的文件 -spring.freemarker.suffix=.ftl -# spring boot 默认的页面模板存放目录 -spring.freemarker.template-loader-path=classpath:/template/ -spring.freemarker.settings.template_update_delay=0 -spring.freemarker.settings.default_encoding=UTF-8 -spring.freemarker.settings.classic_compatible=true - -server.port=8099 -management.port=8073 - -# 跨域(需要集成到公司服务的可以配置) -endpoints.cors.allowed-origins=http://127.0.0.1:8083 -endpoints.cors.allowed-methods=GET,POST - -#-------------以下是生成代码相关的业务配置---------- -#数据库配置 -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.url=jdbc:mysql://localhost:3306/school_manager?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=UTC -spring.datasource.username= -spring.datasource.password= - -#配置.xml文件路径 -mybatis.config-locations=classpath:mybatis-config.xml -mybatis.mapper-locations=classpath:mapper/*.xml -#配置模型路径 -mybatis.type-aliases-package=com.coderman.codemaker.bean -spring.application.name=codemaker -#生成的应用类型，支持springboot,dubbo,cola -application.type=dubbo - -``` -2.projecttemplate-dubbo.properties:生成dubbo应用代码的配置 -``` -#数据库名称 -dubbo.global.dbName=school_manager -#目标工程输出目录，这里填写对应的工程的绝对路径 -dubbo.code.outpath.dubbo-common=E:\\workspace\\tianhua-workspace\\code-maker\\codemaker-dubbo\\dubbo-common -dubbo.code.outpath.dubbo-api=E:\\workspace\\tianhua-workspace\\code-maker\\codemaker-dubbo\\dubbo-api -dubbo.code.outpath.dubbo-core=E:\\workspace\\tianhua-workspace\\code-maker\\codemaker-dubbo\\dubbo-core -#应用服务的plantUML类图文件,不配置则走基于数据表的方式生成代码 -codemaker.domain.plantuml= -``` - -3.projecttemplate-springboot.properties:生成springboot应用代码的配置 -``` -#数据库名称 -codemaker.global.dbName=school_manager -#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=E:\\workspace\\tianhua-workspace\\code-maker\\codemaker-springboot -#应用服务的plantUML类图文件,不配置则走基于数据表的方式生成代码 -codemaker.domain.plantuml= -``` - -4.projecttemplate-dynamicddd.properties:生成dynamicddd模块的代码配置 - -``` -#目标工程根包名称 -dynamicddd.global.package=com.lightsnail.snailapp.usercrm -#作者 -dynamicddd.global.author=fanchunshuai - -#目标工程输出目录，这里填写对应的codemaker-dynamicddd工程的绝对路径 -dynamicddd.code.outpath=E:\\workspace\\tianhua-workspace\\code-maker\\codemaker-dynamicddd -#领域plantUML 类图 -dynamicddd.domain.plantuml=CommonAuth.puml -``` - -5.projecttemplate-cola.properties:生成cola应用的代码配置 -``` -#数据库名称 -cola.global.dbName=school_manager - -cola.global.applicationName=school-manager - -#目标工程输出目录，这里填写对应的工程的绝对路径 -cola.code.outpath.cola-adapter=/Users/dasouche/scworkspace/sourceSpace/code-maker/codemaker-cola/cola-adapter -cola.code.outpath.cola-infrast=/Users/dasouche/scworkspace/sourceSpace/code-maker/codemaker-cola/cola-infrast -cola.code.outpath.cola-app=/Users/dasouche/scworkspace/sourceSpace/code-maker/codemaker-cola/cola-app -cola.code.outpath.cola-domain=/Users/dasouche/scworkspace/sourceSpace/code-maker/codemaker-cola/cola-domain -cola.code.outpath.cola-client=/Users/dasouche/scworkspace/sourceSpace/code-maker/codemaker-cola/cola-client - -#应用服务的plantUML类图文件,不配置则走基于数据表的方式生成代码 -cola.domain.plantuml= - -``` - - -#### sql表结构生成服务使用流程 -##### 数据库支持 -目前仅支持mysql数据库,其他数据库可基于本项目二次开发进行支持 +[组件注册流程与二次开发说明文档](COMPOENTREGIST.md) + +[开发使用详细配置内容](CONFIG.md) + +[构建DDD-plantUML领域文档使用说明](DDDPLANTUMLDOC.md) #### 代码生成服务使用流程 ##### 1.应用级项目生成 @@ -290,8 +156,6 @@ cola.domain.plantuml= ##### 3.接口文档 [API.md](API.md) - - #### 参与贡献 1. Fork 本仓库 diff --git a/USEDBYDBANDDDD.md b/USEDBYDBANDDDD.md new file mode 100644 index 0000000000000000000000000000000000000000..efd1c5fd15d961e5fc953536f3d62cd3c9d11bdd --- /dev/null +++ b/USEDBYDBANDDDD.md @@ -0,0 +1,142 @@ +#基于数据库模式+动态DDD模式(推荐) + +## 说明 +基于数据库模式+动态DDD生成生成的代码模式也相当于将基于数据模型实现的低代码与基于领域模型实现的低 +代码结合一起来一起生成一个大型复杂的业务工程代码。 + +## 使用步骤 +现在按照codeMaker内置的auth数据库表结构进行演示，具体使用过程已在README文档的技术实现链接里。 +这里再详细说明一下使用过程。 + +### 1.准备数据库 +1. 假设目标数据库已存在，且已有初始化数据库表结构，直接进入第二步 +2. 如果没有数据库需要从表结构开始构建，那么建议通过codemaker-dbops帮忙构建数据库表字段内容。 + +### 2.修改codemaker-core工程下resources目录的项目配置文件application.properties +1. 修改数据库配置,配置用户名和密码,让codeMaker连接到目标数据库 +2. 设置生成项目的应用类型(application.type)的属性 +3. 设置目标应用根包名称 +4. 设置项目构建的作者名称 +5. 组件化相关配置(可选) + 1. 配置本地maven仓库的绝对路径 + 2. 配置框架级中间件或者框架的组件列表(默认即可) + 3. 配置组件扫描bean(默认即可) + 4. 配置组件装饰bean(默认即可) +6. 配置示例 +```properties +#数据库配置 +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=shenshuai +spring.datasource.password= + +#应用类型配置，支持springboot,dubbo,cola,springcloud +application.type=cola + +#目标应用根包名称 +application.global.package=com.coderman.infosys.auth + +# 作者 +application.global.author=shenshuai + +# 组件化需要的maven repository本地路径,用来扫描依赖的组件jar包 +application.maven.repo.path=jar:file:///Users/shenshuai/.m2/repository + +#代码生成需要的全局组件，框架中间件可以放到全局组件依赖配置里,类似于脚手架,或者自己封装的业务组件框架,属于框架中间件级别的 +application.component.scan.config=dubbo,spring-web,openfeign + +#自定义的组件扫描bean,defaultCompScanService为codeMaker默认实现支持全局组件的配置，开发者可以参考进行自定义扫描组件实现来替代掉默认的用以适配自己公司的技术栈 +application.component.scan.bean=defaultCompScanService + +#自定义的组件装饰bean,defaultCompDecorateService默认实现支持全局组件的装饰，开发者可以参考进行自定义装饰组件的实现来替代掉默认的用以适配自己公司的技术栈 +application.component.decorate.bean=defaultCompDecorateService + +``` + +### 3.根据配置的应用类型修改projecttemplate-application.properties配置 +1. 配置数据库名称 +2. 配置应用名称 +3. 配置项目工程代码输出绝对路径 +4. 配置应用服务的DDD 领域模型plantUML类图文件(可选) + 1. 领域模型plantUML类图可以只包括DDD相关的代码元素 + 2. 也可以引入接口API + 3. 也可以引入调用时序 + 4. 领域模型plantUML类图文档参考/ddd-plantuml/infosys-auth目录下的文件 + 5. 调用时序plantUML文档参考/invoke-plantumlinfosys-auth目录下的文件 +5. 配置是否构建api文档(默认为true) +6. 配置需要导入的组件列表(业务组件,工具组件,可选) + 1. 框架级组件请参考/component目录下的dubbo,spring-web,openfeign文件夹 + 2. 业务组件或者封装的工具组件请参考/component目录下的hutool-core,infosysuser,apiresult文件夹 + 3. 独立类组件请参考/component目录下的/singleClass文件夹 + 4. 如果需要新定义独立类组件并被初始化项目使用还需要在/template目录下的singleClass文件夹中配置ftl模板 +7. 配置DDD中的读写领域特定语言标示(可选) +8. 配置子包是否按照request,response进行分包 +9. 配置应用级组件的扫描bean和装饰bean(可选) +10. 配置代码工具类级别的初始化依赖工具集(可选) +11. 配置示例 +```properties + +#数据库名称 +cola.global.dbName=infosys_auth + +#应用名称 +cola.global.applicationName=infosys-auth + +#目标工程输出目录，这里填写对应的工程的绝对路径 +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 +cola.code.outpath.cola-start=/Users/shenshuai/myspace/code-maker/codemaker-cola/cola-start +cola.code.outpath.cola-feign-api=/Users/shenshuai/myspace/code-maker/codemaker-cola/cola-feign-api + +#应用服务的plantUML类图文件,不配置则走基于数据表的方式生成代码 +cola.domain.plantuml=auth-domainV4-feign.puml + +#是否构建api 文档，否则进行构建,默认构建 +cola.api.generator=true + +# 需要导入的组件列表，多个逗号分割,适用于cola模块下依赖的业务组件包或者对外api接口包，或者cola项目本身已有的代码类,或者其他偏业务的工具类组件等等。 +# 如要生成的项目会依赖 infosys-user 服务的api则在这里定义即可。 +cola.component.scan.config=apiresult,infosysuser,hutool-core + +# 需要在领域文档和调用时序文档中识别的读操作统一语言 +# 纯数据库模式可以不需要 +cola.component.dsl.read=check + +#需要在领域文档和调用时序文档中识别的写操作统一语言 +cola.component.dsl.write=settle,apply + +#是否需要根据该参数设置请求参数的最后一级包名为request,默认false +cola.subpackage.request=true + +#是否需要根据该参数设置相应参数的最后一级包名为response,默认false +cola.subpackage.response=true + +#应用级组件中间件工具包的组件扫描bean配置 +cola.component.scan.beans=appCompScanService + +#应用级组件中间件工具包的组件装饰bean配置 +cola.component.decorate.beans=appCompDecorateService + +# 代码工具类注册，项目初始化时可以帮助初始化对应的工具类 +# 后面生成代码的时候可以删掉工具类，只专注于生成业务代码 +# 格式说明 eg:BaseEvent:core 前面是需要初始化的类，后面是这个类放到哪个模块下 +cola.component.init.clazz=BaseEvent:domain,Application:start,BaseController:adapter,SpringApplicationContext:domain,AppEventPublisher:domain + +``` + +### 4.codeMaker-core启动 +1. codemaker-core项目已迁移到codemaker-parent父级工程下 +2. 使用Main方法启动即可 + 1. 启动时会通过类加载机制扫描配置的组件 + 2. 如有报错信息请按上述步骤检查相关配置 +### 5.准备生成代码 +#### 第一种方式 +直接访问:http://127.0.0.1:8099/makeall,构建所有代码元素 +#### 第二种方式 +访问:http://127.0.0.1:8099/getproject/mapper,构建指定代码元素 +#### 第三种方式 +访问:http://127.0.0.1:8099/makemodules?tableNames=,增量构建模块级别的对应代码元素 + diff --git a/USEDBYDBANDPLANTUML.md b/USEDBYDBANDPLANTUML.md new file mode 100644 index 0000000000000000000000000000000000000000..dc21c97421bfa927fc2b90fd2f548970dda4045b --- /dev/null +++ b/USEDBYDBANDPLANTUML.md @@ -0,0 +1,12 @@ +#基于数据库模式+动态DDD模式+动态调用时序(推荐) + +## 说明 +这里是基于 +[基于PlantUML 的动态DDD+数据库模式](USEDBYDBANDDDD.md) +做的升级, 由于动态DDD模式需要依赖plantUML类图文档，因此基于这个模式加上plantUML代码调用时序图文档即可 +变成数据库模式+动态DDD模式+动态调用时序文档模式的复合模式或者混合模式。 + +## 使用步骤 +使用步骤与[基于PlantUML 的动态DDD+数据库模式](USEDBYDBANDDDD.md)一样，这里简单说一下如何加调用时序文档 +通过对PlantUML领域文档中的实体增加扩展key:invokeFileKey来扩展该实体对应的调用时序文档，可以有多个。 + diff --git a/USEDBYDYNAMICDDD.md b/USEDBYDYNAMICDDD.md new file mode 100644 index 0000000000000000000000000000000000000000..24f9a3780e16e0faaaceaeecbd15bf64a08114d8 --- /dev/null +++ b/USEDBYDYNAMICDDD.md @@ -0,0 +1,34 @@ +#基于动态DDD模式(默认) + +## 说明 +基于PlantUML类图文档构建，类图文档中包含了DDD相关的实体,值对象,工厂,聚合,仓库,领域服务等相关的代码元素 +所以这里基于动态DDD的模式是不会生成API接口和基础设施层相关的代码的(如mapper),这里对于动态DDD模式的定位是 +模块级别的，主要用于构建并尽快将领域驱动设计模型落地到代码上并评估其领域业务模型，领域行为接口的合理性。 + +## 使用步骤 +这里的使用步骤参考 +[纯数据库模式](USEDBYONLYDB.md) +的前几部分，唯一要注意的是程序启动依然会链接一个数据库，但是这个数据库将仅仅是保持服务启动正常。 + +### 1.配置application.properties文件 +具体配置参考纯数据库模式 + +### 2.配置projecttemplate-dynamicddd.properties文件 +```properties +#目标工程输出目录，这里填写对应的codemaker-dynamicddd工程的绝对路径 +dynamicddd.code.outpath=/Users/shenshuai/myspace/code-maker/codemaker-dynamicddd +#领域plantUML 类图 +dynamicddd.domain.plantuml=SchoolManager.puml + +``` + +### 3.codeMaker-core启动 +1. codemaker-core项目已迁移到codemaker-parent父级工程下 +2. 使用Main方法启动即可 + 1. 启动时会通过类加载机制扫描配置的组件 + 2. 如有报错信息请按上述步骤检查相关配置 +### 4.准备生成代码 +#### 访问接口 +直接访问:http://127.0.0.1:8099/makeddd,构建DDD相关的代码元素 + + diff --git a/USEDBYONLYDB.md b/USEDBYONLYDB.md new file mode 100644 index 0000000000000000000000000000000000000000..8db38918f048d346d20dcdca69a861f6bca3adc4 --- /dev/null +++ b/USEDBYONLYDB.md @@ -0,0 +1,130 @@ +#基于数据库模式(默认) + +## 说明 +基于数据库模式生成的代码模式也相当于基于数据模型实现的低代码 +实践方案，-此模式需要配合目标数据库的表字段元数据进行使用，当然也最简单，是codeMaker +默认的最简单实现方式。 + +## 使用步骤 +现在按照codeMaker内置的auth数据库表结构进行演示，具体使用过程已在README文档的技术实现链接里。 +这里再详细说明一下使用过程。 + +### 1.准备数据库 +1. 假设目标数据库已存在，且已有初始化数据库表结构，直接进入第二步 +2. 如果没有数据库需要从表结构开始构建，那么建议通过codemaker-dbops帮忙构建数据库表字段内容。 + +### 2.修改codemaker-core工程下resources目录的项目配置文件application.properties +1. 修改数据库配置,配置用户名和密码,让codeMaker连接到目标数据库 +2. 设置生成项目的应用类型(application.type)的属性 +3. 设置目标应用根包名称 +4. 设置项目构建的作者名称 +5. 配置示例 +```properties +#数据库配置 +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=shenshuai +spring.datasource.password= + +#应用类型配置，支持springboot,dubbo,cola,springcloud +application.type=cola + +#目标应用根包名称 +application.global.package=com.coderman.infosys.auth + +# 作者 +application.global.author=shenshuai + +# 组件化需要的maven repository本地路径,用来扫描依赖的组件jar包 +application.maven.repo.path=jar:file:///Users/shenshuai/.m2/repository + +#代码生成需要的全局组件，框架中间件可以放到全局组件依赖配置里,类似于脚手架,或者自己封装的业务组件框架,属于框架中间件级别的 +application.component.scan.config=dubbo,spring-web,openfeign + +#自定义的组件扫描bean,defaultCompScanService为codeMaker默认实现支持全局组件的配置，开发者可以参考进行自定义扫描组件实现来替代掉默认的用以适配自己公司的技术栈 +application.component.scan.bean=defaultCompScanService + +#自定义的组件装饰bean,defaultCompDecorateService默认实现支持全局组件的装饰，开发者可以参考进行自定义装饰组件的实现来替代掉默认的用以适配自己公司的技术栈 +application.component.decorate.bean=defaultCompDecorateService + +``` + +### 3.根据配置的应用类型修改projecttemplate-application.properties配置 +1. 配置数据库名称 +2. 配置应用名称 +3. 配置项目工程代码输出绝对路径 +4. 配置示例 +```properties + +#数据库名称 +cola.global.dbName=infosys_auth + +#应用名称 +cola.global.applicationName=infosys-auth + +#目标工程输出目录，这里填写对应的工程的绝对路径 +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 +cola.code.outpath.cola-start=/Users/shenshuai/myspace/code-maker/codemaker-cola/cola-start +cola.code.outpath.cola-feign-api=/Users/shenshuai/myspace/code-maker/codemaker-cola/cola-feign-api + +#应用服务的plantUML类图文件,不配置则走基于数据表的方式生成代码 +#cola.domain.plantuml=auth-domainV4-feign.puml +cola.domain.plantuml= + +#是否构建api 文档，否则进行构建,默认构建 +cola.api.generator=true + +#需要导入的组件列表，多个逗号分割,适用于cola模块下依赖的业务组件包或者对外api接口包，或者cola项目本身已有的代码类,或者其他偏业务的工具类组件等等。 +#如要生成的项目会依赖 infosys-user 服务的api则在这里定义即可。 +#纯数据库模式可以不需要 +cola.component.scan.config= +#cola.component.scan.config=apiresult,infosysuser,hutool-core + +# 需要在领域文档和调用时序文档中识别的读操作统一语言 +# 纯数据库模式可以不需要 +cola.component.dsl.read= +#cola.component.dsl.read=check + +#需要在领域文档和调用时序文档中识别的写操作统一语言 +cola.component.dsl.write= +#cola.component.dsl.write=settle,apply + +#是否需要根据该参数设置请求参数的最后一级包名为request,默认false +cola.subpackage.request=true + +#是否需要根据该参数设置相应参数的最后一级包名为response,默认false +cola.subpackage.response=true + +#应用级组件中间件工具包的组件扫描bean配置 +cola.component.scan.beans= +#ola.component.scan.beans=appCompScanService + +#应用级组件中间件工具包的组件装饰bean配置 +cola.component.decorate.beans=appCompDecorateService + +# 代码工具类注册，项目初始化时可以帮助初始化对应的工具类 +# 后面生成代码的时候可以删掉工具类，只专注于生成业务代码 +# 格式说明 eg:BaseEvent:core 前面是需要初始化的类，后面是这个类放到哪个模块下 + +cola.component.init.clazz= +# cola.component.init.clazz=BaseEvent:domain,Application:start,BaseController:adapter,SpringApplicationContext:domain,AppEventPublisher:domain + +``` + +### 4.codeMaker-core启动 +1. codemaker-core项目已迁移到codemaker-parent父级工程下 +2. 使用Main方法启动即可 + 1. 启动时会通过类加载机制扫描配置的组件 + 2. 如有报错信息请按上述步骤检查相关配置 +### 5.准备生成代码 +#### 第一种方式 +直接访问:http://127.0.0.1:8099/makeall,构建所有代码元素 +#### 第二种方式 +访问:http://127.0.0.1:8099/getproject/mapper,构建指定代码元素 +#### 第三种方式 +访问:http://127.0.0.1:8099/makemodules?tableNames=,增量构建模块级别的对应代码元素 + 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 deleted file mode 100644 index 5d197f4168b9f19ba0050ff693ecc34e3769fef1..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/AuthorityOperationController.java +++ /dev/null @@ -1,36 +0,0 @@ -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 deleted file mode 100644 index 44d4fcdd98845e64369bab85fc8a4c1a36a1b085..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/AuthorityQueryController.java +++ /dev/null @@ -1,48 +0,0 @@ -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 deleted file mode 100644 index 87171940d2bf6c267e3acb0969d011f8311887d6..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/DataAuthorityController.java +++ /dev/null @@ -1,36 +0,0 @@ -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 deleted file mode 100644 index e0e9088619360a7f9863e92eb7ffb9bbfffa2741..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/DataColumnController.java +++ /dev/null @@ -1,63 +0,0 @@ -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 deleted file mode 100644 index aa271904689a684bb29c0f533e190f61f710b440..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/MenuController.java +++ /dev/null @@ -1,84 +0,0 @@ -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 deleted file mode 100644 index ee6c32a4a4fee84f4a47037269064712aa913af1..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/ModuleController.java +++ /dev/null @@ -1,127 +0,0 @@ -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 deleted file mode 100644 index 3f63aa6e00ae501b5dbd3607047e409880c00da9..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/RoleController.java +++ /dev/null @@ -1,73 +0,0 @@ -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 deleted file mode 100644 index d7db5cd38790b8435eed1508df7d99cd6fc5a3e6..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/RoleGroupController.java +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index bed8a27fcc61675d5a7d52453eb6c3f522a7ca63..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/RoleQueryController.java +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index 57aa3f029d4d1797bb86f48eea25987bbe921445..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/SystemAuthorityController.java +++ /dev/null @@ -1,49 +0,0 @@ -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 deleted file mode 100644 index a43bd3c0648af42a6409d180fef6e5c2112a8ed9..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/SystemController.java +++ /dev/null @@ -1,107 +0,0 @@ -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 deleted file mode 100644 index 60770cc94f9720c7d509d6ebbdf739328e34cc41..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/UserGroupController.java +++ /dev/null @@ -1,36 +0,0 @@ -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 deleted file mode 100644 index 97611322a1436a2be6eca322dae703feacb3aa4e..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/controller/UserGroupQueryController.java +++ /dev/null @@ -1,36 +0,0 @@ -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 deleted file mode 100644 index d264f4953118b05c1cbd5c8faeadf3ff7e01706b..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/AuthorityVO.java +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index 9a5f5cdfc5dfde0efa8a02b64690e7dbf614b654..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/CreateMenuRequestVO.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index 95ed54944637e9a56c5a29df4c646bd7a5bf5080..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/CreateModuleRequestVO.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index 8d9433065445f6448e188c989cab3305a81bb5ec..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/CreateRoleRequestVO.java +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index baef5b8a427ed43e386c9fe8f7341a2064374b63..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/CreateSystemRequestVO.java +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index 2d005c423fbfd043035f2effbfa3248845197056..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/DataAuthorityResponseVO.java +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index 948feab9e7116e9003f70cdc2f96ed7ec3bc3885..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/DataColumnResponseVO.java +++ /dev/null @@ -1,35 +0,0 @@ -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 deleted file mode 100644 index cbb92ce4edac2076104747b64eb82d714db0dbbe..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/DataColumnVO.java +++ /dev/null @@ -1,35 +0,0 @@ -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 deleted file mode 100644 index b0817e06dfa0981709841a13c82dcf9a22d721f0..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/MenuVO.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index 2a369d72f38f72ac901a8e41be4b610b852b630d..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/ModuleVO.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index 67219793d4346fc321a38542bc0bd61c36b31594..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/RoleGroupVO.java +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index 87ee2c772b1505e6adb2c652d8570af509eb2f9e..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/RoleVO.java +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index 63b5cc75eee38e11408f62b60978542f4905342f..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/SystemAuthorityVO.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index 795dc5408f4ca87fd9470c729f20288e39fac71e..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/SystemVO.java +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index 521a829a28b8e3612d4d06aeeeed0a2bebab73df..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/UpdateMenuRequestVO.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index 20e5f656c038b0d44c12b3f614033a77fd20956a..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/UpdateModuleRequestVO.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index c0d0b697dbd53a28f44136ed7052af46cab2a91b..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/UpdateSystemRequestVO.java +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index 09d72c23679d484ba464edc509bd3fb7647abb75..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/adapter/vo/UserGroupVO.java +++ /dev/null @@ -1,33 +0,0 @@ -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/model/convert/AuthorityConverter.java b/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/model/convert/AuthorityConverter.java deleted file mode 100644 index ac5f28971ce87b848e6f0db0f25d22ae8ba6ff4d..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/model/convert/AuthorityConverter.java +++ /dev/null @@ -1,46 +0,0 @@ -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 deleted file mode 100644 index c58b7e9b99e08e79b8d9861d7b69ed86cced8755..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/model/convert/DataAuthorityConverter.java +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index 90265b9ba2608a123d7cef1cf6c3f8d203d71ccb..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/model/convert/DataColumnConverter.java +++ /dev/null @@ -1,53 +0,0 @@ -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 deleted file mode 100644 index a2ac07b41515e2096da2b5aabf5ddafdda818800..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/model/convert/MenuConverter.java +++ /dev/null @@ -1,72 +0,0 @@ -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 deleted file mode 100644 index b88f6f0d9d0d133033da7b4a014e0f8de8b19c17..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/model/convert/ModuleConverter.java +++ /dev/null @@ -1,72 +0,0 @@ -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 deleted file mode 100644 index d7349817efef2417558f6bf699a00daea042957e..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/model/convert/RoleConverter.java +++ /dev/null @@ -1,59 +0,0 @@ -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 deleted file mode 100644 index 9afabb297b62130d6beaa32eaf90eaf57d756659..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/model/convert/RoleGroupConverter.java +++ /dev/null @@ -1,46 +0,0 @@ -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 deleted file mode 100644 index 54f6e1943cfba17f5da647d74f027f08f53dc8ee..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/model/convert/SystemAuthorityConverter.java +++ /dev/null @@ -1,47 +0,0 @@ -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 deleted file mode 100644 index 9ceb4f8166784d22d3249fc21e8cf926de6c451d..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/model/convert/SystemConverter.java +++ /dev/null @@ -1,72 +0,0 @@ -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 deleted file mode 100644 index 511cc13df9782af0585957aca737623d03c9ea89..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/model/convert/UserGroupConverter.java +++ /dev/null @@ -1,46 +0,0 @@ -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 a8a4f5ce963a88ff54175fa83639105819956684..c0f2e50bdf7bcc49a31b25759890392b0c85c2ca 100644 --- a/codemaker-cola/cola-app/pom.xml +++ b/codemaker-cola/cola-app/pom.xml @@ -55,6 +55,11 @@ 1.0.4-SNAPSHOT + + cn.hutool + hutool-core + + 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 deleted file mode 100644 index 14836fbd470aeb39f3ca65dfb233f18974604387..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/command/AbstractCmd.java +++ /dev/null @@ -1,32 +0,0 @@ -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 deleted file mode 100644 index 84b0a6fb25ac828690975fdbd5c4012aa9030400..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/command/AddRoleAuthCmd.java +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index 2d4ea4ab737d8d4967a06ae25a2f10c16ea71ae1..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/command/AddUserAuthCmd.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index 53a7a41655d0c0137d71dc1c96b3683ad06c572c..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/command/AddUserCmd.java +++ /dev/null @@ -1,28 +0,0 @@ -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 deleted file mode 100644 index e352a5142b2189af98cf907b68b8f177e0174a95..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/command/AddUserGroupCmd.java +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index dcc7a8e72c918382f780f40a84817ec20f8f040d..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/command/UpdateRoleAuthCmd.java +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index 06e87885082e0c589d8ff66a50613ecad920e0e5..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/command/UpdateUserAuthCmd.java +++ /dev/null @@ -1,28 +0,0 @@ -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 deleted file mode 100644 index d7237e03e5c118f821eeec34aa34e9ec347cf9d9..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/convert/AuthorityConvert.java +++ /dev/null @@ -1,60 +0,0 @@ -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 deleted file mode 100644 index 5ce0ccf0223db3b513a9a9941e9634bebdbf120a..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/convert/DataAuthorityConvert.java +++ /dev/null @@ -1,61 +0,0 @@ -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 deleted file mode 100644 index 7e424eb3e6cad8c7795bf566215a9892ce41e6d5..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/convert/MenuConvert.java +++ /dev/null @@ -1,60 +0,0 @@ -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 deleted file mode 100644 index 3f1079c849d811a05c8572f32b9b2d3217b9d1c5..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/convert/ModuleConvert.java +++ /dev/null @@ -1,60 +0,0 @@ -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 deleted file mode 100644 index 8c13e2490e8d64f89dfd9878fe4a47d61c96ae76..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/convert/RoleConvert.java +++ /dev/null @@ -1,60 +0,0 @@ -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 deleted file mode 100644 index 62da28aa8c01b9c9283eb1b564bc9e3b693a0d23..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/convert/RoleGroupConvert.java +++ /dev/null @@ -1,47 +0,0 @@ -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 deleted file mode 100644 index f5d0de3d849302341869c1ddde9e492e7f40fd6d..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/convert/SystemAuthorityConvert.java +++ /dev/null @@ -1,61 +0,0 @@ -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 deleted file mode 100644 index 8b0bba66687c4378acdce28adb34ff8443cf437e..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/convert/SystemConvert.java +++ /dev/null @@ -1,72 +0,0 @@ -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 deleted file mode 100644 index fee876c8c4796a91ef059981cfa19d08d9b6cef2..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/convert/UserGroupConvert.java +++ /dev/null @@ -1,60 +0,0 @@ -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 deleted file mode 100644 index aaa9afe08f09d441d66676ae3a762bf87d3d7039..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/exe/CmdExeService.java +++ /dev/null @@ -1,21 +0,0 @@ -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 deleted file mode 100644 index ca4c57483cdec16f6bf4dc6088bdd42e62d712df..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/exe/RoleAuthCmdExe.java +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index fc2482ac8a2644c826af22c5e8c78eae90be2b9f..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/exe/UserAuthCmdExe.java +++ /dev/null @@ -1,29 +0,0 @@ -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/facadeimpl/AuthorityFacadeImpl.java b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/facadeimpl/AuthorityFacadeImpl.java deleted file mode 100644 index bfdb8a5a11a71cfbe42477c5147f047e66414123..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/facadeimpl/AuthorityFacadeImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -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 deleted file mode 100644 index d48d1bb929777111363d8f3e28f518a927273b4a..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/facadeimpl/DataAuthorityFacadeImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -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 deleted file mode 100644 index f7758fb1e6bb6c4f09895a35311aadda6814622f..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/facadeimpl/MenuFacadeImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -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 deleted file mode 100644 index 4556217bd339f266cca8e674c696dc1aa439aa20..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/facadeimpl/ModuleFacadeImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -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 deleted file mode 100644 index 426159a5e1f736928a6da00e24cb67cc98e0ff4f..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/facadeimpl/RoleFacadeImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -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 deleted file mode 100644 index ac56a2f77443608591478e70911e275634a5cdf2..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/facadeimpl/RoleGroupFacadeImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -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 deleted file mode 100644 index 73d448afdb9e574b479332b629b624f653585a0d..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/facadeimpl/SystemAuthorityFacadeImpl.java +++ /dev/null @@ -1,32 +0,0 @@ -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 deleted file mode 100644 index cca07bdfaaa4643d10706f118fa0fe59260d44bc..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/facadeimpl/SystemFacadeImpl.java +++ /dev/null @@ -1,77 +0,0 @@ -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 deleted file mode 100644 index 676e3c67a607f17f0a910cdb040bbf6034341297..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/facadeimpl/UserGroupFacadeImpl.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index 1047a0e2b77e56aa152708256a3b7b1da6a7fd48..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/facadeimpl/UserGroupQueryFacadeImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -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-cola/cola-app/src/main/java/com/coderman/infosys/auth/utils/SpringApplicationContext.java b/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/utils/SpringApplicationContext.java deleted file mode 100644 index 5ccb6b278c9ebd98d94bb08b762fbfd3d7fb6424..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/utils/SpringApplicationContext.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * 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-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 deleted file mode 100644 index 86e05b26fa533647b33fd5282c2453263d089f0e..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/AuthorityResponseDTO.java +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index d905993de87b6e2059b08ef4af094a238a60e490..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/CreateAuthorityRequestDTO.java +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index 5927a94211cc77eeb4a34b1e1f818431d9cbc8e7..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/CreateDataAuthorityRequestDTO.java +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index 5b33b44bdbffdf6a7a80581651c1281ff965606d..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/CreateMenuRequestDTO.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index cea22a40a405bf6b7c649280b53f64e60c50d726..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/CreateModuleRequestDTO.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index 4c3459765094bb4515fd3b0b15ba3114bcb004f2..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/CreateRoleRequestDTO.java +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index 35764118d44837bfcd1217053db9b2c7ddcf508d..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/CreateSystemAuthorityRequestDTO.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index 2cc99069a2d008a6a445bb25d78e4676e06a522e..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/CreateSystemRequestDTO.java +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index c9c24235961b9e2c003b42dd5f4d4e0cf84bc68a..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/CreateUserGroupRequestDTO.java +++ /dev/null @@ -1,33 +0,0 @@ -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 deleted file mode 100644 index 478ba0ee1cbc68ef71cadb12e7be9d05a085f5e5..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/DataAuthorityResponseDTO.java +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index 0092f0ba7483d6b5be67a9bf6c00c63e17a09344..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/MenuResponseDTO.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index 9122319f201622c24bc3d0b55631ead779be91a9..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/ModuleResponseDTO.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index 092801d8024c124dcfaf200ad5f519c526dd1531..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/RoleGroupResponseDTO.java +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index 21193c2f7c4b65cdbcaa3ba101ae2a9883a80d00..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/RoleResponseDTO.java +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index 6d4a9609280191a98f8a5979f35eebc7e9acb692..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/SystemAuthorityResponseDTO.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index 9aeafc1be10cb43a1fcf4eacdee3488fc76bf667..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/SystemDTO.java +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index b282c51dfe3644023be43002938361a145a60777..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/UpdateAuthorityRequestDTO.java +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index 54be1bd5ae1f574a81256f856f3779a1fb8df619..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/UpdateDataAuthorityRequestDTO.java +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index c109a7a7f13a56def5dbc019b39cf5b6150fa2ea..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/UpdateMenuRequestDTO.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index c35359bf116f00e73ce842b7d2214323d59b4499..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/UpdateModuleRequestDTO.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index ee7e11e57f0aefc7c36f2c57f2e9771cfd4165b6..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/UpdateRoleGroupRequestDTO.java +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index 684fadb92e33e0494140c133f8b035e74ad4ac95..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/UpdateRoleRequestDTO.java +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index 5645f66c7911586a8e02f098434e20431a5aae02..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/UpdateSystemAuthorityRequestDTO.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index 0e4d829540396f26e31128e62fcd66b2519b6251..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/UpdateSystemRequestDTO.java +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index 59e01cf369df25decdcf4986168cc3dc360e1ca7..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/UpdateUserGroupRequestDTO.java +++ /dev/null @@ -1,33 +0,0 @@ -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 deleted file mode 100644 index d4b7a88323057f8fe229409be9a4cba74b7da881..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/dto/UserGroupResponseDTO.java +++ /dev/null @@ -1,33 +0,0 @@ -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 deleted file mode 100644 index b21b7cfae3977cd8490b0146c07295766b0ac850..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/enums/AuthorityTypeEnum.java +++ /dev/null @@ -1,45 +0,0 @@ -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 deleted file mode 100644 index cb52c66b943952fb97b46669f272f19bc9dba682..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/facade/AuthorityFacade.java +++ /dev/null @@ -1,49 +0,0 @@ -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 deleted file mode 100644 index 8db672415336d9c2c1b78bd239223c700cb8e1d0..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/facade/DataAuthorityFacade.java +++ /dev/null @@ -1,32 +0,0 @@ -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 deleted file mode 100644 index f21544b708d4965d2de4216f13d12b98113e0c65..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/facade/MenuFacade.java +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index 1d6351851675d1794c6fe6cd973cfda9d5bcdf83..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/facade/ModuleFacade.java +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index 20d83d613b05ce953d1e8952bc92713758d64e93..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/facade/RoleFacade.java +++ /dev/null @@ -1,22 +0,0 @@ -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 deleted file mode 100644 index 2243716d418244215c667065019c321b31f76019..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/facade/RoleGroupFacade.java +++ /dev/null @@ -1,22 +0,0 @@ -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 deleted file mode 100644 index 18cc389785453cea4ddb45fe13ee8d8136ccf69a..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/facade/SystemAuthorityFacade.java +++ /dev/null @@ -1,23 +0,0 @@ -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 deleted file mode 100644 index 730d93e51e30561dabc892f2725c2e967861a89d..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/facade/SystemFacade.java +++ /dev/null @@ -1,57 +0,0 @@ -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 deleted file mode 100644 index ac208de6bea1691a51717b54fd443578dd6c28cc..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/facade/UserGroupFacade.java +++ /dev/null @@ -1,23 +0,0 @@ -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 deleted file mode 100644 index 30b92f5578aebeaa7807b581afc0838ee39ef729..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-client/src/main/java/com/coderman/infosys/auth/api/facade/UserGroupQueryFacade.java +++ /dev/null @@ -1,22 +0,0 @@ -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/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 deleted file mode 100644 index 57d612d51ca1a04c3b23870072ff75c3a508004f..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/AdminAuthorityBO.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index e5220043ebeabe0b91c2553d569ee27b8faf112d..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/AuthAggregateBO.java +++ /dev/null @@ -1,38 +0,0 @@ -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 deleted file mode 100644 index e5d7fa0d1b296d8a32d31bb5ae8de85658fed49b..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/AuthorityBO.java +++ /dev/null @@ -1,47 +0,0 @@ -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 deleted file mode 100644 index 0859a0cfd2a5a04adc5b8fea2c76682463fcf3b9..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/AuthorityUpdateRequestBO.java +++ /dev/null @@ -1,22 +0,0 @@ -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 deleted file mode 100644 index 487b0213fc4a6198c8491ed81c678a54e8173fc8..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/BasicOperateBO.java +++ /dev/null @@ -1,32 +0,0 @@ -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 deleted file mode 100644 index 169596f8e70cdb2be10f9fd3ac0bf4ccd05d42d3..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/DataAuthorityBO.java +++ /dev/null @@ -1,28 +0,0 @@ -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 deleted file mode 100644 index 290748d163911176fd3935b6e16ce3499b43cdd7..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/DataColumnBO.java +++ /dev/null @@ -1,43 +0,0 @@ -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 deleted file mode 100644 index 65b21fe4f50bda275673c277ac1da685309a1c30..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/MenuBO.java +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index 98cc7bfc6127383953f17981207bd9848c8573e6..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/ModuleBO.java +++ /dev/null @@ -1,38 +0,0 @@ -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 deleted file mode 100644 index 6a14a8b70d486357a27abe0d7c54a7efc9c91a08..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/OperateDateBO.java +++ /dev/null @@ -1,26 +0,0 @@ -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 deleted file mode 100644 index e9e4b8b135531f6cc14cb8563268e2506f1085af..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/OperatorBO.java +++ /dev/null @@ -1,26 +0,0 @@ -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 deleted file mode 100644 index 5bd72cb35df55d258bf367fc3fa81cf20e631880..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/RoleAuthAggregateBO.java +++ /dev/null @@ -1,22 +0,0 @@ -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 deleted file mode 100644 index ede8da806f9cacfd222d648dd728a514eb7f6c3f..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/RoleBO.java +++ /dev/null @@ -1,35 +0,0 @@ -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 deleted file mode 100644 index d548ba238471ecf2d229589b2e1b52c81f59ab40..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/RoleGroupBO.java +++ /dev/null @@ -1,35 +0,0 @@ -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 deleted file mode 100644 index 0ec94ba835d8649538a4e9d9b0da8d46617171c4..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/SystemAuthorityBO.java +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index 2c23b112a2f165c1a52d9fd0a97316204b83cd91..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/SystemBO.java +++ /dev/null @@ -1,47 +0,0 @@ -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 deleted file mode 100644 index 99d7b76be699cbc56a4121061790afd8ad519b85..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/SystemConfig.java +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index b1a1c09b176f8331101f9a393bbd84409303febf..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/UserAuthAggregateBO.java +++ /dev/null @@ -1,22 +0,0 @@ -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 deleted file mode 100644 index 07976631d111aa9062549e2cdf31cb81bac37431..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/UserBO.java +++ /dev/null @@ -1,32 +0,0 @@ -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 deleted file mode 100644 index 79b45d14227e3cf181dff84f02338f07b88f2c41..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/bo/UserGroupBO.java +++ /dev/null @@ -1,41 +0,0 @@ -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 deleted file mode 100644 index 5f43baedf12df71867867581802092cec63d8a42..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/enums/AuthorityTypeEnum.java +++ /dev/null @@ -1,45 +0,0 @@ -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 deleted file mode 100644 index ccfc635c4f347200e73a5427bd2d99e201937b91..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/event/BaseEvent.java +++ /dev/null @@ -1,18 +0,0 @@ -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 deleted file mode 100644 index b6cb5ca7511c6681e76caba5b14b92b019270fce..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/event/MenuChangeEvent.java +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index 066c3c2ff0c4e6be85cd64ba5106bbad2fe5837f..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/event/RoleAuthChangeEvent.java +++ /dev/null @@ -1,27 +0,0 @@ -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 deleted file mode 100644 index 7a7e95dd9bd7cc609e309224d149a950a0101d62..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/event/RoleChangeEvent.java +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index 0116b276dc57477695c83dffd4f71d16c8695a07..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/factory/AuthorityFactory.java +++ /dev/null @@ -1,43 +0,0 @@ -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 deleted file mode 100644 index d794044a705b6d30ea7ff1d8a20e162d3499bfc9..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/gataway/AuthorityRepository.java +++ /dev/null @@ -1,54 +0,0 @@ -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 deleted file mode 100644 index 494f58c27d29a8f85ae2a18b3faf3c4261788913..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/gataway/DataColumnGataWay.java +++ /dev/null @@ -1,63 +0,0 @@ -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 deleted file mode 100644 index 527489412ba693d15eaa73942f5e2aa6085740f5..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/gataway/SystemModuleQueryGataWay.java +++ /dev/null @@ -1,88 +0,0 @@ -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 deleted file mode 100644 index 679943004929e7a2881aaaddd2e55489376aab96..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/gataway/SystemModuleRepository.java +++ /dev/null @@ -1,63 +0,0 @@ -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 deleted file mode 100644 index d8a0dda346506591904830c00b19e17e167582f9..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/gataway/UserRoleRepository.java +++ /dev/null @@ -1,97 +0,0 @@ -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 deleted file mode 100644 index 559bec5a9889284fc574f196b09213166c98b497..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-domain/src/main/java/com/coderman/infosys/auth/domain/msgbody/UserStatusChangeMsgBody.java +++ /dev/null @@ -1,22 +0,0 @@ -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-feign-api/pom.xml b/codemaker-cola/cola-feign-api/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..6249daa4efbae40f6e3e9824e79c09d814ba13ae --- /dev/null +++ b/codemaker-cola/cola-feign-api/pom.xml @@ -0,0 +1,69 @@ + + + + 4.0.0 + + codemaker-cola + com.codemaker.cola + 1.0-SNAPSHOT + + + com.codemaker.cola + cola-feign-api + 1.0-SNAPSHOT + + cola-feign-api + + http://www.example.com + + + UTF-8 + 1.7 + 1.7 + + + + + junit + junit + 4.11 + test + + + com.coderman.utils + coderman-utils + 1.0.4-SNAPSHOT + + + + org.springframework + spring-web + + + + org.springframework.cloud + spring-cloud-openfeign + 2.2.2.RELEASE + + + + org.projectlombok + lombok + + + org.springframework.cloud + spring-cloud-openfeign-core + 2.2.2.RELEASE + compile + + + org.springframework + spring-web + + + + + + + diff --git a/codemaker-cola/cola-infrast/pom.xml b/codemaker-cola/cola-infrast/pom.xml index 3cb9bf1de3b33fe847c92048809c73fb53139069..0bbc45985a73d97dd340d7c92120ec87c73bd974 100644 --- a/codemaker-cola/cola-infrast/pom.xml +++ b/codemaker-cola/cola-infrast/pom.xml @@ -43,6 +43,12 @@ 1.0-SNAPSHOT + + cn.hutool + hutool-core + + + org.slf4j slf4j-api @@ -79,6 +85,20 @@ compile + + com.coderman.infosys.plat.user + user-client + + + + org.apache.dubbo + dubbo-spring-boot-starter + + + org.apache.dubbo + dubbo + + 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 deleted file mode 100644 index 13b9975f6c44a28235cce88d55fde4adbe7f50e2..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/acl/AreaServiceAdapter.java +++ /dev/null @@ -1,27 +0,0 @@ -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 deleted file mode 100644 index 53c84b09656abcdb9735caa02135399d8171af93..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/acl/DepartmentServiceAdapter.java +++ /dev/null @@ -1,27 +0,0 @@ -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 deleted file mode 100644 index 95bf81e5e6c60ef78d72fcebfc4ebd082f001b04..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/acl/impl/AreaServiceAdapterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -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 deleted file mode 100644 index db128b1a76f671682da73eb1477e404b281adeca..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/acl/impl/DepartmentServiceAdapterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -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 deleted file mode 100644 index 807e5ae815562a35871cc811b38357e3ef18279f..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/acl/req/dto/DepartmentQueryDTO.java +++ /dev/null @@ -1,19 +0,0 @@ -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 deleted file mode 100644 index 24157b4415f085015c2f8fae4a3f8d55bf24f210..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/acl/res/dto/CityResponseDTO.java +++ /dev/null @@ -1,19 +0,0 @@ -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 deleted file mode 100644 index 3a4634d62ca9eddf1b0f1ade89704173e2446b39..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/acl/res/dto/DepartmentResponseDTO.java +++ /dev/null @@ -1,19 +0,0 @@ -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 deleted file mode 100644 index 67032b5ff50083d4b250313e415a5a2e2086fee7..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/acl/res/dto/ProvinceResponseDTO.java +++ /dev/null @@ -1,19 +0,0 @@ -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 deleted file mode 100644 index 0af0395e68b05a7b6e61547d13478df0909b6302..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/AdminAuthorityDO.java +++ /dev/null @@ -1,43 +0,0 @@ -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 deleted file mode 100644 index 880662e6488aee7abd0f325ac9ec9cc4563336d4..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/AuthorityDO.java +++ /dev/null @@ -1,49 +0,0 @@ -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 deleted file mode 100644 index c965b8ff1318deadaa841b904558484ac11139d5..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/DataAuthorityDO.java +++ /dev/null @@ -1,40 +0,0 @@ -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 deleted file mode 100644 index 0365d14d3f7099957db9ce8aa4a0235d05dc9a50..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/DataColumnConfigDO.java +++ /dev/null @@ -1,55 +0,0 @@ -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 deleted file mode 100644 index 7bbb0dd9ea6f999299196e0b647337973f882c1b..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/MenuDO.java +++ /dev/null @@ -1,49 +0,0 @@ -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 deleted file mode 100644 index 00c82024a8666669f090455e69b80eabec6a8ed1..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/ModuleDO.java +++ /dev/null @@ -1,46 +0,0 @@ -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 deleted file mode 100644 index 3683e8e201a2b74cb93d3c88c7851a8bbc7e582c..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/RoleDO.java +++ /dev/null @@ -1,43 +0,0 @@ -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 deleted file mode 100644 index c3f80a67a09018d71ab487792d8544c29256e46c..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/RoleGroupDO.java +++ /dev/null @@ -1,43 +0,0 @@ -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 deleted file mode 100644 index 17287c1d66d33956da84e2388dd9875db340ef9b..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/SystemAuthorityDO.java +++ /dev/null @@ -1,40 +0,0 @@ -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 deleted file mode 100644 index b5e0ac79d5a482badb1e29faee53a5d586a77ac3..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/SystemDO.java +++ /dev/null @@ -1,49 +0,0 @@ -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 deleted file mode 100644 index e26cae43d41525a4991dcd1457b10bc2aca1fd94..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/UserGroupDO.java +++ /dev/null @@ -1,46 +0,0 @@ -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-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 deleted file mode 100644 index 4477af52d50eeff2fe71d2bf3e222b00b7d1ddf7..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/AdminAuthorityMapper.java +++ /dev/null @@ -1,59 +0,0 @@ -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 deleted file mode 100644 index 5f20e84940be3d58d95d1086ffecc7a0b7c4000a..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/AuthorityMapper.java +++ /dev/null @@ -1,58 +0,0 @@ -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 deleted file mode 100644 index a0845747e392d2389d50d8f75739c1caa811decd..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/DataAuthorityMapper.java +++ /dev/null @@ -1,59 +0,0 @@ -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 deleted file mode 100644 index 927f1775e2aea58b67d0b317f27d64924e1df0db..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/DataColumnConfigMapper.java +++ /dev/null @@ -1,58 +0,0 @@ -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 deleted file mode 100644 index e092c49436c604b79ffd1db4c130d3a4b15eaee3..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/MenuMapper.java +++ /dev/null @@ -1,66 +0,0 @@ -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 deleted file mode 100644 index bb2ea4fa70469e1cb0dfcdd65fd2bf23ed4f9e6c..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/ModuleMapper.java +++ /dev/null @@ -1,66 +0,0 @@ -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 deleted file mode 100644 index c18818335d3d688650ca6be079f79a822c7a1deb..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/RoleGroupMapper.java +++ /dev/null @@ -1,58 +0,0 @@ -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 deleted file mode 100644 index e5c82e717023014b5c7fb06e2be86f6d59d239ec..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/RoleMapper.java +++ /dev/null @@ -1,58 +0,0 @@ -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 deleted file mode 100644 index 1411e7d070dcb718c28d43b84b095c16c42f38d5..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/SystemAuthorityMapper.java +++ /dev/null @@ -1,59 +0,0 @@ -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 deleted file mode 100644 index 5a733530216e5f13260d63875d82490eb3b19f38..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/SystemMapper.java +++ /dev/null @@ -1,97 +0,0 @@ -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 deleted file mode 100644 index 0b154097d8ee77653acf5a4bb0bbc1a945231e0c..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/UserGroupMapper.java +++ /dev/null @@ -1,58 +0,0 @@ -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 deleted file mode 100644 index b30a73a8a58d0f143d0784ebe40d5d5d46bc6a9f..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/UserRoleMappingMapper.java +++ /dev/null @@ -1,58 +0,0 @@ -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 deleted file mode 100644 index c00c9ae23f06a6012d27874f5fa5e4980926b4b7..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/AuthorityConvert.java +++ /dev/null @@ -1,46 +0,0 @@ -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 deleted file mode 100644 index 717b12916db01b8f5aa6bbf11e4f0dad984a5333..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/DataAuthorityConvert.java +++ /dev/null @@ -1,48 +0,0 @@ -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 deleted file mode 100644 index e72b0aec189e6c80c96ef73c1ba35ee3a23fe90c..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/DataColumnConvert.java +++ /dev/null @@ -1,46 +0,0 @@ -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 deleted file mode 100644 index 7ad1836355c0c080274558c0c932b5834bdfceaf..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/MenuConvert.java +++ /dev/null @@ -1,46 +0,0 @@ -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 deleted file mode 100644 index c85f99100fb347bc7d4058c1f3b538c8301e46e7..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/ModuleConvert.java +++ /dev/null @@ -1,46 +0,0 @@ -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 deleted file mode 100644 index 0a2b40143d6f9b09e189ed93be18b28fc653d3ee..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/RoleConvert.java +++ /dev/null @@ -1,46 +0,0 @@ -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 deleted file mode 100644 index d48207a77b60fd7da40fd1eded0250540b4a24c2..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/RoleGroupConvert.java +++ /dev/null @@ -1,46 +0,0 @@ -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 deleted file mode 100644 index 49d6ca41dff55c3ea300a2f4c2498c37afb7aa51..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/SystemAuthorityConvert.java +++ /dev/null @@ -1,48 +0,0 @@ -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 deleted file mode 100644 index 21d37a07d8b59d2c7dcec947e5d9aa481282cc63..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/SystemConvert.java +++ /dev/null @@ -1,46 +0,0 @@ -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 deleted file mode 100644 index 2b89857214b695bea9036a70f7d3506600d0f198..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/UserGroupConvert.java +++ /dev/null @@ -1,46 +0,0 @@ -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 deleted file mode 100644 index b4ad1b6ab480ab785ff3db1f931832b826082d69..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/gatawayimpl/DataColumnGataWayImpl.java +++ /dev/null @@ -1,63 +0,0 @@ -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 deleted file mode 100644 index f74d5fdc4c4a79bdedfbee53523770c8b84aa3da..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/gatawayimpl/SystemModuleQueryGataWayImpl.java +++ /dev/null @@ -1,113 +0,0 @@ -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 deleted file mode 100644 index d80d2c563c18af6da80fbbfca4f6c7eba0095bb1..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/mq/consumer/DepartmentMqConsumer.java +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index 7a966a4754d0f3614891d857be8061b07dae2509..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/mq/consumer/UserMqConsumer.java +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index 8cf09eff947336c276497830f6a9af92533f81ff..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/mq/handler/UserMqHandler.java +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index 787ca3504fc98825104a3e769f539fc13c107775..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/mq/producer/AuthorityMqProducer.java +++ /dev/null @@ -1,33 +0,0 @@ -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 deleted file mode 100644 index b8a1ac7d79e2a49ff842d41233651a1d48a915cc..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/mq/producer/SystemMqProducer.java +++ /dev/null @@ -1,26 +0,0 @@ -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 deleted file mode 100644 index ffafff993434688170504caa9bb04c1c5e16a870..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/repositoryimpl/AuthorityRepositoryImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -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 deleted file mode 100644 index ec12cf10a9485668817b4ae62cbe92e51d1944a1..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/repositoryimpl/SystemModuleRepositoryImpl.java +++ /dev/null @@ -1,98 +0,0 @@ -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 deleted file mode 100644 index efabf99b30ee3ef71d9014a98b0065be3413030b..0000000000000000000000000000000000000000 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/repositoryimpl/UserRoleRepositoryImpl.java +++ /dev/null @@ -1,89 +0,0 @@ -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-start/pom.xml b/codemaker-cola/cola-start/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..616f0c9770e225af5b4018eb29411ec4b84b9c5d --- /dev/null +++ b/codemaker-cola/cola-start/pom.xml @@ -0,0 +1,51 @@ + + + + 4.0.0 + + codemaker-cola + com.codemaker.cola + 1.0-SNAPSHOT + + com.codemaker.cola + cola-start + 1.0-SNAPSHOT + + cola-start + + http://www.example.com + + + UTF-8 + 1.7 + 1.7 + + + + + junit + junit + 4.11 + test + + + org.springframework.boot + spring-boot + + + + org.springframework.boot + spring-boot-starter-web + + + + org.mybatis + mybatis-spring + 2.0.5 + + + + + + diff --git a/codemaker-cola/pom.xml b/codemaker-cola/pom.xml index 5ddc90670647acae6ed28c4f433ddb5ed1d447ad..39b10d2ed35f2268d4411cf4c5ab706b23122058 100644 --- a/codemaker-cola/pom.xml +++ b/codemaker-cola/pom.xml @@ -14,6 +14,8 @@ cola-infrast cola-app cola-client + cola-start + cola-feign-api codemaker-cola @@ -112,6 +114,12 @@ 1.2.72 + + com.dtflys.forest + forest-spring-boot-starter + 1.5.16 + + commons-lang commons-lang @@ -173,6 +181,19 @@ ${rocketmq.version} + + + com.coderman.infosys.plat.user + user-client + 1.1-SNAPSHOT + + + + cn.hutool + hutool-core + 5.3.10 + + diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/InfrastInvokeHandler.java b/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/InfrastInvokeHandler.java deleted file mode 100644 index c207294ce977060036a9de3610df135c1f1ece97..0000000000000000000000000000000000000000 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/InfrastInvokeHandler.java +++ /dev/null @@ -1,21 +0,0 @@ -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; - -/** - * Description:基础设施层infrast调用方 方法绘制处理器 - * date: 2021/10/21 - * - * @author fanchunshuai - * @version 1.0.0 - * @since JDK 1.8 - */ -@Service(value = "infrastInvokeHandler") -public class InfrastInvokeHandler implements InvokeHandler { - @Override - public void dealInvoke(InvokeContextBean invokeBean) { - invokeBean.getInvokerMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(),invokeBean.getCurrentInvokeRowBean()); - } -} diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/utils/StringCheckUtils.java b/codemaker-core/src/main/java/com/coderman/codemaker/utils/StringCheckUtils.java deleted file mode 100644 index 410dfeee2059cb18bde6c1b60534579f62a6a72f..0000000000000000000000000000000000000000 --- a/codemaker-core/src/main/java/com/coderman/codemaker/utils/StringCheckUtils.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.coderman.codemaker.utils; - -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -/** - * Description: - * date: 2021/10/12 - * - * @author fanchunshuai - * @version 1.0.0 - * @since JDK 1.8 - */ -public class StringCheckUtils { - /** - * 判断字符串中是否包含中文 - * @param str - * 待校验字符串 - * @return 是否为中文 - * @warn 不能校验是否为中文标点符号 - */ - public static boolean isContainChinese(String str) { - Pattern p = Pattern.compile("[\u4e00-\u9fa5]"); - Matcher m = p.matcher(str); - if (m.find()) { - return true; - } - return false; - } -} 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 deleted file mode 100644 index d8bbca08526e89fcf15e9b3ada3733cd07f96d19..0000000000000000000000000000000000000000 --- a/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/datacolumncontextseq.puml +++ /dev/null @@ -1,25 +0,0 @@ -@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/projecttemplate-cola.properties b/codemaker-core/src/main/resources/projecttemplate-cola.properties deleted file mode 100644 index 6ee6f50a00945a8ea54816426ab3bea409a30a7a..0000000000000000000000000000000000000000 --- a/codemaker-core/src/main/resources/projecttemplate-cola.properties +++ /dev/null @@ -1,17 +0,0 @@ - -#数据库名称 -cola.global.dbName=infosys_auth - -cola.global.applicationName=infosys-auth - -#目标工程输出目录，这里填写对应的工程的绝对路径 -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=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 deleted file mode 100644 index 489f81ff7ccbf1b3e1c41d8f8063aa024dfb2ee8..0000000000000000000000000000000000000000 --- a/codemaker-core/src/main/resources/projecttemplate-dubbo.properties +++ /dev/null @@ -1,14 +0,0 @@ - -#数据库名称 -dubbo.global.dbName=infosys_auth -dubbo.global.applicationName=infosys-auth - -#目标工程输出目录，这里填写对应的工程的绝对路径 -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=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 deleted file mode 100644 index 2eeadcac8be350d6558b2f4b95444ed7ac30336e..0000000000000000000000000000000000000000 --- a/codemaker-core/src/main/resources/projecttemplate-springboot.properties +++ /dev/null @@ -1,16 +0,0 @@ -#数据库名称 -springboot.global.dbName=infosys_auth - -#项目名称 -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/shenshuai/myspace/code-maker/codemaker-springboot - -#应用服务的plantUML类图文件,不配置则走基于数据表的方式生成代码 -codemaker.domain.plantuml=auth-domain.puml -#codemaker.domain.plantuml=SchoolManager.puml \ No newline at end of file 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 deleted file mode 100644 index c4f009a2e1e424f9320eaac3a67aa3c0e1283e32..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/AuthorityResponseDTO.java +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index 7d88490d10f518c71756dfba2fdd0b4199c92908..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/CreateAuthorityRequestDTO.java +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index e1556aae2dee6ea5eaf1ab2956286f3439e42e2f..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/CreateDataAuthorityRequestDTO.java +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index 3c110d389a0459beecd9acf9aefb990d331a2d00..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/CreateMenuRequestDTO.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index 300ae1cc53082d858c0d8f5236d9e8c51bfef215..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/CreateModuleRequestDTO.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index 9a0d08c5f2c8db4451e26e1efe573df682d21a38..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/CreateRoleRequestDTO.java +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index a69502ab4a4af529334e2d300596304d947da2af..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/CreateSystemAuthorityRequestDTO.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index dbe4a0597dd46d0d5c3ef7b7d839f9aafb5660a0..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/CreateSystemRequestDTO.java +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index 93f48a5532dad44bd5f2f422ca4b78063c25a70a..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/CreateUserGroupRequestDTO.java +++ /dev/null @@ -1,33 +0,0 @@ -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 deleted file mode 100644 index 0c1eff881ccf3ccd85032ab0f110d7d4ad17ed3b..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/DataAuthorityResponseDTO.java +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index c835de8317c0a6c4b2ca13758efe435fdb5d0290..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/MenuResponseDTO.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index e18c2a0fd7f6b0bac445c1ff74c69a120af89be1..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/ModuleResponseDTO.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index 5e72c4060851551753ac720bb62883e2af736e74..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/RoleGroupResponseDTO.java +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index fe314d5c98af89ee32bb2b92a6ad3aa0ec0c195e..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/RoleResponseDTO.java +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index 46f4667189e2f11afc5b49dbd231522ded474b37..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/SystemAuthorityResponseDTO.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index b73dc57e9adf27c3fb23a69579e6ba49bb0bbbe0..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/SystemDTO.java +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index c60bd6176accd5c25f6b8380e601c2bcbf617aa3..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/UpdateAuthorityRequestDTO.java +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index 72ae76085d17f3a21a711254913b7ed48d6f3229..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/UpdateDataAuthorityRequestDTO.java +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index 29070a72b1a1ebe416d58544763bbe3b705ada83..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/UpdateMenuRequestDTO.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index cecb068692499b35b3c98febb4f04879e7567659..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/UpdateModuleRequestDTO.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index 3c7e669f34d9851b8b1d09776b188d696ad87f42..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/UpdateRoleGroupRequestDTO.java +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index 496f0b05ed6208f9e664714510280d58e0b3c69b..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/UpdateRoleRequestDTO.java +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index 27e4d56eaaead3629e076c4c04ba0c72bacd3999..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/UpdateSystemAuthorityRequestDTO.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index f4f0ba03bd914f514359384fa32d50971793345b..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/UpdateSystemRequestDTO.java +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index 9182b480e51a06407b143e2a4ff365adcc69996d..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/UpdateUserGroupRequestDTO.java +++ /dev/null @@ -1,33 +0,0 @@ -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 deleted file mode 100644 index d9911d5a9a49aa930ade9642a200e4bf25c5221b..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/dto/UserGroupResponseDTO.java +++ /dev/null @@ -1,33 +0,0 @@ -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 deleted file mode 100644 index 8460dd08070cdaa3b616981dc317725add1094b5..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/enums/AuthorityTypeEnum.java +++ /dev/null @@ -1,45 +0,0 @@ -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 deleted file mode 100644 index 37733b40d68fb840cfab462ba0bb076c7240d144..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/facade/AuthorityFacade.java +++ /dev/null @@ -1,49 +0,0 @@ -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 deleted file mode 100644 index 33c416e3428ff5145a8ac42cf7dc2318ec8bc9fc..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/facade/DataAuthorityFacade.java +++ /dev/null @@ -1,32 +0,0 @@ -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 deleted file mode 100644 index a14ad0ac9fe04708af091d920ac3b8d08b408b06..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/facade/MenuFacade.java +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index fcc27512eef64a525f9ac1955f86793eb42c96b2..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/facade/ModuleFacade.java +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index b86fe0be2d937b806af13b729161ea3d5217cd5f..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/facade/RoleFacade.java +++ /dev/null @@ -1,22 +0,0 @@ -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 deleted file mode 100644 index 1478ec035d95a639af2db88a76c6df8412f773b2..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/facade/RoleGroupFacade.java +++ /dev/null @@ -1,22 +0,0 @@ -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 deleted file mode 100644 index cad8108fc9dc62f4c7809f27222294fb5158f1e4..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/facade/SystemAuthorityFacade.java +++ /dev/null @@ -1,23 +0,0 @@ -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 deleted file mode 100644 index 0c5973140d7f3eb5f430dbdce0841dec59825624..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/facade/SystemFacade.java +++ /dev/null @@ -1,57 +0,0 @@ -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 deleted file mode 100644 index fe6fa537c08ad987dd5d362b44a225f208cd3e75..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/facade/UserGroupFacade.java +++ /dev/null @@ -1,23 +0,0 @@ -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 deleted file mode 100644 index fceae83bd79b0ed9a6a90abcc1c364fe3a5274ea..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-api/src/main/java/com/coderman/infosys/auth/api/facade/UserGroupQueryFacade.java +++ /dev/null @@ -1,22 +0,0 @@ -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-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 index 19f806a0c5998170aa6d3989f0b2a9ff10e5642c..a3f74955516d334b08807500ca42e6d45fa97696 100644 --- 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 @@ -8,7 +8,7 @@ import lombok.ToString; /** * @Description:行政数据权限DO类 * @Author:shenshuai - * @CreateTime:2021-11-07 08:18:28 + * @CreateTime:2021-12-24 23:17:12 * @version v1.0 */ @Data 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 index 39d72edb3413ea40478e636bbc0701638263cc7f..2660be01c42f60b8d27ab7e4ba4c132c7ff8cf16 100644 --- 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 @@ -8,7 +8,7 @@ import lombok.ToString; /** * @Description:抽象权限表DO类 * @Author:shenshuai - * @CreateTime:2021-11-07 08:18:28 + * @CreateTime:2021-12-24 23:17:12 * @version v1.0 */ @Data 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 index a3abdd2457a7cfb9e71bf5372b6f93902c450c41..25a2ef805c89c5fb21cc628e6a525b635c7f6bcd 100644 --- 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 @@ -8,7 +8,7 @@ import lombok.ToString; /** * @Description:数据字段权限DO类 * @Author:shenshuai - * @CreateTime:2021-11-07 08:18:28 + * @CreateTime:2021-12-24 23:17:12 * @version v1.0 */ @Data 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 index d3ad1b46853e4415fb0693fa344091ffde08af64..c7d7226f494811fc33f1b421e2ed1476e6cd504d 100644 --- 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 @@ -8,7 +8,7 @@ import lombok.ToString; /** * @Description:数据字段管理表DO类 * @Author:shenshuai - * @CreateTime:2021-11-07 08:18:28 + * @CreateTime:2021-12-24 23:17:12 * @version v1.0 */ @Data 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 index 5b85cffedb6ce008c2aa0dfe90ee190b0fd6e515..e4111fe214af69387d85c0319c0cec3778dc9d56 100644 --- 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 @@ -8,7 +8,7 @@ import lombok.ToString; /** * @Description:按钮表DO类 * @Author:shenshuai - * @CreateTime:2021-11-07 08:18:28 + * @CreateTime:2021-12-24 23:17:12 * @version v1.0 */ @Data 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 index 646dc9764f957d1e29ab12e47f1ff4bd7da1a699..68ee0598f11c08c23023420e7cad7efc1a2186ed 100644 --- 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 @@ -8,7 +8,7 @@ import lombok.ToString; /** * @Description:菜单模块表DO类 * @Author:shenshuai - * @CreateTime:2021-11-07 08:18:28 + * @CreateTime:2021-12-24 23:17:12 * @version v1.0 */ @Data 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 index 329acd4da8eab872f3488149d5326f11cfcab9c5..35e150e360a43e2888d3dfe8d84e931e2e8de240 100644 --- 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 @@ -8,7 +8,7 @@ import lombok.ToString; /** * @Description:角色表DO类 * @Author:shenshuai - * @CreateTime:2021-11-07 08:18:28 + * @CreateTime:2021-12-24 23:17:12 * @version v1.0 */ @Data 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 index 39468390577f4479cc9a11e10ff6b4a91ab94318..1aa7f73d9fc564ff572cc59d09f45a4d7cbdbfac 100644 --- 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 @@ -8,7 +8,7 @@ import lombok.ToString; /** * @Description:角色组DO类 * @Author:shenshuai - * @CreateTime:2021-11-07 08:18:28 + * @CreateTime:2021-12-24 23:17:12 * @version v1.0 */ @Data 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 index 0da1ab4e3242aa8f718f33b868df6e1de55f5821..fbf02679bacb6ff9b3556e5c6d0521dfb6310e79 100644 --- 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 @@ -8,7 +8,7 @@ import lombok.ToString; /** * @Description:系统菜单权限表DO类 * @Author:shenshuai - * @CreateTime:2021-11-07 08:18:28 + * @CreateTime:2021-12-24 23:17:12 * @version v1.0 */ @Data 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 index 475dfb33714462a6c734c072bfc66f35663e9dbf..28a1a6ad39799943a6ff964ecba98f6809dee49f 100644 --- 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 @@ -8,7 +8,7 @@ import lombok.ToString; /** * @Description:系统表DO类 * @Author:shenshuai - * @CreateTime:2021-11-07 08:18:28 + * @CreateTime:2021-12-24 23:17:12 * @version v1.0 */ @Data 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 index 561665615dfc5771e07e1e190b03e22d1cabfe8a..431019e8495c1e1513728188b96a8a323847fdc9 100644 --- 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 @@ -8,7 +8,7 @@ import lombok.ToString; /** * @Description:用户组DO类 * @Author:shenshuai - * @CreateTime:2021-11-07 08:18:28 + * @CreateTime:2021-12-24 23:17:12 * @version v1.0 */ @Data diff --git a/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/UserRoleMappingDO.java b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/UserRoleMappingDO.java index f494743692078eff3bda157003fd2363f88e9d5d..eaccb516ae11a29753b3e49b64c872eec8003c62 100644 --- a/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/UserRoleMappingDO.java +++ b/codemaker-dubbo/dubbo-common/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/UserRoleMappingDO.java @@ -8,7 +8,7 @@ import lombok.ToString; /** * @Description:用户角色关联表DO类 * @Author:shenshuai - * @CreateTime:2021-11-07 08:18:28 + * @CreateTime:2021-12-24 23:17:12 * @version v1.0 */ @Data 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 index 950d4499ff7af77a2b9e180dd7ce49f851feb13a..9dc71bc3737f7257003062dbb698306149e82c8b 100644 --- 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 @@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Param; /** * @Description:行政数据权限接口 * @Author: -* @CreateTime:2021-11-07 08:18:28 +* @CreateTime:2021-12-24 23:17:12 * @version v1.0 */ @Mapper 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 index 63d9d476d5895592c76e5665ff5dddcb12ad1cd5..e3002b114f32859db79bd2844212e6f980019ab6 100644 --- 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 @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Param; /** * @Description:抽象权限表接口 * @Author: -* @CreateTime:2021-11-07 08:18:28 +* @CreateTime:2021-12-24 23:17:12 * @version v1.0 */ @Mapper 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 index 42e9bc44b6aa7064db216202eacdad892593a262..f98bf8089fb8a8f5f095548615ce01f113903853 100644 --- 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 @@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Param; /** * @Description:数据字段权限接口 * @Author: -* @CreateTime:2021-11-07 08:18:28 +* @CreateTime:2021-12-24 23:17:12 * @version v1.0 */ @Mapper 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 index ae0a4a000f36eadb8dd73dbb68bc78b5f44c4056..dda7126e13ea5f90f3564094d2d07944f5003366 100644 --- 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 @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Param; /** * @Description:数据字段管理表接口 * @Author: -* @CreateTime:2021-11-07 08:18:28 +* @CreateTime:2021-12-24 23:17:12 * @version v1.0 */ @Mapper 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 index 5b97c1f00a61400f69c24a56482058598f6814cb..5335ef9c15270650a6fce2db26b632e882fa48c5 100644 --- 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 @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Param; /** * @Description:按钮表接口 * @Author: -* @CreateTime:2021-11-07 08:18:28 +* @CreateTime:2021-12-24 23:17:12 * @version v1.0 */ @Mapper @@ -54,12 +54,4 @@ public interface MenuMapper{ */ 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 index 23bc0b14488d12b3ad7a263e54f56c9302f9af36..14b11b10c77d90a0ae0234a9f08ccb2f28aafd2d 100644 --- 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 @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Param; /** * @Description:菜单模块表接口 * @Author: -* @CreateTime:2021-11-07 08:18:28 +* @CreateTime:2021-12-24 23:17:12 * @version v1.0 */ @Mapper @@ -54,12 +54,4 @@ public interface ModuleMapper{ */ 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 index dbb16beff470222c336b00f2cd8f9174f6302131..3c0f6fb4d95aafb00b9f4fd49cf7d2544f666bed 100644 --- 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 @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Param; /** * @Description:角色组接口 * @Author: -* @CreateTime:2021-11-07 08:18:28 +* @CreateTime:2021-12-24 23:17:12 * @version v1.0 */ @Mapper 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 index 1df2b2048b733bb961f79c4b1a26f52756b8a947..36700f29b93b8d81fff308e7bb442886e5dd1ebb 100644 --- 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 @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Param; /** * @Description:角色表接口 * @Author: -* @CreateTime:2021-11-07 08:18:28 +* @CreateTime:2021-12-24 23:17:12 * @version v1.0 */ @Mapper 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 index 13744086b851030db3d21441d47a44787c4404b3..0d1ccbd7e21625187944d64d9c5ebbec85e5bdb3 100644 --- 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 @@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Param; /** * @Description:系统菜单权限表接口 * @Author: -* @CreateTime:2021-11-07 08:18:28 +* @CreateTime:2021-12-24 23:17:12 * @version v1.0 */ @Mapper 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 index 9109ae0486df7bad4365c326f6f1dba44c477e6c..52849e0291e4146e17f88df28f866086e52a23d7 100644 --- 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 @@ -1,7 +1,6 @@ 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; @@ -10,7 +9,7 @@ import org.apache.ibatis.annotations.Param; /** * @Description:系统表接口 * @Author: -* @CreateTime:2021-11-07 08:18:28 +* @CreateTime:2021-12-24 23:17:12 * @version v1.0 */ @Mapper @@ -55,42 +54,4 @@ public interface SystemMapper{ */ 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 index 078e5afa4497b6923e54fd0acd47920ca6192c8f..9e8718e285a47084b246cfdadbf9d28083d1b846 100644 --- 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 @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Param; /** * @Description:用户组接口 * @Author: -* @CreateTime:2021-11-07 08:18:28 +* @CreateTime:2021-12-24 23:17:12 * @version v1.0 */ @Mapper 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 index 1833673d5592e1aadcbb48a085bb827f9ea21c43..96953e0dc11ea5d029a30511877695f6514f66a3 100644 --- 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 @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Param; /** * @Description:用户角色关联表接口 * @Author: -* @CreateTime:2021-11-07 08:18:28 +* @CreateTime:2021-12-24 23:17:12 * @version v1.0 */ @Mapper 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 deleted file mode 100644 index 542b9df2ebfe065b9c372adbde06a0eaef713e57..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/command/AbstractCmd.java +++ /dev/null @@ -1,40 +0,0 @@ -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 deleted file mode 100644 index 718f85298952365daaaf3664e3c518d68be28094..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/command/AddRoleAuthCmd.java +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index 153c8299c433c9d98dc3d50cc016c77402ddbc7c..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/command/AddUserAuthCmd.java +++ /dev/null @@ -1,39 +0,0 @@ -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 deleted file mode 100644 index 4cc5fb351a71500a802f44bc0f6dd2ffffa49a0c..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/command/AddUserCmd.java +++ /dev/null @@ -1,34 +0,0 @@ -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 deleted file mode 100644 index c237bf48887d6b6672e0022d2a2ab997e525db64..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/command/AddUserGroupCmd.java +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index d1540bd185268c618368209dd5d7295116c72e68..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/command/UpdateRoleAuthCmd.java +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index b89887535c0ab34586fa87ce3b400c62db398d14..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/command/UpdateUserAuthCmd.java +++ /dev/null @@ -1,34 +0,0 @@ -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 deleted file mode 100644 index 96cd49872553196c9409a73c0cb3e3d2338eda83..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/convert/AuthorityConvert.java +++ /dev/null @@ -1,60 +0,0 @@ -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 deleted file mode 100644 index 86a7db2346a8eddc3f309444308ac5f24cb05c51..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/convert/DataAuthorityConvert.java +++ /dev/null @@ -1,61 +0,0 @@ -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 deleted file mode 100644 index a49b299134579dec6d9007a79f64ea088544d75f..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/convert/MenuConvert.java +++ /dev/null @@ -1,60 +0,0 @@ -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 deleted file mode 100644 index e02b48cd55f45377e490e33acd845ea822e46da2..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/convert/ModuleConvert.java +++ /dev/null @@ -1,60 +0,0 @@ -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 deleted file mode 100644 index 7a075da01dcbb5801eaa86f5fbee198b1282ee8d..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/convert/RoleConvert.java +++ /dev/null @@ -1,60 +0,0 @@ -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 deleted file mode 100644 index f06dc524c6eff1fef7cd5226d232a768c0876e4e..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/convert/RoleGroupConvert.java +++ /dev/null @@ -1,47 +0,0 @@ -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 deleted file mode 100644 index 8c1204ed666d9a61caa327a0076e47f83422dc13..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/convert/SystemAuthorityConvert.java +++ /dev/null @@ -1,61 +0,0 @@ -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 deleted file mode 100644 index c3048655b50bbb32a4033388bd40c2f1e2ffcda6..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/convert/SystemConvert.java +++ /dev/null @@ -1,72 +0,0 @@ -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 deleted file mode 100644 index a04ab037c093befac71816f5a2b9286620460c82..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/convert/UserGroupConvert.java +++ /dev/null @@ -1,60 +0,0 @@ -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 deleted file mode 100644 index fe6da3b47388c2b0d6f77e56e61a2dcac68b7890..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/exe/CmdExeService.java +++ /dev/null @@ -1,19 +0,0 @@ -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 deleted file mode 100644 index 1f47429df5e9013f5587052acf6f0dc70c423361..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/exe/RoleAuthCmdExe.java +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index 7b24f1ef5f840ce8b754c11d3298b11cc5504090..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/exe/UserAuthCmdExe.java +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index 65f2452c210a147deabcadbdc16adff9101f2c27..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/exe/UserCmdExe.java +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index 166c035ef4a988c2fdc69659849ed591e15383c4..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/exe/UserGroupCmdExe.java +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index 2e8b3d18f4cc1343338a84e060267b500ae123f7..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/facadeimpl/AuthorityFacadeImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -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 deleted file mode 100644 index 60a1029aba612b0b32bae6279781ead1606aa34d..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/facadeimpl/DataAuthorityFacadeImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -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 deleted file mode 100644 index 53074831f4a03b8d2a95827b10b7a164f96eefce..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/facadeimpl/MenuFacadeImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -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 deleted file mode 100644 index a7f36d88eb0f1f75f4cf794096ae3e878c171158..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/facadeimpl/ModuleFacadeImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -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 deleted file mode 100644 index e1b0e3ea79021e347deeae35c5ed7a579740f89f..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/facadeimpl/RoleFacadeImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -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 deleted file mode 100644 index a2a18a96dd0aa0b73e3152a01de8a7ce8010382f..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/facadeimpl/RoleGroupFacadeImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -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 deleted file mode 100644 index 7e9fda147e50e709cccb3e4bc69b80e9a151444f..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/facadeimpl/SystemAuthorityFacadeImpl.java +++ /dev/null @@ -1,32 +0,0 @@ -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 deleted file mode 100644 index da48ce25f989908f06b3879ac3f9a3d8a461afee..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/facadeimpl/SystemFacadeImpl.java +++ /dev/null @@ -1,77 +0,0 @@ -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 deleted file mode 100644 index b74f6c06529c89be7b56de62ea33ba6a97e6a353..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/facadeimpl/UserGroupFacadeImpl.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index f05b67aa344c4ddd27cf49eaad152dfda3248e43..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/app/facadeimpl/UserGroupQueryFacadeImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -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 deleted file mode 100644 index fec8b49ea785cd41a3a341df475899226390d9df..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/AdminAuthorityBO.java +++ /dev/null @@ -1,39 +0,0 @@ -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 deleted file mode 100644 index 3a6e90c9b64d86e443f7970c3adf0bf1d40071b8..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/AuthAggregateBO.java +++ /dev/null @@ -1,50 +0,0 @@ -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 deleted file mode 100644 index 61784a6d8be45fb4db786b33678bd57bb6b5343a..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/AuthorityBO.java +++ /dev/null @@ -1,65 +0,0 @@ -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 deleted file mode 100644 index 405487a088ea8a240908ce60b4d1c2cd03ce6bb9..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/AuthorityUpdateRequestBO.java +++ /dev/null @@ -1,24 +0,0 @@ -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 deleted file mode 100644 index eae97fd4f65ddb85e2d29ed95e247ca0bb4be258..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/BasicOperateBO.java +++ /dev/null @@ -1,40 +0,0 @@ -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 deleted file mode 100644 index b475d38052853d40054cd0467469ed21c693dbd4..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/DataAuthorityBO.java +++ /dev/null @@ -1,34 +0,0 @@ -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 deleted file mode 100644 index 115e2b3d5d207218db257d65584698f09e689da1..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/DataColumnBO.java +++ /dev/null @@ -1,59 +0,0 @@ -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 deleted file mode 100644 index c7f0001d1552d8816796d68210f6ea6a47dd2cff..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/MenuBO.java +++ /dev/null @@ -1,49 +0,0 @@ -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 deleted file mode 100644 index a4e591141a7158614ca97398c63fb7c1e9e687da..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/ModuleBO.java +++ /dev/null @@ -1,50 +0,0 @@ -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 deleted file mode 100644 index cac1a438fd959732a49c98c62f01af9790bb1f73..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/OperateDateBO.java +++ /dev/null @@ -1,30 +0,0 @@ -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 deleted file mode 100644 index 3c420e5fd8bb6fe65f665ce2cfe472b6cf7af6bf..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/OperatorBO.java +++ /dev/null @@ -1,30 +0,0 @@ -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 deleted file mode 100644 index 98c6fdece67a4b45f5917fbcede8fbb36a4d7f80..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/RoleAuthAggregateBO.java +++ /dev/null @@ -1,24 +0,0 @@ -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 deleted file mode 100644 index 8467615919ecb930872daa5da88c101706679486..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/RoleBO.java +++ /dev/null @@ -1,45 +0,0 @@ -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 deleted file mode 100644 index 4929938839c0cfabeed6b74c0cae11085c558a4a..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/RoleGroupBO.java +++ /dev/null @@ -1,45 +0,0 @@ -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 deleted file mode 100644 index 73f8fcfefa5c51cc78d89257e861795c6983af44..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/SystemAuthorityBO.java +++ /dev/null @@ -1,49 +0,0 @@ -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 deleted file mode 100644 index 1ecdf240891e4defd623822f4e1e342eb36130c1..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/SystemBO.java +++ /dev/null @@ -1,65 +0,0 @@ -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 deleted file mode 100644 index 4d3be92a4dda89bcb60f56b6b528a7e06b9e7eca..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/SystemConfig.java +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index a517d753113e8925c26813d89f547cd76aaa0ed5..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/UserAuthAggregateBO.java +++ /dev/null @@ -1,24 +0,0 @@ -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 deleted file mode 100644 index a93b20933c563fead260cbf37d81e5f4da3b18f8..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/UserBO.java +++ /dev/null @@ -1,40 +0,0 @@ -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 deleted file mode 100644 index 75ba43d8869119e5221a1e5aa6c51c45db6056e2..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/bo/UserGroupBO.java +++ /dev/null @@ -1,55 +0,0 @@ -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 deleted file mode 100644 index 1a42b40af1bc723e1472273a998bfc5a0691278a..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/enums/AuthorityTypeEnum.java +++ /dev/null @@ -1,45 +0,0 @@ -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 deleted file mode 100644 index 35f17cc14e03c3c326db7b1fd15c8e31fd8fee2f..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/event/BaseEvent.java +++ /dev/null @@ -1,18 +0,0 @@ -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 deleted file mode 100644 index baf5a04249bdf643a1a728beb4e872fc2e140799..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/event/MenuChangeEvent.java +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index 5732f498a75f1c21e7b37f5d6d4127176b4e8838..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/event/RoleAuthChangeEvent.java +++ /dev/null @@ -1,27 +0,0 @@ -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 deleted file mode 100644 index b647e7328389f77cb84c296f97dc7b830d240c13..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/event/RoleChangeEvent.java +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index 5962ff54a3ef7d0b951297baf441cd7b6d06629f..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/factory/AuthorityFactory.java +++ /dev/null @@ -1,43 +0,0 @@ -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 deleted file mode 100644 index d78223d00019b8d23cd33f5428ac1c0fe63d6b60..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/gataway/AuthorityRepository.java +++ /dev/null @@ -1,44 +0,0 @@ -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 deleted file mode 100644 index 0b7dec8dff0871cc3e2df3345c198270d8484946..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/gataway/DataColumnGataWay.java +++ /dev/null @@ -1,51 +0,0 @@ -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 deleted file mode 100644 index c5ba07c544df9dd63d8fd358fe8cfd146d96f044..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/gataway/SystemModuleQueryGataWay.java +++ /dev/null @@ -1,71 +0,0 @@ -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 deleted file mode 100644 index 0995b18466c19a82790ab42e5bfaa2f7d4bc3a4f..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/gataway/SystemModuleRepository.java +++ /dev/null @@ -1,51 +0,0 @@ -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 deleted file mode 100644 index 2bf784c96b6c0497a97efb1edb5eec28090ceefd..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/gataway/UserRoleRepository.java +++ /dev/null @@ -1,77 +0,0 @@ -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 deleted file mode 100644 index 9c560e71be6379cea95fa006873b330ef349f292..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/domain/msgbody/UserStatusChangeMsgBody.java +++ /dev/null @@ -1,23 +0,0 @@ -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 deleted file mode 100644 index dedb22816bc2d66e1e94829e1ac4cf68eb610ca2..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/acl/AreaServiceAdapter.java +++ /dev/null @@ -1,27 +0,0 @@ -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 deleted file mode 100644 index 572e180b348d2e03c8b2b1b3da54e22521d427c2..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/acl/DepartmentServiceAdapter.java +++ /dev/null @@ -1,27 +0,0 @@ -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 deleted file mode 100644 index fc903e2cc6363c92450527de81a2f8ef1b9b1436..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/acl/impl/AreaServiceAdapterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -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 deleted file mode 100644 index 839a585866e864e19c51c499a46783a4305b44c4..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/acl/impl/DepartmentServiceAdapterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -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 deleted file mode 100644 index daaca7832a8b1ccb6157882c66392e2ca3499ca7..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/acl/req/dto/DepartmentQueryDTO.java +++ /dev/null @@ -1,19 +0,0 @@ -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 deleted file mode 100644 index d6dea7b346a9270aa07933a15277bf3b7d453dc2..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/acl/res/dto/CityResponseDTO.java +++ /dev/null @@ -1,19 +0,0 @@ -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 deleted file mode 100644 index f69b545beb769fec74bee1d950b10319d870f81d..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/acl/res/dto/DepartmentResponseDTO.java +++ /dev/null @@ -1,19 +0,0 @@ -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 deleted file mode 100644 index f06811ba46cf19fb7a9eb6a609dc5e87fa335c24..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/acl/res/dto/ProvinceResponseDTO.java +++ /dev/null @@ -1,19 +0,0 @@ -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 deleted file mode 100644 index 36a59e8bc00649c13359834303034f103d5f97f0..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/AuthorityConvert.java +++ /dev/null @@ -1,46 +0,0 @@ -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 deleted file mode 100644 index 2bf6e7608c5bdf2593896b439a657b5cf8c3c427..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/DataAuthorityConvert.java +++ /dev/null @@ -1,48 +0,0 @@ -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 deleted file mode 100644 index 98ba351f120852a53ef1da5bcc65f6ad09bbc18a..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/DataColumnConvert.java +++ /dev/null @@ -1,46 +0,0 @@ -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 deleted file mode 100644 index e555558072a5719368e756f6e5a04da72a6d9871..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/MenuConvert.java +++ /dev/null @@ -1,46 +0,0 @@ -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 deleted file mode 100644 index 48dd853cb33b3318ddd92ca13db93d334887b4d1..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/ModuleConvert.java +++ /dev/null @@ -1,46 +0,0 @@ -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 deleted file mode 100644 index 71047a38c640152992182a5d8b3005ae38d41d3f..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/RoleConvert.java +++ /dev/null @@ -1,46 +0,0 @@ -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 deleted file mode 100644 index 361f13473c071424ace50914e632fbdc9451687e..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/RoleGroupConvert.java +++ /dev/null @@ -1,46 +0,0 @@ -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 deleted file mode 100644 index 8bd6607f8ad9e4edf693e35b50db9d3f6c36a322..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/SystemAuthorityConvert.java +++ /dev/null @@ -1,48 +0,0 @@ -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 deleted file mode 100644 index 10f6c1c0a726c5fef839ce05649741dd3b8d3f67..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/SystemConvert.java +++ /dev/null @@ -1,46 +0,0 @@ -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 deleted file mode 100644 index 99757d7feba9cfb695b20e0c9db45680743d1f7e..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/UserGroupConvert.java +++ /dev/null @@ -1,46 +0,0 @@ -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 deleted file mode 100644 index 550c0fb87cdf6ea1e25a51c707cf04b43c0ae94c..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/gatawayimpl/DataColumnGataWayImpl.java +++ /dev/null @@ -1,63 +0,0 @@ -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 deleted file mode 100644 index 867b71a24de2a9ff15f925c70c7eab6df1bfafcc..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/gatawayimpl/SystemModuleQueryGataWayImpl.java +++ /dev/null @@ -1,113 +0,0 @@ -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 deleted file mode 100644 index 62db3953c77207db7e9951df051319778f67ff69..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/mq/consumer/DepartmentMqConsumer.java +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index 7a95e38322a4d45fd5d41437c87d138786e152b3..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/mq/consumer/UserMqConsumer.java +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index 118b8fd0763b6f35104c102a03e1a21d6958f442..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/mq/handler/UserMqHandler.java +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index c20976edfa59c5caaf546c4ea32b0141f9be768e..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/mq/producer/AuthorityMqProducer.java +++ /dev/null @@ -1,33 +0,0 @@ -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 deleted file mode 100644 index d352a89a319b5fbf91c71497348f9f8f666162ea..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/mq/producer/SystemMqProducer.java +++ /dev/null @@ -1,26 +0,0 @@ -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 deleted file mode 100644 index 8557cdc7389fe889f2d4610dfb8bbcef7efaa4e2..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/repositoryimpl/AuthorityRepositoryImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -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 deleted file mode 100644 index c9c407cc9a7f7ca7b10eb47640579680a22266a8..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/repositoryimpl/SystemModuleRepositoryImpl.java +++ /dev/null @@ -1,98 +0,0 @@ -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 deleted file mode 100644 index 184beddda6eb9ebd4c05368bcc7ce619ae41d99b..0000000000000000000000000000000000000000 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/infrast/repositoryimpl/UserRoleRepositoryImpl.java +++ /dev/null @@ -1,89 +0,0 @@ -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-parent/codemaker-api/pom.xml b/codemaker-parent/codemaker-api/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..cf8fe0975ff92ced3721baeec46ca330fc9170a2 --- /dev/null +++ b/codemaker-parent/codemaker-api/pom.xml @@ -0,0 +1,67 @@ + + + + 4.0.0 + + com.coderman.codemaker + codemaker-parent + 1.2.2-SNAPSHOT + + com.coderman.codemaker + codemaker-api + 1.0-SNAPSHOT + jar + + codemaker-api + + http://www.example.com + + + UTF-8 + 1.8 + 1.8 + + + + + junit + junit + 4.11 + test + + + + com.google.collections + google-collections + 1.0 + + + + org.projectlombok + lombok + 1.18.12 + + + + org.apache.commons + commons-lang3 + 3.11 + + + + org.apache.commons + commons-collections4 + 4.3 + + + + com.alibaba + fastjson + 1.2.72 + + + + + + diff --git a/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/api/ICompDecorateService.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/api/ICompDecorateService.java new file mode 100644 index 0000000000000000000000000000000000000000..01d984818ae65c689154b0889cd9be29f45e68a9 --- /dev/null +++ b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/api/ICompDecorateService.java @@ -0,0 +1,23 @@ +package com.coderman.codemaker.api; + +import com.coderman.codemaker.bean.component.ComponentContextBean; +import com.coderman.codemaker.bean.plantuml.PlantUmlContextBean; + +/** + * Description: 组件规则定义完成之后，需要将 + * 组件包相关的类接口枚举注解等应用到对应的代码元素上 + * date: 2021/11/23 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +@FunctionalInterface +public interface ICompDecorateService { + /** + * 组件上下文与代码模型上下文进行融合，对相关的代码元素做包装和装饰 + * @param componentContextBean 组件上下文 + * @param plantUmlContextBean 代码元素模型上下文 + */ + void decorateComp(ComponentContextBean componentContextBean, PlantUmlContextBean plantUmlContextBean); +} diff --git a/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/api/ICompRegistService.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/api/ICompRegistService.java new file mode 100644 index 0000000000000000000000000000000000000000..546dbbc5860a0d77fd2c7a9a13027564454f5f58 --- /dev/null +++ b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/api/ICompRegistService.java @@ -0,0 +1,25 @@ +package com.coderman.codemaker.api; + +import com.coderman.codemaker.bean.component.ComponentContextBean; + +/** + * Description:组件注册服务接口，这里主要用来将相对独立的工具类注册到组件中 + * 整体的独立类当作一个组件看待，独立工具类配置在/component/single-class文件夹 + * 中，一个独立类一个配置。 + * + * 由于独立类的注入扫描比较简单，这里相当于一个默认的实现，不需要用户二次开发 + * 用户只需要配置即可将独立的工具类应用在调用时序图文档里，并在生成的代码中被引用到 + * + * date: 2021/12/24 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +public interface ICompRegistService { + /** + * 将独立工具类的配置列表扫描并注册为组件 + * @return + */ + ComponentContextBean registSingleClass(); +} diff --git a/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/api/ICompScanService.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/api/ICompScanService.java new file mode 100644 index 0000000000000000000000000000000000000000..3cbdc2d1e8175bd5af5bf2e044dd5096ad3f1f01 --- /dev/null +++ b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/api/ICompScanService.java @@ -0,0 +1,24 @@ +package com.coderman.codemaker.api; + +import com.coderman.codemaker.bean.component.ComponentContextBean; + +import java.util.List; +import java.util.Map; + +/** + * Description:组件扫描注册服务类 + * + * date: 2021/11/22 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +@FunctionalInterface +public interface ICompScanService { + /** + * 组件扫描核心接口 + * @return + */ + Map scanComponent(List componentList); +} diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/ClassContentBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/ClassContentBean.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/ClassContentBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/ClassContentBean.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/ColumnBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/ColumnBean.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/ColumnBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/ColumnBean.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/GeneratorSettingBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/GeneratorSettingBean.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/GeneratorSettingBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/GeneratorSettingBean.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/GlobalConstant.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/GlobalConstant.java similarity index 34% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/GlobalConstant.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/GlobalConstant.java index 90c90b274352c82fe2517715474d45b5be7bf44a..521a58c907ad1b8d2dec3248f028b1b324e10b32 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/bean/GlobalConstant.java +++ b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/GlobalConstant.java @@ -53,6 +53,33 @@ public class GlobalConstant { */ public static final String INVOKE_FILE_KEY = "invokefilekey"; + /** + * plantuml bo中的特殊属性-标示BO对象是哪个上下文的，帮助按上下文分包 + */ + public static final String CONTEXT_KEY = "contextkey"; + + + + /** + * plantuml bo中的特殊属性-标示BO对象的派生查询dto + */ + public static final String QUERY_DTO_KEY = "querydtokey"; + + + + /** + * plantuml bo中的特殊属性-标示BO对象的派生查询vo + */ + public static final String QUERY_VO_KEY = "queryvokey"; + + + /** + * plantuml bo中的特殊属性-标示BO对象需要导出参数到下游哪个服务的哪个接口做防腐适配 + */ + public static final String EXPORT_ACL_KEY = "exportaclkey"; + + + /** * 调用时序文档存储文件夹名称 @@ -71,4 +98,117 @@ public class GlobalConstant { */ public static final String PLANT_DOC_IGNORE = "!"; + + /** + * api doc文件名称 + */ + public static final String API_DOC = "api-doc"; + + + public static final String PACKAGE_$ = "${package}"; + + /** + * 存放工具类 独立类的文件目录名 + */ + public static final String SINGLE_CLASS_COMMON = "singleClass"; + + /** + * 组件配置文件key--version + */ + public static final String COMP_VERSION="version"; + + /** + * 组件配置文件key--groupId + */ + public static final String COMP_GROUPID="groupId"; + + /** + * 组件配置文件key--artifactId + */ + public static final String COMP_ARTIFACTID="artifactId"; + + + /** + * 组件包扫描的包名称 + */ + public static final String COMP_PACKAGE = "packageName"; + + /** + * 组件代表的服务别名 + */ + public static final String COMP_SERVICE_NAME = "serviceName"; + + + /** + * 组件官网 + */ + public static final String COMP_SITE = "compSite"; + + /** + * 组件简述 + */ + public static final String COMP_DESC = "compDesc"; + + + /** + * 组件类型 + */ + public static final String COMP_TYPE = "compType"; + + /** + * 独立类-类型 + */ + public static final String COMP_SINGLE_CLASS_TYPE = "classType"; + + /** + * 需要扫描的类列表前缀 + */ + public static final String COMP_CLASS_PRE = "class"; + + + /** + * 需要扫描的接口列表前缀 + */ + public static final String COMP_INTERFACE_PRE = "interface"; + + /** + * 需要扫描的枚举列表前缀 + */ + public static final String COMP_ENUM_PRE = "enum"; + + /** + * 需要扫描的方法列表前缀 + */ + public static final String COMP_CLASS_METHOD_PRE = "method"; + + /** + * 需要扫描的注解列表前缀 + */ + public static final String COMP_ANNOTATION_PRE = "annotation"; + + + /** + * 扫描组件的文件前缀 + */ + public static final String COMP_COMPONENT_PATH_PRE = "/component/"; + + /** + * 独立类组件扫描路径 + */ + public static final String COMP_COMPONENT_SINGLE_CLASS_PATH = COMP_COMPONENT_PATH_PRE + "singleClass"; + + /** + * 配置的包依赖 + */ + public static final String CLASS_IMPORT_FILE = "/class-import.properties"; + + + + + public static final String REQUEST_DTO = "requestdto"; + public static final String RESPONSE_DTO = "responsedto"; + + + public static final String REQUEST_VO = "requestvo"; + public static final String RESPONSE_VO = "responsevo"; } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/MapperMethodConstant.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/MapperMethodConstant.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/MapperMethodConstant.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/MapperMethodConstant.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/TableBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/TableBean.java similarity index 99% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/TableBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/TableBean.java index 80e441491533979964e28cb0c66c653bd82011c2..177601f85dbb89c1ebd9fbccb0cf6bac145132ee 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/bean/TableBean.java +++ b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/TableBean.java @@ -4,8 +4,8 @@ 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 com.google.common.collect.Lists; import org.apache.commons.collections4.CollectionUtils; -import org.assertj.core.util.Lists; import java.util.ArrayList; import java.util.List; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/WriteContentBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/WriteContentBean.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/WriteContentBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/WriteContentBean.java diff --git a/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/apidoc/ApiDocBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/apidoc/ApiDocBean.java new file mode 100644 index 0000000000000000000000000000000000000000..d5a3d32258ace7102f3bd0fe243f83fc723c9e31 --- /dev/null +++ b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/apidoc/ApiDocBean.java @@ -0,0 +1,112 @@ +package com.coderman.codemaker.bean.apidoc; + +import java.util.List; + +/** + * Description: 支持http rpc的接口文档模型 + * date: 2021/11/22 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +public class ApiDocBean { + + /** + * 接口名称 + * controller--method a/b/c + * rpc---method + */ + private String interfaceName; + + /** + * 参数列表 + */ + private List paramBeanList; + + /** + * 接口文档描述 + */ + private String interfaceDesc; + + /** + * 返回值类信息 + */ + private String returnClass; + + + /** + * 入参json 案例 + */ + private String paramJsonDemo; + + + /** + * 出参json 案例 + */ + private String returnJsonDemo; + + /** + * http接口的访问路径 + */ + private String httpPath; + + public String getHttpPath() { + return httpPath; + } + + public void setHttpPath(String httpPath) { + this.httpPath = httpPath; + } + + public String getInterfaceName() { + return interfaceName; + } + + public void setInterfaceName(String interfaceName) { + this.interfaceName = interfaceName; + } + + public List getParamBeanList() { + return paramBeanList; + } + + public void setParamBeanList(List paramBeanList) { + this.paramBeanList = paramBeanList; + } + + public String getInterfaceDesc() { + return interfaceDesc; + } + + public void setInterfaceDesc(String interfaceDesc) { + this.interfaceDesc = interfaceDesc; + } + + public String getReturnClass() { + return returnClass; + } + + public void setReturnClass(String returnClass) { + this.returnClass = returnClass; + } + + public String getParamJsonDemo() { + return paramJsonDemo; + } + + public void setParamJsonDemo(String paramJsonDemo) { + this.paramJsonDemo = paramJsonDemo; + } + + public String getReturnJsonDemo() { + return returnJsonDemo; + } + + public void setReturnJsonDemo(String returnJsonDemo) { + this.returnJsonDemo = returnJsonDemo; + } + + + +} diff --git a/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/apidoc/ApiModuleBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/apidoc/ApiModuleBean.java new file mode 100644 index 0000000000000000000000000000000000000000..5782ef28f21aaef9d41e52b1216c3f9d382721f8 --- /dev/null +++ b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/apidoc/ApiModuleBean.java @@ -0,0 +1,12 @@ +package com.coderman.codemaker.bean.apidoc; + +/** + * Description:模块/接口类级别的文档描述 + * date: 2021/11/22 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +public class ApiModuleBean { +} diff --git a/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/apidoc/ApiParamBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/apidoc/ApiParamBean.java new file mode 100644 index 0000000000000000000000000000000000000000..7e7dce1a3221f438c68ed609d7dd94fb2f99c6b1 --- /dev/null +++ b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/apidoc/ApiParamBean.java @@ -0,0 +1,63 @@ +package com.coderman.codemaker.bean.apidoc; + +/** + * Description: + * date: 2021/11/22 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +public class ApiParamBean { + /** + * 属性名称 + */ + private String fieldName; + + /** + * 属性类型 + */ + private String fieldType; + + /** + * 属性描述 + */ + private String fieldDesc; + + /** + * 是否可为空 + */ + private String nullable; + + public String getFieldName() { + return fieldName; + } + + public void setFieldName(String fieldName) { + this.fieldName = fieldName; + } + + public String getFieldType() { + return fieldType; + } + + public void setFieldType(String fieldType) { + this.fieldType = fieldType; + } + + public String getFieldDesc() { + return fieldDesc; + } + + public void setFieldDesc(String fieldDesc) { + this.fieldDesc = fieldDesc; + } + + public String getNullable() { + return nullable; + } + + public void setNullable(String nullable) { + this.nullable = nullable; + } +} diff --git a/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/component/ComponentConfigBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/component/ComponentConfigBean.java new file mode 100644 index 0000000000000000000000000000000000000000..b500b202c6614ca74f7ce25096996240944167e6 --- /dev/null +++ b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/component/ComponentConfigBean.java @@ -0,0 +1,274 @@ +package com.coderman.codemaker.bean.component; + + +import org.apache.commons.lang3.StringUtils; + +import java.util.ArrayList; +import java.util.List; + +/** + * Description: + * date: 2021/11/22 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +public class ComponentConfigBean { + + /** + * maven GAV + */ + private String artifactId; + + private String groupId; + + private String version; + + private String desc; + + /** + * 如果GAV找不到则通过jarPath找 + */ + private String jarPath; + + /** + * 目标类所在的包名 + */ + private String packageName; + + /** + * 组件代表的别名 + */ + private String serviceName; + + /** + * 组件类型--CompTypeEnum + */ + private String compType; + + /** + * 类-类型 + */ + private String classType; + + + /** + * 组件官网 + */ + private String compSite; + + /** + * 组件描述 + */ + private String compDesc; + + /** + * 接口列表 + */ + private List interfaceList = new ArrayList<>(); + + /** + * 类列表 + */ + private List classList = new ArrayList<>(); + + /** + * 枚举列表 + */ + private List enumList = new ArrayList<>(); + + /** + * 注解列表 + */ + private List annotationList = new ArrayList<>(); + + /** + * 方法列表 + */ + private List methodList = new ArrayList<>(); + + public String getArtifactId() { + return artifactId; + } + + public void setArtifactId(String artifactId) { + this.artifactId = artifactId; + } + + public String getGroupId() { + return groupId; + } + + public void setGroupId(String groupId) { + this.groupId = groupId; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + public String getDesc() { + return desc; + } + + public void setDesc(String desc) { + this.desc = desc; + } + + public String getJarPath() { + return jarPath; + } + + public void setJarPath(String jarPath) { + this.jarPath = jarPath; + } + + + public String getPackageName() { + return packageName; + } + + public void setPackageName(String packageName) { + this.packageName = packageName; + } + + public List getInterfaceList() { + return interfaceList; + } + + public List getClassList() { + return classList; + } + + public String getClassType() { + return classType; + } + + public void setClassType(String classType) { + this.classType = classType; + } + + + public List getMethodList() { + return methodList; + } + + public List getEnumList() { + return enumList; + } + + public List getAnnotationList() { + return annotationList; + } + + public String getCompSite() { + return compSite; + } + + public void setCompSite(String compSite) { + this.compSite = compSite; + } + + public String getCompDesc() { + return compDesc; + } + + public void setCompDesc(String compDesc) { + this.compDesc = compDesc; + } + + public String getServiceName() { + return serviceName; + } + + public void setServiceName(String serviceName) { + this.serviceName = serviceName; + } + + + public String getCompType() { + return compType; + } + + public void setCompType(String compType) { + this.compType = compType; + } + + public void addClass(String clazz){ + if(StringUtils.isNotEmpty(this.getPackageName())){ + clazz = this.getPackageName()+"."+clazz; + } + this.classList.add(clazz); + } + + public void addInterface(String interfaceName){ + if(StringUtils.isNotEmpty(this.getPackageName())){ + interfaceName = this.getPackageName()+"."+interfaceName; + } + this.interfaceList.add(interfaceName); + } + + public void addAnnotation(String annotation){ + if(StringUtils.isNotEmpty(this.getPackageName())){ + annotation = this.getPackageName()+"."+annotation; + } + this.annotationList.add(annotation); + } + + + public void addEnum(String enumClass){ + if(StringUtils.isNotEmpty(this.getPackageName())){ + enumClass = this.getPackageName()+"."+enumClass; + } + this.enumList.add(enumClass); + } + + public void addMethod(String methodStr){ + if(StringUtils.isNotEmpty(methodStr)){ + this.methodList.add(methodStr); + } + } + + + /** + * 构建需要读取的jar包绝对路径,带jar的 + * @return + */ + public String buildRepoJarPath(String mvnRepoPath){ + String path = mvnRepoPath + "/" + this.getGroupId().replace(".","/")+"/"+this.getArtifactId()+"/"+this.getVersion(); + String jarName = this.getArtifactId()+"-"+this.getVersion()+".jar"; + return path + "/" + jarName+"!/"; + } + + /** + * 构建需要读取的jar包绝对路径 + * @return + */ + public String buildJarPath(String mvnRepoPath){ + String path = mvnRepoPath.replace("jar:file://","") + "/" + this.getGroupId().replace(".","/")+"/"+this.getArtifactId()+"/"+this.getVersion(); + String jarName = this.getArtifactId()+"-"+this.getVersion()+".jar"; + return path + "/" + jarName; + } + + @Override + public String toString() { + return "ComponentConfigBean{" + + "artifactId='" + artifactId + '\'' + + ", groupId='" + groupId + '\'' + + ", version='" + version + '\'' + + ", desc='" + desc + '\'' + + ", jarPath='" + jarPath + '\'' + + ", packageName='" + packageName + '\'' + + ", serviceName='" + serviceName + '\'' + + ", compType='" + compType + '\'' + + ", classType='" + classType + '\'' + + ", compSite='" + compSite + '\'' + + ", compDesc='" + compDesc + '\'' + + '}'; + } +} diff --git a/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/component/ComponentContextBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/component/ComponentContextBean.java new file mode 100644 index 0000000000000000000000000000000000000000..e47afc782a82eec1cc0150ea6aded01ba07779db --- /dev/null +++ b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/component/ComponentContextBean.java @@ -0,0 +1,151 @@ +package com.coderman.codemaker.bean.component; + +import com.coderman.codemaker.bean.plantuml.AnnotationBean; +import com.coderman.codemaker.bean.plantuml.ClassBean; +import com.coderman.codemaker.bean.plantuml.EnumBean; +import com.coderman.codemaker.bean.plantuml.InterfaceBean; +import org.apache.commons.collections4.CollectionUtils; + +import java.util.List; +import java.util.Optional; + +/** + * Description:组件上下文bean + * date: 2021/11/22 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +public class ComponentContextBean { + + /** + * 组件名称---服务名称 + */ + private String componentName; + + /** + * 组件类型--CompTypeEnum + */ + private String compType; + + + /** + * 组件需要暴露的枚举类 + */ + private List enumBeanList; + + /** + * 组件需要暴露的class类 + */ + private List classBeanList; + + /** + * 组件需要暴露的接口类 + */ + private List interfaceBeanList; + + /** + * 注解列表 + */ + private List annotationList; + + public List getAnnotationList() { + return annotationList; + } + + public void setAnnotationList(List annotationList) { + this.annotationList = annotationList; + } + + public String getComponentName() { + return componentName; + } + + public void setComponentName(String componentName) { + this.componentName = componentName; + } + + public List getEnumBeanList() { + return enumBeanList; + } + + public void setEnumBeanList(List enumBeanList) { + this.enumBeanList = enumBeanList; + } + + public List getClassBeanList() { + return classBeanList; + } + + public void setClassBeanList(List classBeanList) { + this.classBeanList = classBeanList; + } + + public List getInterfaceBeanList() { + return interfaceBeanList; + } + + public void setInterfaceBeanList(List interfaceBeanList) { + this.interfaceBeanList = interfaceBeanList; + } + + public String getCompType() { + return compType; + } + + public void setCompType(String compType) { + this.compType = compType; + } + + @Override + public String toString() { + return "ComponentContextBean{" + + "componentName='" + componentName + '\'' + + ", enumBeanList=" + enumBeanList + + ", classBeanList=" + classBeanList + + ", interfaceBeanList=" + interfaceBeanList + + '}'; + } + + /** + * 获取目标注解信息 + * @param annotationClass + * @return + */ + public AnnotationBean getTargetAnnotation(String annotationClass){ + if(CollectionUtils.isEmpty(this.getAnnotationList())){ + return null; + } + Optional annotationBeanOptional = this.getAnnotationList().stream().filter(annotationBean -> annotationBean.getClassName().equals(annotationClass)).findFirst(); + if(annotationBeanOptional.isPresent()){ + return annotationBeanOptional.get(); + } + return null; + } + + + /** + * 获取目标class信息 + * @param className + * @return + */ + public ClassBean getTargetClass(String className){ + if(CollectionUtils.isEmpty(this.getClassBeanList())){ + return null; + } + Optional classBeanOptional = this.getClassBeanList().stream().filter(classBean -> classBean.getClassName().equals(className)).findFirst(); + if(classBeanOptional.isPresent()){ + return classBeanOptional.get(); + } + return null; + } + + /** + * 判断扫描出来的组件是否为空 + * @return + */ + public boolean isEmpty(){ + return CollectionUtils.isEmpty(this.getAnnotationList()) && CollectionUtils.isEmpty(this.getEnumBeanList()) && CollectionUtils.isEmpty(this.getClassBeanList()) && CollectionUtils.isEmpty(this.getInterfaceBeanList()); + } +} diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/AclElementBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelement/AclElementBean.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/AclElementBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelement/AclElementBean.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/AggregateElementBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelement/AggregateElementBean.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/AggregateElementBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelement/AggregateElementBean.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/AppListenerElementBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelement/AppListenerElementBean.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/AppListenerElementBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelement/AppListenerElementBean.java diff --git a/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelement/CacheElementBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelement/CacheElementBean.java new file mode 100644 index 0000000000000000000000000000000000000000..4d4bbb47d36d440892a05082b943de033f2e1b65 --- /dev/null +++ b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelement/CacheElementBean.java @@ -0,0 +1,13 @@ +package com.coderman.codemaker.bean.dddelement; + +/** + * Description: + * date: 2021/6/28 + * 缓存服务元素 + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +public class CacheElementBean extends ElementBean { + +} diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/CommandElementBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelement/CommandElementBean.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/CommandElementBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelement/CommandElementBean.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/DomainBoElementBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelement/DomainBoElementBean.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/DomainBoElementBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelement/DomainBoElementBean.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/DomainEventElementBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelement/DomainEventElementBean.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/DomainEventElementBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelement/DomainEventElementBean.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/DomainMsgBodyElementBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelement/DomainMsgBodyElementBean.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/DomainMsgBodyElementBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelement/DomainMsgBodyElementBean.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/DynamicMapperElementBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelement/DynamicMapperElementBean.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/DynamicMapperElementBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelement/DynamicMapperElementBean.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/DynamicMapperXmlElementBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelement/DynamicMapperXmlElementBean.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/DynamicMapperXmlElementBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelement/DynamicMapperXmlElementBean.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/ElementBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelement/ElementBean.java similarity index 99% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/ElementBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelement/ElementBean.java index 2b2340fe444d75f7e5ec9cf1a3d1735346c6851d..5f811e435e44d8cf918b6477e129bafbcf2c715b 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/ElementBean.java +++ b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelement/ElementBean.java @@ -1,7 +1,6 @@ package com.coderman.codemaker.bean.dddelement; import com.coderman.codemaker.bean.plantuml.*; -import com.coderman.codemaker.enums.DomainElementEnum; import org.apache.commons.collections4.CollectionUtils; import java.util.ArrayList; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/ExecutorElementBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelement/ExecutorElementBean.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/ExecutorElementBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelement/ExecutorElementBean.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/FactoryElementBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelement/FactoryElementBean.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/FactoryElementBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelement/FactoryElementBean.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/GatawayElementBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelement/GatawayElementBean.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/GatawayElementBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelement/GatawayElementBean.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/InfrastAclElementBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelement/InfrastAclElementBean.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/InfrastAclElementBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelement/InfrastAclElementBean.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/MqConsumerElementBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelement/MqConsumerElementBean.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/MqConsumerElementBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelement/MqConsumerElementBean.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/MqHandlerElementBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelement/MqHandlerElementBean.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/MqHandlerElementBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelement/MqHandlerElementBean.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/MqProducerElementBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelement/MqProducerElementBean.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/MqProducerElementBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelement/MqProducerElementBean.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/PackageElementBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelement/PackageElementBean.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/PackageElementBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelement/PackageElementBean.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/RepositoryElementBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelement/RepositoryElementBean.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/RepositoryElementBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelement/RepositoryElementBean.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/ValueObjectElementBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelement/ValueObjectElementBean.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelement/ValueObjectElementBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelement/ValueObjectElementBean.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelementderive/ControllerElementBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelementderive/ControllerElementBean.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelementderive/ControllerElementBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelementderive/ControllerElementBean.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelementderive/DoBoConvertElementBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelementderive/DoBoConvertElementBean.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelementderive/DoBoConvertElementBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelementderive/DoBoConvertElementBean.java diff --git a/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelementderive/Dto2DtoConvertElementBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelementderive/Dto2DtoConvertElementBean.java new file mode 100644 index 0000000000000000000000000000000000000000..88f6b5b831beed1419c55be8bdf4cf3b4c7352c2 --- /dev/null +++ b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelementderive/Dto2DtoConvertElementBean.java @@ -0,0 +1,16 @@ +package com.coderman.codemaker.bean.dddelementderive; + +import com.coderman.codemaker.bean.dddelement.ElementBean; + +/** + * Description: + * 派生元素， + * date: 2021/6/28 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +public class Dto2DtoConvertElementBean extends ElementBean { + +} diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelementderive/DtoBoConvertElementBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelementderive/DtoBoConvertElementBean.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelementderive/DtoBoConvertElementBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelementderive/DtoBoConvertElementBean.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelementderive/DtoElementBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelementderive/DtoElementBean.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelementderive/DtoElementBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelementderive/DtoElementBean.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelementderive/EnumElementBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelementderive/EnumElementBean.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelementderive/EnumElementBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelementderive/EnumElementBean.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelementderive/FacadeElementBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelementderive/FacadeElementBean.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelementderive/FacadeElementBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelementderive/FacadeElementBean.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelementderive/FacadeImplElementBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelementderive/FacadeImplElementBean.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelementderive/FacadeImplElementBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelementderive/FacadeImplElementBean.java diff --git a/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelementderive/FeignControllerElementBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelementderive/FeignControllerElementBean.java new file mode 100644 index 0000000000000000000000000000000000000000..db5d14dacb07db917601e1f87334cd439f811b31 --- /dev/null +++ b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelementderive/FeignControllerElementBean.java @@ -0,0 +1,16 @@ +package com.coderman.codemaker.bean.dddelementderive; + +import com.coderman.codemaker.bean.dddelement.ElementBean; + +/** + * Description: + * 派生元素，由领域实体元素bo派生而来 + * date: 2021/6/28 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +public class FeignControllerElementBean extends ElementBean { + +} diff --git a/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelementderive/FeignElementBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelementderive/FeignElementBean.java new file mode 100644 index 0000000000000000000000000000000000000000..06fd9c3e86577a628e2fcaf601ee81e171cff409 --- /dev/null +++ b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelementderive/FeignElementBean.java @@ -0,0 +1,16 @@ +package com.coderman.codemaker.bean.dddelementderive; + +import com.coderman.codemaker.bean.dddelement.ElementBean; + +/** + * Description: + * 派生元素，由领域实体元素bo派生而来 + * date: 2021/6/28 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +public class FeignElementBean extends ElementBean { + +} diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelementderive/GatawayImplElementBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelementderive/GatawayImplElementBean.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelementderive/GatawayImplElementBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelementderive/GatawayImplElementBean.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelementderive/InfrastAclImplElementBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelementderive/InfrastAclImplElementBean.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelementderive/InfrastAclImplElementBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelementderive/InfrastAclImplElementBean.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelementderive/RepositoryImplElementBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelementderive/RepositoryImplElementBean.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelementderive/RepositoryImplElementBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelementderive/RepositoryImplElementBean.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelementderive/VoBoConvertElementBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelementderive/VoBoConvertElementBean.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelementderive/VoBoConvertElementBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelementderive/VoBoConvertElementBean.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelementderive/VoElementBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelementderive/VoElementBean.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/dddelementderive/VoElementBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/dddelementderive/VoElementBean.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/invoke/InvokeContextBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/invoke/InvokeContextBean.java similarity index 87% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/invoke/InvokeContextBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/invoke/InvokeContextBean.java index d980f7aa3e694a65dcdea9e6deb95d82d68be1b6..b9fe9fca803a73d6b7ba13e534a73f1339899cae 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/bean/invoke/InvokeContextBean.java +++ b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/invoke/InvokeContextBean.java @@ -61,6 +61,11 @@ public class InvokeContextBean { */ private AbstractClassBean invokerClassBean; + /** + * 被调用类对象 + */ + private AbstractClassBean providerClassBean; + /** * 当前调用方调用提供方的调用行内容 */ @@ -172,6 +177,26 @@ public class InvokeContextBean { } } + /** + * 根据调用内容构建调用场景 + * + * @param invokeContent + */ + public void buildInvokeSceneV2(String invokeContent) { + String invokeSceneStr = invokeContent.split(":")[0].trim(); + + String invokeScene = InvokeSceneTypeEnum.getInvokeSceneV2(invokeSceneStr); + if (StringUtils.isNotEmpty(invokeScene)) { + this.setInvokeSceneType(invokeScene); + } + + if (StringUtils.isNotEmpty(this.getInvokerMethod())) { + String rwType = ReadWriteTypeEnum.getCodeByMethod(this.getInvokerMethod()); + this.setMethodRWType(rwType); + } + } + + /** * 构建当前调用行bean * @@ -216,4 +241,12 @@ public class InvokeContextBean { '}'; } + + public AbstractClassBean getProviderClassBean() { + return providerClassBean; + } + + public void setProviderClassBean(AbstractClassBean providerClassBean) { + this.providerClassBean = providerClassBean; + } } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/invoke/InvokeRowBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/invoke/InvokeRowBean.java similarity index 97% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/invoke/InvokeRowBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/invoke/InvokeRowBean.java index 6d6d130a79e70aeb2f65918bd3b9207a722019e9..735c9a212cdeb3093e0e50695fbe028794e6dd9e 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/bean/invoke/InvokeRowBean.java +++ b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/invoke/InvokeRowBean.java @@ -4,11 +4,7 @@ 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; /** @@ -162,6 +158,10 @@ public class InvokeRowBean { */ public String refreshInvokeContent(InvokeRowBean invokeRowBean, PlantUmlContextBean plantUmlContextBean){ String preRowClassName = invokeRowBean.getReturnClassName(); + if(preRowClassName.contains(".")){ + String [] arr = preRowClassName.split("\\."); + preRowClassName = arr[arr.length - 1].replace(">",""); + } if (StringUtils.isEmpty(preRowClassName) || this.getProviderMethodParamTypeArr() == null || this.getProviderMethodParamTypeArr().length == 0) { return buildInvokeContent(); } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/plantuml/AbstractClassBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/plantuml/AbstractClassBean.java similarity index 86% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/plantuml/AbstractClassBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/plantuml/AbstractClassBean.java index df37b572a9bfdabd9d7c7c7a4c2b15f46f2b354a..faca6aed64f754ada113f66e9daac449d77b3d44 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/bean/plantuml/AbstractClassBean.java +++ b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/plantuml/AbstractClassBean.java @@ -3,16 +3,16 @@ 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.CompTypeEnum; 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.lang.reflect.Method; + +import java.lang.reflect.Field; import java.util.*; import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; @@ -87,6 +87,17 @@ public abstract class AbstractClassBean { */ private boolean isDerived; + /** + * 组件名称 + * 根据该标示判断是否是plantUML类图中的还是组件扫描引入的 + */ + private String compName; + + + //类所属组件类型，默认为spring,即plantUML类图中发起调用的类都是spring类型 + //这里当然还有其他类型，如xxbo.xxxMethod()，这里需要进行特殊识别 + private String compType = CompTypeEnum.SPRING.getCompTag(); + private String bodtoConvertInterface; @@ -123,6 +134,48 @@ public abstract class AbstractClassBean { */ private List columnBeanList; + /** + * 类上的注释 + */ + private String annotation; + + /** + * 所属上下文 + */ + private String context = ""; + + public String getCompName() { + return compName; + } + + public void setCompName(String compName) { + this.compName = compName; + } + + public String getCompType() { + return compType; + } + + public void setCompType(String compType) { + this.compType = compType; + } + + public String getContext() { + return context; + } + + public void setContext(String context) { + this.context = context; + } + + public String getAnnotation() { + return annotation; + } + + public void setAnnotation(String annotation) { + this.annotation = annotation; + } + public TableBean getTableBean() { return tableBean; } @@ -358,17 +411,13 @@ public abstract class AbstractClassBean { //dto没有bo那么多的丰富信息，需要去掉 List newFieldBeanList = fieldBeanList.stream().filter(fieldBean -> !fieldBean.getFieldName().trim().toLowerCase().endsWith(DomainElementEnum.BO.getElement()) - && !fieldBean.isTableKey() - && !fieldBean.isDtoKey() - && !fieldBean.isInvokeFileKey() + && fieldBean.isSimpleField() && !fieldBean.getFieldName().trim().toLowerCase().contains(DomainElementEnum.BO.getElement()+">")) .collect(Collectors.toList()); List fieldBeanFilterList = fieldBeanList.stream().filter(fieldBean -> fieldBean.getFieldName().trim().toLowerCase().endsWith(DomainElementEnum.BO.getElement()) - && !fieldBean.isTableKey() - && !fieldBean.isDtoKey() - && !fieldBean.isInvokeFileKey() + && fieldBean.isSimpleField() || fieldBean.getFieldName().trim().toLowerCase().contains(DomainElementEnum.BO.getElement()+">")) .collect(Collectors.toList()); @@ -516,13 +565,41 @@ public abstract class AbstractClassBean { modelClassBean.setClassName(className); modelClassBean.setFieldBeanList(fieldBeanList); modelClassBean.setClassDesc(this.getClassDesc()); + modelClassBean.setContext(this.getContext()); modelClassBean.setMethodBeanList(Lists.newArrayList()); modelClassBean.setPlantUMLPackage(plantUMLPackage); modelClassBean.setDerivedChainClassList(Lists.newArrayList(this.getClassName())); return modelClassBean; } + /** + * 给方法增加导入类 + * @param classPackageName + */ + public void addImportClass(String classPackageName){ + if(CollectionUtils.isEmpty(this.getImportClassList())){ + this.setImportClassList(Lists.newArrayList(classPackageName)); + return; + } + if(!this.getImportClassList().contains(classPackageName)){ + this.getImportClassList().add(classPackageName); + } + } + /** + * 为class增加fieldBean,根据名称判断是否存在，已存在则忽略 + * @param fieldBean + */ + public void addField(FieldBean fieldBean){ + if (CollectionUtils.isEmpty(this.getFieldBeanList())){ + this.setFieldBeanList(new ArrayList<>()); + } + Optional fieldBeanOptional = this.getFieldBeanList().stream().filter(fieldBean1 -> fieldBean1.getSimpleName().equals(fieldBean.getSimpleName())).findFirst(); + if(fieldBeanOptional.isPresent()){ + return; + } + this.getFieldBeanList().add(fieldBean); + } } diff --git a/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/plantuml/AnnotationBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/plantuml/AnnotationBean.java new file mode 100644 index 0000000000000000000000000000000000000000..3cf50dcf5c582e865723766e352e108bb7835cae --- /dev/null +++ b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/plantuml/AnnotationBean.java @@ -0,0 +1,12 @@ +package com.coderman.codemaker.bean.plantuml; + +/** + * Description:枚举模型 + * date: 2021/11/23 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +public class AnnotationBean extends AbstractClassBean { +} diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/plantuml/ClassBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/plantuml/ClassBean.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/plantuml/ClassBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/plantuml/ClassBean.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/plantuml/EnumBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/plantuml/EnumBean.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/plantuml/EnumBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/plantuml/EnumBean.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/plantuml/ExtendFieldBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/plantuml/ExtendFieldBean.java similarity index 99% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/plantuml/ExtendFieldBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/plantuml/ExtendFieldBean.java index 714824384a45a96571433e23079c07d668d45584..2817399b52cf4be1fd58b12feb87fb2f6aafc896 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/bean/plantuml/ExtendFieldBean.java +++ b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/plantuml/ExtendFieldBean.java @@ -35,6 +35,8 @@ public class ExtendFieldBean { */ private String[] voKeyList; + + public String[] getInvokeFileKey() { return invokeFileKey; } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/plantuml/FieldBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/plantuml/FieldBean.java similarity index 53% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/plantuml/FieldBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/plantuml/FieldBean.java index 56c15e1a93850b2eeab95fce907ad9e087c3296b..6c4f0bde0c828c47eb64e0ab0ec862e25adf4262 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/bean/plantuml/FieldBean.java +++ b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/plantuml/FieldBean.java @@ -1,7 +1,12 @@ package com.coderman.codemaker.bean.plantuml; +import com.alibaba.fastjson.annotation.JSONField; import com.coderman.codemaker.bean.GlobalConstant; import com.coderman.codemaker.enums.VisibilityEnum; +import org.apache.commons.lang3.StringUtils; + +import java.util.ArrayList; +import java.util.List; /** * Description: @@ -42,6 +47,33 @@ public class FieldBean { */ private String fieldSimpleName; + /** + * 注解 + */ + private String annotation; + + /** + * plantUMl类图的原始数据 + */ + private String originFieldStr; + + + public String getOriginFieldStr() { + return originFieldStr; + } + + public void setOriginFieldStr(String originFieldStr) { + this.originFieldStr = originFieldStr; + } + + public String getAnnotation() { + return annotation; + } + + public void setAnnotation(String annotation) { + this.annotation = annotation; + } + public String getFieldType() { return fieldType; } @@ -105,41 +137,106 @@ public class FieldBean { this.desc = desc; } - + /** + * 是否关联具体数据表 + * @return + */ + @JSONField(serialize = false) public boolean isTableKey(){ return this.desc.toLowerCase().contains(GlobalConstant.TABLE_KEY) || this.fieldName.toLowerCase().contains(GlobalConstant.TABLE_KEY); } + /** + * 是否需要派生dto + * @return + */ + @JSONField(serialize = false) public boolean isDtoKey(){ return this.desc.toLowerCase().contains(GlobalConstant.DTO_KEY_LIST) || this.fieldName.toLowerCase().contains(GlobalConstant.DTO_KEY_LIST); } + + /** + * 是否需要派生dto + * @return + */ + @JSONField(serialize = false) public boolean isFacadeKey(){ return this.desc.toLowerCase().contains(GlobalConstant.FACADE_KEY) || this.fieldName.toLowerCase().contains(GlobalConstant.FACADE_KEY); } + @JSONField(serialize = false) public boolean isVoKey(){ return this.desc.toLowerCase().contains(GlobalConstant.VO_KEY_LIST) || this.fieldName.toLowerCase().contains(GlobalConstant.VO_KEY_LIST); } + @JSONField(serialize = false) public boolean isControllerKey(){ return this.desc.toLowerCase().contains(GlobalConstant.CONTROLLER_KEY) || this.fieldName.toLowerCase().contains(GlobalConstant.CONTROLLER_KEY); } + @JSONField(serialize = false) public boolean isCopyToRpcClientKey(){ return this.desc.toLowerCase().contains(GlobalConstant.COPY2RPC_CLIENT_KEY) || this.fieldName.toLowerCase().contains(GlobalConstant.COPY2RPC_CLIENT_KEY); } + @JSONField(serialize = false) public boolean isInvokeFileKey(){ return this.desc.toLowerCase().contains(GlobalConstant.INVOKE_FILE_KEY) || this.fieldName.toLowerCase().contains(GlobalConstant.INVOKE_FILE_KEY); } + + @JSONField(serialize = false) + public boolean isContextKey(){ + return this.desc.toLowerCase().contains(GlobalConstant.CONTEXT_KEY) + || this.fieldName.toLowerCase().contains(GlobalConstant.CONTEXT_KEY); + } + + @JSONField(serialize = false) + public boolean isQueryDtoKey(){ + return this.desc.toLowerCase().contains(GlobalConstant.QUERY_DTO_KEY) + || this.fieldName.toLowerCase().contains(GlobalConstant.QUERY_DTO_KEY); + } + + @JSONField(serialize = false) + public boolean isQueryVoKey(){ + return this.desc.toLowerCase().contains(GlobalConstant.QUERY_VO_KEY) + || this.fieldName.toLowerCase().contains(GlobalConstant.QUERY_VO_KEY); + } + + @JSONField(serialize = false) + public boolean isExportAclKey(){ + return this.desc.toLowerCase().contains(GlobalConstant.EXPORT_ACL_KEY) + || this.fieldName.toLowerCase().contains(GlobalConstant.EXPORT_ACL_KEY); + } + + + /** + * 根据条件判断是否是简单类型--非扩展字段信息判断 + * @return + */ + @JSONField(serialize = false) + public boolean isSimpleField(){ + return !this.isTableKey() + && !this.isDtoKey() + && !this.isFacadeKey() + && !this.isVoKey() + && !this.isControllerKey() + && !this.isInvokeFileKey() + && !this.isContextKey() + && !this.isQueryVoKey() + && !this.isQueryDtoKey() + && !this.isExportAclKey() + && !this.isMethod(); + } + + /** * 构建属性注释 * @param desc @@ -198,4 +295,58 @@ public class FieldBean { ", dbColumnName='" + dbColumnName + '\'' + '}'; } + + public String getSimpleName(){ + buildFieldDetail(); + return this.getFieldSimpleName(); + } + + @JSONField(serialize = false) + public boolean isMethod(){ + return this.desc.toLowerCase().contains("/") + || this.fieldName.toLowerCase().contains("("); + } + /** + * queryDtoKey:SystemQueryDTO String systemName,String systemCode,Long departmentId, Date startDate,Date endDate + * queryVoKey:SystemQueryVO String systemName,String systemCode,Long departmentId, Date startDate,Date endDate + * + */ + + /** + * 从原始数据中构建查询请求对象 + * @return + */ + public ClassBean buildQueryClass(){ + String queryFieldStr = this.getOriginFieldStr().split(":")[1]; + String [] fieldStrArr = queryFieldStr.split(","); + ClassBean classBean = new ClassBean(); + + List fieldBeanList = new ArrayList<>(); + + for (int i = 0;i < fieldStrArr.length;i++){ + String [] fieldArr = fieldStrArr[i].trim().split(" "); + List fieldStrList = new ArrayList<>(); + for (String fieldStr : fieldArr){ + if(StringUtils.isNotEmpty(fieldStr.trim())){ + fieldStrList.add(fieldStr); + } + } + if(fieldStrList.size() == 3) { + classBean.setClassName(fieldStrList.get(0)); + FieldBean fieldBean = new FieldBean(); + fieldBean.setDesc(""); + fieldBean.setFieldName(fieldStrList.get(1)+" "+fieldStrList.get(2)); + fieldBean.buildFieldDetail(); + fieldBeanList.add(fieldBean); + }else { + FieldBean fieldBean = new FieldBean(); + fieldBean.setDesc(""); + fieldBean.setFieldName(fieldStrList.get(0)+" "+fieldStrList.get(1)); + fieldBean.buildFieldDetail(); + fieldBeanList.add(fieldBean); + } + } + classBean.setFieldBeanList(fieldBeanList); + return classBean; + } } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/plantuml/InterfaceBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/plantuml/InterfaceBean.java similarity index 95% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/plantuml/InterfaceBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/plantuml/InterfaceBean.java index d8f50e18a8047706f19460f61ffffe014010f1bd..74fd684e67ddbff284a2e739889557f5e00ecc04 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/bean/plantuml/InterfaceBean.java +++ b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/plantuml/InterfaceBean.java @@ -2,7 +2,6 @@ package com.coderman.codemaker.bean.plantuml; import java.util.HashMap; import java.util.Map; -import java.util.Objects; /** * Description: diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/plantuml/MethodBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/plantuml/MethodBean.java similarity index 67% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/plantuml/MethodBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/plantuml/MethodBean.java index c4dca630cb2b24f0f6e00465bb7671135705f227..2f6853af074f46840d0b8419b3a73dbe0bedec1f 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/bean/plantuml/MethodBean.java +++ b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/plantuml/MethodBean.java @@ -1,9 +1,13 @@ package com.coderman.codemaker.bean.plantuml; +import com.alibaba.fastjson.annotation.JSONField; +import com.coderman.codemaker.bean.GlobalConstant; +import com.coderman.codemaker.bean.apidoc.ApiDocBean; +import com.coderman.codemaker.bean.apidoc.ApiParamBean; 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 com.coderman.codemaker.utils.StringHandleUtils; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -111,6 +115,57 @@ public class MethodBean { */ private String className; + /** + * 方法上的注解 + */ + private String annotation; + + /** + * 方法的范型返回值 + */ + private String genericReturnType; + + /** + * 方法的范型参数 + */ + private List genericParamList; + + /** + * 是否是bo模型定义的扩展接口 + */ + private boolean modelExtendMethod; + + public boolean isModelExtendMethod() { + return modelExtendMethod; + } + + public void setModelExtendMethod(boolean modelExtendMethod) { + this.modelExtendMethod = modelExtendMethod; + } + + public List getGenericParamList() { + return genericParamList; + } + + public void setGenericParamList(List genericParamList) { + this.genericParamList = genericParamList; + } + + public String getGenericReturnType() { + return genericReturnType; + } + + public void setGenericReturnType(String genericReturnType) { + this.genericReturnType = genericReturnType; + } + + public String getAnnotation() { + return annotation; + } + + public void setAnnotation(String annotation) { + this.annotation = annotation; + } public String[] getParamAnnotationArr() { return paramAnnotationArr; @@ -284,7 +339,7 @@ public class MethodBean { if(param.contains(" ")){ builder.append("\t * @param "+param.trim().split(" ")[1]+"\n"); }else { - builder.append("\t * @param "+getParamVar(param)+"\n"); + builder.append("\t * @param "+ StringHandleUtils.getParamVar(param)+"\n"); } } } @@ -293,23 +348,7 @@ 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); - } /** * 从方法名称中解析到方法参数 @@ -330,27 +369,6 @@ public class MethodBean { } } - /** - * 构建返回类型 - * @return - */ - public String buildReturnClassType(){ - if(this.getReturnClass().contains("void")){ - return null; - } - return this.getReturnClass() - .replace("ResultDataDto","") - .replace("ResultDto","") - .replace("<","") - .replace(">","") - .replace("Map","") - .replace("Set","") - .replace(",","") - .replace("List","").trim(); - } - - - @Override public boolean equals(Object o) { if (this == o) return true; @@ -411,6 +429,33 @@ public class MethodBean { return builder.toString(); } + /** + * 根据返回类型刷新方法返回体 + */ + public void refreshReturnBodyByReturnType(){ + if(this.getReturnClass().contains("void")){ + return; + } + if(StringHandleUtils.isStrictBasicType(this.getReturnClass())){ + if(this.getReturnClass().contains("boolean")){ + this.setReturnBody("return false;"); + } + else if(this.getReturnClass().contains("long")){ + this.setReturnBody("return 0L;"); + } + else if(this.getReturnClass().contains("double")){ + this.setReturnBody("return 0.0;"); + } + else if(this.getReturnClass().contains("float")){ + this.setReturnBody("return 0.0f;"); + } else { + this.setReturnBody("return 0;"); + } + } + + } + + /** * 将方法中的参数信息去掉，仅仅获取方法名 * @return @@ -436,8 +481,26 @@ public class MethodBean { return; } } - this.getInvokeMethodList().add(currentRowContent); - this.getInvokeRowBeanList().add(currentRowBean); + + if(CollectionUtils.isEmpty( this.getInvokeRowBeanList())){ + this.getInvokeMethodList().add(currentRowContent); + this.getInvokeRowBeanList().add(currentRowBean); + }else { + //判断变量名是否重复 + Set returnSet = new HashSet<>(); + for (InvokeRowBean invokeRowBean : this.getInvokeRowBeanList()){ + String returnValue = invokeRowBean.getReturnClassName() + invokeRowBean.getReturnClassValue(); + returnSet.add(returnValue); + } + String currentReturnValue = currentRowBean.getReturnClassName() + currentRowBean.getReturnClassValue(); + if(returnSet.contains(currentReturnValue)){ + currentRowBean.setReturnClassValue(currentRowBean.getReturnClassValue()+this.getInvokeRowBeanList().size()); + this.getInvokeRowBeanList().add(currentRowBean); + this.getInvokeMethodList().add(currentRowBean.buildInvokeContent()); + } + + } + } /** @@ -457,6 +520,7 @@ public class MethodBean { * 解析方法返回参数类型，是否包含vo,dto,bo * @return */ + @JSONField(serialize = false) public String getReturnClassTypeModel(){ if(this.getReturnClass().contains("void")){ return ""; @@ -480,6 +544,7 @@ public class MethodBean { * 解析方法返回参数类型，是否包含vo,dto,bo * @return */ + @JSONField(serialize = false) public String getReturnClassTypeNoWrapper(){ if(this.getReturnClass().contains("void")){ return ""; @@ -529,7 +594,7 @@ public class MethodBean { */ public boolean wrapperResultDto(){ - if (this.getReturnClass().contains("ResultDto")){ + if (this.getReturnClass().contains("Result")){ return true; } return false; @@ -541,4 +606,88 @@ public class MethodBean { } return false; } + + + /** + * 动态构建方法返回值包装 + * @param returnBody + */ + public void wrapperResultBody(String returnBody){ + if(this.getReturnClass().equals("void")){ + return; + } + if(this.getReturnClass().contains(returnBody)){ + return; + } + + this.setReturnClass(returnBody+"<"+this.getReturnClass()+">"); + } + + + + /** + * 构建api文档 + * @return + */ + public ApiDocBean buildApiDocBean(Map classVOBeanMap){ + ApiDocBean apiDocBean = new ApiDocBean(); + apiDocBean.setInterfaceName(this.getSimplMethodName()); + apiDocBean.setParamBeanList(convertToApiParam(classVOBeanMap)); + apiDocBean.setReturnClass(this.getReturnClass()); + apiDocBean.setInterfaceDesc(this.getDesc()); + apiDocBean.setHttpPath(this.getPathValue()); + return apiDocBean; + } + + private List convertToApiParam(Map classVOBeanMap){ + if(this.getParamArr() == null || this.getParamArr().length == 0){ + return null; + } + List apiParamBeanList = new ArrayList<>(); + for (String param : this.getParamArr()){ + ApiParamBean apiParamBean = new ApiParamBean(); + if(!param.trim().contains(" ")){ + continue; + } + String [] arr = param.split(" "); + apiParamBean.setFieldName(arr[1]); + apiParamBean.setFieldType(arr[0]); + apiParamBeanList.add(apiParamBean); + if(arr[0].toLowerCase().endsWith(TemplateFileEnum.VO.getTempFileName()) + || arr[0].toLowerCase().endsWith(TemplateFileEnum.DTO.getTempFileName())){ + ClassBean classBean = classVOBeanMap.get(arr[0]); + if(classBean == null){ + + continue; + } + apiParamBeanList.get(apiParamBeanList.size() - 1).setFieldDesc("对象类型,参数如下:"); + for (FieldBean fieldBean : classBean.getFieldBeanList()){ + if(fieldBean.getFieldName().contains("*")){ + continue; + } + ApiParamBean paramBean = new ApiParamBean(); + String [] arr2 = fieldBean.getFieldName().split(" "); + paramBean.setFieldName(arr2[1]); + paramBean.setFieldType(arr2[0]); + paramBean.setFieldDesc(fieldBean.getDesc()); + apiParamBeanList.add(paramBean); + } + + } + + } + return apiParamBeanList; + } + + + /** + * 判断方法是否需要导出acl param + * @return + */ + @JSONField(serialize = false) + public boolean isExportAclKey(){ + return this.desc.toLowerCase().contains(GlobalConstant.EXPORT_ACL_KEY) + || this.methodName.toLowerCase().contains(GlobalConstant.EXPORT_ACL_KEY); + } + } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/plantuml/PackageBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/plantuml/PackageBean.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/plantuml/PackageBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/plantuml/PackageBean.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/bean/plantuml/PlantUmlContextBean.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/plantuml/PlantUmlContextBean.java similarity index 80% rename from codemaker-core/src/main/java/com/coderman/codemaker/bean/plantuml/PlantUmlContextBean.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/plantuml/PlantUmlContextBean.java index 5aaafad9b6dcd7e0db336ba3f2dd4b67a22722db..01eae19065cb49e7f60155e0e4d5b58a21e88856 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/bean/plantuml/PlantUmlContextBean.java +++ b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/bean/plantuml/PlantUmlContextBean.java @@ -1,5 +1,6 @@ package com.coderman.codemaker.bean.plantuml; +import com.coderman.codemaker.bean.component.ComponentContextBean; import com.coderman.codemaker.bean.invoke.InvokeContextBean; import com.google.common.collect.Sets; @@ -29,6 +30,24 @@ public class PlantUmlContextBean { */ private PlantUmlContextBean derivedPlantUmlContextBean; + /** + * 扫描到的依赖组件 + */ + private Map compContextBeanMap; + + + /** + * app应用名称 + */ + private String appName; + + /** + * app应用类型 + */ + private String applicationType; + + + /** * 动态调用时序图文件 */ @@ -131,4 +150,27 @@ public class PlantUmlContextBean { } + public String getAppName() { + return appName; + } + + public void setAppName(String appName) { + this.appName = appName; + } + + public String getApplicationType() { + return applicationType; + } + + public void setApplicationType(String applicationType) { + this.applicationType = applicationType; + } + + public Map getCompContextBeanMap() { + return compContextBeanMap; + } + + public void setCompContextBeanMap(Map compContextBeanMap) { + this.compContextBeanMap = compContextBeanMap; + } } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/enums/ClassEnum.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/enums/ClassEnum.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/enums/ClassEnum.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/enums/ClassEnum.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/enums/ClassRelationEnum.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/enums/ClassRelationEnum.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/enums/ClassRelationEnum.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/enums/ClassRelationEnum.java diff --git a/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/enums/CompTypeEnum.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/enums/CompTypeEnum.java new file mode 100644 index 0000000000000000000000000000000000000000..0b6cc82ee9ebc629a825d4115a480251d11878ad --- /dev/null +++ b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/enums/CompTypeEnum.java @@ -0,0 +1,33 @@ +package com.coderman.codemaker.enums; + +/** + * Description:组件类型 + * date: 2021/12/23 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +public enum CompTypeEnum { + + TOOL("tool","工具类组件"), + //默认 + SPRING("spring","spring容器类组件"), + DUBBO_API("dubbo-api","dubbo对外暴露api"), + PACKAGE_PRIVATE("feign-api","spring cloud 对外暴露api"), + ; + private String compTag; + private String compDesc; + CompTypeEnum(String compTag, String compDesc){ + this.compTag = compTag; + this.compDesc = compDesc; + } + + public String getCompTag() { + return compTag; + } + + public String getCompDesc() { + return compDesc; + } +} diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/enums/DomainDerivedElementEnum.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/enums/DomainDerivedElementEnum.java similarity index 89% rename from codemaker-core/src/main/java/com/coderman/codemaker/enums/DomainDerivedElementEnum.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/enums/DomainDerivedElementEnum.java index 02beeead182a99d9467d106268658f5bc7528ea8..fff2bc3ac62d3ceef45e9274710e8decf61e5a9b 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/enums/DomainDerivedElementEnum.java +++ b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/enums/DomainDerivedElementEnum.java @@ -11,6 +11,7 @@ package com.coderman.codemaker.enums; public enum DomainDerivedElementEnum { DTO("dto","数据传输对象"), FACADE("facade","api门面接口"), + FEIGN("feign","api门面接口"), ENUM("enum","api 枚举包"), FACADE_IMPL("facadeimpl","api门面接口实现"), DTOBO_CONVERT("convert","dto-bo相互转换mapstruct接口"), @@ -18,6 +19,8 @@ public enum DomainDerivedElementEnum { VOBO_CONVERT("convertervobo","vo-bo相互转换mapstruct接口"), VO("vo","视图传输对象"), CONTROLLER("controller","控制器"), + DTO2DTO_CONVERT("convertordto","dto-to相互转换mapstruct接口"), + ; private String element; private String desc; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/enums/DomainElementEnum.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/enums/DomainElementEnum.java similarity index 98% rename from codemaker-core/src/main/java/com/coderman/codemaker/enums/DomainElementEnum.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/enums/DomainElementEnum.java index 248c841b91a4a29ca9ddc72c52b2374ec96600d1..d6d9ec2d0eb78a6e16236012655c9fbfba76cd91 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/enums/DomainElementEnum.java +++ b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/enums/DomainElementEnum.java @@ -28,6 +28,7 @@ public enum DomainElementEnum { MQ_CONSUMER("mqconsumer","消息消费者"), MQ_PRODUCER("mqproducer","消息生产者"), MQ_HANDLER("mqhandler","消息处理器"), + CACHE("cache","缓存"), GATAWAY_IMPL("gatawayimpl","领域网关服务实现"), REPOSITORY_IMPL("repositoryimpl","领域仓库实现"), @@ -39,6 +40,7 @@ public enum DomainElementEnum { DYNAMIC_MAPPER("mapper","动态mapper"), + ; private String element; private String desc; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/enums/dynamic/MethodReturnClassTypeEnum.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/enums/MethodReturnClassTypeEnum.java similarity index 94% rename from codemaker-core/src/main/java/com/coderman/codemaker/enums/dynamic/MethodReturnClassTypeEnum.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/enums/MethodReturnClassTypeEnum.java index d361a056153db2e643afecc7efd02c4a255a376f..e71b7080abdef3eceee0e24f70f1409b572b1fa7 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/enums/dynamic/MethodReturnClassTypeEnum.java +++ b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/enums/MethodReturnClassTypeEnum.java @@ -1,6 +1,4 @@ -package com.coderman.codemaker.enums.dynamic; - -import com.coderman.codemaker.enums.TemplateFileEnum; +package com.coderman.codemaker.enums; /** * Description:方法返回类型 diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/enums/ModuleEnum.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/enums/ModuleEnum.java similarity index 60% rename from codemaker-core/src/main/java/com/coderman/codemaker/enums/ModuleEnum.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/enums/ModuleEnum.java index 981bff3a9d0fd2b93a6abfce6cc8fe514938a1c8..187ff700318e9b776b1c94182d252bedc7691868 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/enums/ModuleEnum.java +++ b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/enums/ModuleEnum.java @@ -1,6 +1,7 @@ package com.coderman.codemaker.enums; +import com.coderman.codemaker.bean.GlobalConstant; import com.google.common.collect.Sets; import java.util.Set; @@ -65,10 +66,100 @@ public enum ModuleEnum { TemplateFileEnum.MQ_LISTENER.getTempFileName(), TemplateFileEnum.MQ_HANDLER.getTempFileName(), TemplateFileEnum.MQ_HANDLER.getTempFileName(), + TemplateFileEnum.CACHE.getTempFileName(), + TemplateFileEnum.BASE_EVENT.getTempFileName(), TemplateFileEnum.APP_EVENT_PUBLISHER.getTempFileName(), + GlobalConstant.SINGLE_CLASS_COMMON, + TemplateFileEnum.SPRING_APPLICATION_CONTEXT.getTempFileName())), + + + + + + /** + * springcloud feign + */ + SC_FEIGN_API("springcloud","springcloud-api", Sets.newHashSet( + TemplateFileEnum.FEIGN.getTempFileName(), + TemplateFileEnum.FEIGN_DDD.getTempFileName(), + TemplateFileEnum.DTO_DDD.getTempFileName(), + TemplateFileEnum.DTO.getTempFileName(), + TemplateFileEnum.API_ENUM.getTempFileName(), + GlobalConstant.SINGLE_CLASS_COMMON + )), + + /** + * + */ + SC_FEIGN_PROVIDER("springcloud","springcloud-provider", + 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(), + TemplateFileEnum.SERVICE.getTempFileName(), + /* TemplateFileEnum.VO.getTempFileName(), + TemplateFileEnum.VO_DDD.getTempFileName(),*/ + TemplateFileEnum.DTO_DDD.getTempFileName(), + TemplateFileEnum.DTO.getTempFileName(), + TemplateFileEnum.ENTITY.getTempFileName(), + TemplateFileEnum.DATA_OBJECT.getTempFileName(), + TemplateFileEnum.BUSINESS_OBJECT.getTempFileName(), + TemplateFileEnum.BUSINESS_OBJECT_DDD.getTempFileName(), + + TemplateFileEnum.TEST.getTempFileName(), + TemplateFileEnum.VALUE_OBJECT.getTempFileName(), + TemplateFileEnum.ENUM.getTempFileName(), + TemplateFileEnum.CMD.getTempFileName(), + TemplateFileEnum.EXE.getTempFileName(), + TemplateFileEnum.EXE_IMPL.getTempFileName(), + TemplateFileEnum.EXE_ABSTRACT.getTempFileName(), + TemplateFileEnum.GATAWAY.getTempFileName(), + TemplateFileEnum.REPOSITORY.getTempFileName(), + TemplateFileEnum.GATAWAY_IMPL.getTempFileName(), + TemplateFileEnum.REPOSITORY_IMPL.getTempFileName(), + TemplateFileEnum.ACL.getTempFileName(), + TemplateFileEnum.ACL_IMPL.getTempFileName(), + TemplateFileEnum.ACL_PARAM.getTempFileName(), + TemplateFileEnum.DTOBO_CONVERT.getTempFileName(), + TemplateFileEnum.BASE_CONTROLLER.getTempFileName(), +/* + TemplateFileEnum.VOBO_CONVERT.getTempFileName(), +*/ + TemplateFileEnum.FACTORY.getTempFileName(), + TemplateFileEnum.MESSAGE_BODY.getTempFileName(), + TemplateFileEnum.EVENT_BODY.getTempFileName(), + TemplateFileEnum.CONVERT.getTempFileName(), + TemplateFileEnum.DOBO_CONVERT.getTempFileName(), + + TemplateFileEnum.MQ_CONSUMER.getTempFileName(), + TemplateFileEnum.MQ_PRODUCER.getTempFileName(), + TemplateFileEnum.MQ_LISTENER.getTempFileName(), + TemplateFileEnum.MQ_HANDLER.getTempFileName(), + TemplateFileEnum.MQ_HANDLER.getTempFileName(), + TemplateFileEnum.CACHE.getTempFileName(), + + TemplateFileEnum.FEIGN.getTempFileName(), + TemplateFileEnum.FEIGN_DDD.getTempFileName(), + TemplateFileEnum.FEIGN_CONTROLLER.getTempFileName(), + TemplateFileEnum.FEIGN_CONTROLLER_DDD.getTempFileName(), + TemplateFileEnum.BASE_EVENT.getTempFileName(), + TemplateFileEnum.APP_EVENT_PUBLISHER.getTempFileName(), + GlobalConstant.SINGLE_CLASS_COMMON, TemplateFileEnum.SPRING_APPLICATION_CONTEXT.getTempFileName())), + + + + + + + /** * */ @@ -77,7 +168,8 @@ public enum ModuleEnum { TemplateFileEnum.FACADE_DDD.getTempFileName(), TemplateFileEnum.DTO_DDD.getTempFileName(), TemplateFileEnum.DTO.getTempFileName(), - TemplateFileEnum.API_ENUM.getTempFileName() + TemplateFileEnum.API_ENUM.getTempFileName(), + GlobalConstant.SINGLE_CLASS_COMMON )), /** * @@ -88,7 +180,8 @@ public enum ModuleEnum { TemplateFileEnum.MAPPER_DDD.getTempFileName(), TemplateFileEnum.MAPPER_XML_DDD.getTempFileName(), - TemplateFileEnum.DATA_OBJECT.getTempFileName() + TemplateFileEnum.DATA_OBJECT.getTempFileName(), + GlobalConstant.SINGLE_CLASS_COMMON )), /** * @@ -132,11 +225,26 @@ public enum ModuleEnum { TemplateFileEnum.MQ_CONSUMER.getTempFileName(), TemplateFileEnum.MQ_PRODUCER.getTempFileName(), TemplateFileEnum.MQ_LISTENER.getTempFileName(), - TemplateFileEnum.MQ_HANDLER.getTempFileName() + TemplateFileEnum.MQ_HANDLER.getTempFileName(), + TemplateFileEnum.CACHE.getTempFileName(), + GlobalConstant.SINGLE_CLASS_COMMON + )), + /** + * + */ + COLA_FEIGN_API("cola","cola-feign-api", Sets.newHashSet( + TemplateFileEnum.FEIGN.getTempFileName(), + TemplateFileEnum.FEIGN_DDD.getTempFileName(), + TemplateFileEnum.DTO_DDD.getTempFileName(), + TemplateFileEnum.DTO.getTempFileName(), + TemplateFileEnum.API_ENUM.getTempFileName(), + GlobalConstant.SINGLE_CLASS_COMMON + )), + /** * */ @@ -146,7 +254,8 @@ public enum ModuleEnum { TemplateFileEnum.VO.getTempFileName(), TemplateFileEnum.CONTROLLER_DDD.getTempFileName(), TemplateFileEnum.VOBO_CONVERT.getTempFileName(), - TemplateFileEnum.VO_DDD.getTempFileName() + TemplateFileEnum.VO_DDD.getTempFileName(), + GlobalConstant.SINGLE_CLASS_COMMON )), @@ -165,7 +274,8 @@ public enum ModuleEnum { TemplateFileEnum.MESSAGE_BODY.getTempFileName(), TemplateFileEnum.EVENT_BODY.getTempFileName(), TemplateFileEnum.BASE_EVENT.getTempFileName(), - TemplateFileEnum.ENUM.getTempFileName() + TemplateFileEnum.ENUM.getTempFileName(), + GlobalConstant.SINGLE_CLASS_COMMON )), /** @@ -176,7 +286,8 @@ public enum ModuleEnum { TemplateFileEnum.DTO_DDD.getTempFileName(), TemplateFileEnum.FACADE.getTempFileName(), TemplateFileEnum.FACADE_DDD.getTempFileName(), - TemplateFileEnum.API_ENUM.getTempFileName() + TemplateFileEnum.API_ENUM.getTempFileName(), + GlobalConstant.SINGLE_CLASS_COMMON )), /** @@ -197,9 +308,12 @@ public enum ModuleEnum { TemplateFileEnum.ACL_IMPL.getTempFileName(), TemplateFileEnum.ACL_PARAM.getTempFileName(), + TemplateFileEnum.CACHE.getTempFileName(), + TemplateFileEnum.MQ_CONSUMER.getTempFileName(), TemplateFileEnum.MQ_PRODUCER.getTempFileName(), - TemplateFileEnum.MQ_HANDLER.getTempFileName() + TemplateFileEnum.MQ_HANDLER.getTempFileName(), + GlobalConstant.SINGLE_CLASS_COMMON )), /** @@ -219,9 +333,49 @@ public enum ModuleEnum { TemplateFileEnum.DTOBO_CONVERT.getTempFileName(), TemplateFileEnum.FACADE_AOP.getTempFileName(), TemplateFileEnum.APP_EVENT_PUBLISHER.getTempFileName(), - TemplateFileEnum.MQ_LISTENER.getTempFileName() - + TemplateFileEnum.MQ_LISTENER.getTempFileName(), + GlobalConstant.SINGLE_CLASS_COMMON )), + + + /** + * + */ + COLA_API_DOC("cola","api-doc", Sets.newHashSet( + TemplateFileEnum.API_HTTP.getTempFileName(), + TemplateFileEnum.API_RPC.getTempFileName() + )), + + /** + * + */ + COLA_START("cola","cola-start", Sets.newHashSet( + GlobalConstant.SINGLE_CLASS_COMMON + )), + + + /** + * + */ + DUBBO_API_DOC("dubbo","api-doc", Sets.newHashSet( + TemplateFileEnum.API_RPC.getTempFileName() + )), + + /** + * + */ + SPRINGBOOT_API_DOC("springboot","api-doc", Sets.newHashSet( + TemplateFileEnum.API_HTTP.getTempFileName() + )), + + /** + * + */ + SC_API_DOC("springcloud","api-doc", Sets.newHashSet( + TemplateFileEnum.API_HTTP.getTempFileName(), + TemplateFileEnum.API_RPC.getTempFileName() + )), + ; private String appName; private String moduleName; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/enums/TemplateFileEnum.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/enums/TemplateFileEnum.java similarity index 91% rename from codemaker-core/src/main/java/com/coderman/codemaker/enums/TemplateFileEnum.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/enums/TemplateFileEnum.java index 558e7c28d39271f6955c7562f5ead1f37820c08a..4fbbc5ed79d2cece572b492f370bd9e1e6cf33f8 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/enums/TemplateFileEnum.java +++ b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/enums/TemplateFileEnum.java @@ -27,6 +27,7 @@ public enum TemplateFileEnum { BUSINESS_OBJECT("bo"), CONVERT("convert"), DTOBO_CONVERT("dtoboconvert"), + DTO2DTO_CONVERT("dto2dtoconvert"), DOBO_CONVERT("doboconvert"), FACADE_AOP("facadeaop"), GATAWAY("gataway"), @@ -63,6 +64,16 @@ public enum TemplateFileEnum { BASE_EVENT("BaseEvent"), MAPPER_DDD("mapperddd"), MAPPER_XML_DDD("mapperxmlddd"), + API_HTTP("http"), + API_RPC("rpc"), + CACHE("cache"), + + FEIGN("feign"), + FEIGN_DDD("feignddd"), + FEIGN_CONTROLLER("feigncontroller"), + FEIGN_CONTROLLER_DDD("feigncontrollerddd"), + + ; private String tempFileName; TemplateFileEnum(String tempFileName){ diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/enums/VisibilityEnum.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/enums/VisibilityEnum.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/enums/VisibilityEnum.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/enums/VisibilityEnum.java diff --git a/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/enums/dynamic/DecorateTypeEnum.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/enums/dynamic/DecorateTypeEnum.java new file mode 100644 index 0000000000000000000000000000000000000000..0b13ed47ed4814691193ae96454f46194232395a --- /dev/null +++ b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/enums/dynamic/DecorateTypeEnum.java @@ -0,0 +1,37 @@ +package com.coderman.codemaker.enums.dynamic; + +/** + * Description: + * date: 2021/11/24 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +public enum DecorateTypeEnum { + CLASS_ANNOTATION("CLASS_ANNOTATION","类上加注解"), + CLASS_IMPL_INTERFACE("CLASS_IMPL","类加上实现接口"), + + METHOD_ANNOTATION("METHOD_ANNOTATION","方法上加注解"), + METHOD_RETURN_CLASS("METHOD_RETURN_CLASS","方法返回值类包装"), + METHOD_RETURN_PAGEDTO_CLASS("METHOD_RETURN_PAGEDTO_CLASS","方法分页类包装"), + + METHOD_RETURN_PAGEVO_CLASS("METHOD_RETURN_PAGEVO_CLASS","方法分页类包装"), + + ; + + private String code; + private String desc; + DecorateTypeEnum(String code, String desc){ + this.code = code; + this.desc = desc; + } + + public String getCode() { + return code; + } + + public String getDesc() { + return desc; + } +} diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/enums/dynamic/InvokeLayerTypeEnum.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/enums/dynamic/InvokeLayerTypeEnum.java similarity index 49% rename from codemaker-core/src/main/java/com/coderman/codemaker/enums/dynamic/InvokeLayerTypeEnum.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/enums/dynamic/InvokeLayerTypeEnum.java index 6b89d8bbd72250ab18b8971a9b3bda3ce5a503d8..63cdd453a6fee7e3bcbf4e99c4a1e39b0d59466c 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/enums/dynamic/InvokeLayerTypeEnum.java +++ b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/enums/dynamic/InvokeLayerTypeEnum.java @@ -1,5 +1,6 @@ package com.coderman.codemaker.enums.dynamic; +import com.coderman.codemaker.enums.DomainElementEnum; import com.coderman.codemaker.enums.TemplateFileEnum; import com.google.common.collect.Sets; @@ -19,22 +20,34 @@ public enum InvokeLayerTypeEnum { TemplateFileEnum.EXE.getTempFileName(), TemplateFileEnum.EXE_ABSTRACT.getTempFileName(), TemplateFileEnum.EXE_IMPL.getTempFileName(), - TemplateFileEnum.MQ_LISTENER.getTempFileName() + TemplateFileEnum.MQ_LISTENER.getTempFileName(), + "app_rpc" )), - APP_HTTP("app_http", Sets.newHashSet(TemplateFileEnum.CONTROLLER.getTempFileName())), - DOMAIN("domain", Sets.newHashSet(TemplateFileEnum.GATAWAY.getTempFileName(), + + APP_HTTP("app_http", Sets.newHashSet( + TemplateFileEnum.CONTROLLER.getTempFileName(), + "app_http") + ), + + DOMAIN("domain", Sets.newHashSet( + TemplateFileEnum.GATAWAY.getTempFileName(), TemplateFileEnum.REPOSITORY.getTempFileName(), TemplateFileEnum.SERVICE.getTempFileName(), - TemplateFileEnum.FACTORY.getTempFileName() + TemplateFileEnum.FACTORY.getTempFileName(), + "domain" )), - INFRAST("infrast", Sets.newHashSet( TemplateFileEnum.MQ_PRODUCER.getTempFileName(), + INFRAST("infrast", Sets.newHashSet( + TemplateFileEnum.MQ_PRODUCER.getTempFileName(), TemplateFileEnum.MAPPER.getTempFileName(), - TemplateFileEnum.ACL.getTempFileName(), + DomainElementEnum.ADAPTER.getElement(), TemplateFileEnum.MQ_PRODUCER.getTempFileName(), TemplateFileEnum.MQ_HANDLER.getTempFileName(), - TemplateFileEnum.MQ_CONSUMER.getTempFileName() + TemplateFileEnum.MQ_CONSUMER.getTempFileName(), + "infrast" )), + ACL_API("aclapi",Sets.newHashSet("aclapi")) + ; private String code; private Set classTypeSet; @@ -68,4 +81,40 @@ public enum InvokeLayerTypeEnum { } return layerName.get(); } + + + + /** + * 根据类名获取类所在层 + * @param invokeLayerStr + * @return + */ + public static String getInvokeLayerCode(String invokeLayerStr){ + AtomicReference layerName = new AtomicReference<>(""); + for (InvokeLayerTypeEnum layerTypeEnum : InvokeLayerTypeEnum.values()){ + layerTypeEnum.getClassTypeSet().forEach(classType->{ + if(invokeLayerStr.toLowerCase().startsWith(classType)){ + layerName.set(layerTypeEnum.code); + } + }); + } + return layerName.get(); + } + + /** + * 根据类名获取类所在层 + * @param invokeLayerStr + * @return + */ + public static String getProvideLayerCode(String invokeLayerStr){ + AtomicReference layerName = new AtomicReference<>(""); + for (InvokeLayerTypeEnum layerTypeEnum : InvokeLayerTypeEnum.values()){ + layerTypeEnum.getClassTypeSet().forEach(classType->{ + if(invokeLayerStr.toLowerCase().endsWith(classType)){ + layerName.set(layerTypeEnum.code); + } + }); + } + return layerName.get(); + } } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/enums/dynamic/InvokeSceneTypeEnum.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/enums/dynamic/InvokeSceneTypeEnum.java similarity index 55% rename from codemaker-core/src/main/java/com/coderman/codemaker/enums/dynamic/InvokeSceneTypeEnum.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/enums/dynamic/InvokeSceneTypeEnum.java index 09484bb416959e9b1b3a143f9f560cebf7595a24..579a1f8bde6b6998bb671ea91255e2a7854b3271 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/enums/dynamic/InvokeSceneTypeEnum.java +++ b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/enums/dynamic/InvokeSceneTypeEnum.java @@ -22,7 +22,8 @@ public enum InvokeSceneTypeEnum { DOMAIN_TO_INFRAST("domain2infrast","领域层->基础设施层"), DOMAIN_TO_SELF("domain2self","领域层->领域层"), - INFRAST_TO_SELF("infrast2self","基础设施层->基础设施层"), + INFRAST_TO_SELF("infrast2self","基础设施层->依赖服务"), + INFRAST_TO_API("infrast2api","基础设施层->依赖服务层"), ; private String code; @@ -51,6 +52,57 @@ public enum InvokeSceneTypeEnum { public static String getInvokeScene(String invokeClassName,String providerClassName){ String invokerLayer = InvokeLayerTypeEnum.getLayerCode(invokeClassName); String providerLayer = InvokeLayerTypeEnum.getLayerCode(providerClassName); + //这里增加一个infrast 到下游调用方的调用层类型判断 + if(invokerLayer.equals(InvokeLayerTypeEnum.INFRAST.getCode()) && StringUtils.isEmpty(providerLayer)){ + return InvokeSceneTypeEnum.INFRAST_TO_API.code; + } + if(StringUtils.isEmpty(invokerLayer) || StringUtils.isEmpty(providerLayer)){ + return null; + } + + for (InvokeSceneTypeEnum invokeSceneTypeEnum : InvokeSceneTypeEnum.values()){ + if(invokerLayer.equals(providerLayer) && providerLayer.equals(InvokeLayerTypeEnum.APP_RPC.getCode())){ + return InvokeSceneTypeEnum.APP_RPC_TO_SELF.getCode(); + } + + if(invokerLayer.equals(providerLayer) && providerLayer.equals(InvokeLayerTypeEnum.APP_HTTP.getCode())){ + return InvokeSceneTypeEnum.APP_HTTP_TO_SELF.getCode(); + } + + if(invokerLayer.equals(providerLayer) && providerLayer.equals(InvokeLayerTypeEnum.DOMAIN.getCode())){ + return InvokeSceneTypeEnum.DOMAIN_TO_SELF.getCode(); + } + + if(invokerLayer.equals(providerLayer) && providerLayer.equals(InvokeLayerTypeEnum.INFRAST.getCode())){ + return InvokeSceneTypeEnum.INFRAST_TO_SELF.getCode(); + } + + if(invokeSceneTypeEnum.getCode().contains(invokerLayer) && invokeSceneTypeEnum.getCode().contains(providerLayer)){ + return invokeSceneTypeEnum.getCode(); + } + } + + + return null; + } + + /** + * 根据调用方向判断调用场景 + * @param invokeSceneStr + * @param + * @return + */ + public static String getInvokeSceneV2(String invokeSceneStr){ + + String invokerLayer = InvokeLayerTypeEnum.getInvokeLayerCode(invokeSceneStr); + String providerLayer = InvokeLayerTypeEnum.getProvideLayerCode(invokeSceneStr); + + if(invokerLayer.equals(InvokeLayerTypeEnum.INFRAST.getCode()) && StringUtils.isEmpty(providerLayer)){ + return InvokeSceneTypeEnum.INFRAST_TO_API.code; + } + + + if(StringUtils.isEmpty(invokerLayer) || StringUtils.isEmpty(providerLayer)){ return null; } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/enums/dynamic/ReadWriteTypeEnum.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/enums/dynamic/ReadWriteTypeEnum.java similarity index 75% rename from codemaker-core/src/main/java/com/coderman/codemaker/enums/dynamic/ReadWriteTypeEnum.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/enums/dynamic/ReadWriteTypeEnum.java index 1a2fe25801621f336b158213ab78d9a0e4551066..68eb26251cd8b398f46a0411f8c375eed918a7b2 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/enums/dynamic/ReadWriteTypeEnum.java +++ b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/enums/dynamic/ReadWriteTypeEnum.java @@ -1,9 +1,8 @@ package com.coderman.codemaker.enums.dynamic; +import com.google.common.collect.Sets; 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; @@ -26,16 +25,16 @@ public enum ReadWriteTypeEnum { private String desc; //支持业务领域动词注册功能 - private static Set readSet = Sets.newSet("search","get","find","select","load","read","query","export"); + private static Set readSet = Sets.newHashSet("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 writeSet = Sets.newHashSet("write","regist","update","create","save","insert","delete","init","import"); - private static Set insertSet = Sets.newSet("batchinsert","insertbatch","savebatch","save","batchsave"); + private static Set insertSet = Sets.newHashSet("batchinsert","insertbatch","savebatch","save","batchsave"); - private static Set updateSet = Sets.newSet("batchupdate","updatebatch","update"); + private static Set updateSet = Sets.newHashSet("batchupdate","updatebatch","update"); - private static Set deleteSet = Sets.newSet("deletebatch","batchdelete","update"); + private static Set deleteSet = Sets.newHashSet("deletebatch","batchdelete","update"); ReadWriteTypeEnum(String code, String desc){ this.code = code; @@ -137,4 +136,20 @@ public enum ReadWriteTypeEnum { } return null; } + + /** + * 将自定义的读操作统一语言注册到默认的读操作定义集合中 + * @param readDslSet + */ + public static void putReadDSL(Set readDslSet){ + readSet.addAll(readDslSet); + } + + /** + * 将自定义的读操作统一语言注册到默认的写操作定义集合中 + * @param writeDslSet + */ + public static void putWriteDSL(Set writeDslSet){ + writeSet.addAll(writeDslSet); + } } diff --git a/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/utils/StringHandleUtils.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/utils/StringHandleUtils.java new file mode 100644 index 0000000000000000000000000000000000000000..2847a642f6a6e7dd8fe42681f8f61e0cb8a4ef1f --- /dev/null +++ b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/utils/StringHandleUtils.java @@ -0,0 +1,133 @@ +package com.coderman.codemaker.utils; + +import com.google.common.collect.Sets; +import org.apache.commons.lang3.StringUtils; + +import java.util.Set; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * Description: + * date: 2021/10/12 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +public class StringHandleUtils { + + private static Set basicTypeSet = Sets.newHashSet("Integer","int" + ,"long","Long" + ,"String", + "Float","float", + "Boolean","boolean", + "Short","short" + ,"Double","double","[]","Object"); + + /** + * 严格基本数据类型 + */ + private static Set strictBasicTypeSet = Sets.newHashSet("int" + ,"long" + ,"float" + ,"boolean" + ,"short" + ,"double"); + + + /** + * 判断字符串中是否包含中文 + * @param str + * 待校验字符串 + * @return 是否为中文 + * @warn 不能校验是否为中文标点符号 + */ + public static boolean isContainChinese(String str) { + Pattern p = Pattern.compile("[\u4e00-\u9fa5]"); + Matcher m = p.matcher(str); + if (m.find()) { + return true; + } + return false; + } + + /** + * 通过变量类型获取变量对应的变量名 + * @param paramType + * @return + */ + public static String getParamVar(String paramType){ + if(StringUtils.isEmpty(paramType.trim())){ + return "null"; + } + 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); + } + + /** + * 判断参数是不是基本类型 + * @param paramType + * @return + */ + public static boolean isBasicType(String paramType){ + AtomicBoolean basicType = new AtomicBoolean(false); + basicTypeSet.forEach(str->{ + if(paramType.contains(str)){ + basicType.set(true); + } + }); + return basicType.get(); + } + + /** + * 判断参数是不是严格的基本类型 + * @param paramType + * @return + */ + public static boolean isStrictBasicType(String paramType){ + AtomicBoolean basicType = new AtomicBoolean(false); + strictBasicTypeSet.forEach(str->{ + if(paramType.contains(str)){ + basicType.set(true); + } + }); + return basicType.get(); + } + + + /** + * 将返回参数包装类型去掉 + * Result + * ResultDto + * ResultDataDto + * SdkResponse + * Response + * ResultDto + * ResultDto> + * SdkResponse + * @param paramType + * @return + */ + public static String getParamTypeNoWrapper(String paramType){ + boolean wrapper = paramType.contains("Result") || paramType.equals("Response"); + //如果是包装类型，但是却没有范型声明则返回null + if(wrapper){ + if(!paramType.contains("<")){ + return null; + } + String result = paramType.substring(paramType.indexOf("<")+1); + return result.substring(0,result.length() - 1); + } + return paramType; + } +} diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/utils/StringHelperUtils.java b/codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/utils/StringHelperUtils.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/utils/StringHelperUtils.java rename to codemaker-parent/codemaker-api/src/main/java/com/coderman/codemaker/utils/StringHelperUtils.java diff --git a/codemaker-parent/codemaker-api/src/test/java/org/example/AppTest.java b/codemaker-parent/codemaker-api/src/test/java/org/example/AppTest.java new file mode 100644 index 0000000000000000000000000000000000000000..6a1d2d79f7878de5144c8a33c09e56d788dfdacb --- /dev/null +++ b/codemaker-parent/codemaker-api/src/test/java/org/example/AppTest.java @@ -0,0 +1,20 @@ +package org.example; + +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +/** + * Unit test for simple App. + */ +public class AppTest +{ + /** + * Rigorous Test :-) + */ + @Test + public void shouldAnswerWithTrue() + { + assertTrue( true ); + } +} diff --git a/codemaker-parent/codemaker-apiImpl/pom.xml b/codemaker-parent/codemaker-apiImpl/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..542e84495fd31a7af6e74bde4da1c993d278e079 --- /dev/null +++ b/codemaker-parent/codemaker-apiImpl/pom.xml @@ -0,0 +1,78 @@ + + + + 4.0.0 + + com.coderman.codemaker + codemaker-parent + 1.2.2-SNAPSHOT + + com.coderman.codemaker + codemaker-apiImpl + 1.0-SNAPSHOT + + jar + + codemaker-apiImpl + + http://www.example.com + + + UTF-8 + 1.7 + 1.7 + + + + + + com.coderman.codemaker + codemaker-api + 1.0-SNAPSHOT + + + + + junit + junit + 4.11 + test + + + + org.springframework + spring-context + + + + org.springframework + spring-expression + + + + com.alibaba + fastjson + 1.2.72 + + + + org.projectlombok + lombok + 1.18.12 + + + + com.coderman.utils + coderman-utils + 1.0.4-SNAPSHOT + + + + + + + + + + diff --git a/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/classloader/CompClassFactory.java b/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/classloader/CompClassFactory.java new file mode 100644 index 0000000000000000000000000000000000000000..8368a146baa40c2dc75f95e589172dffdc124447 --- /dev/null +++ b/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/classloader/CompClassFactory.java @@ -0,0 +1,294 @@ +package com.coderman.codemaker.classloader; + +import com.coderman.codemaker.bean.plantuml.*; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import java.lang.reflect.*; +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Pattern; + +/** + * Description: + * date: 2021/11/23 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +@Service +public class CompClassFactory { + + + /** + * 批量转换 + * @param classList + * @param compName + * @return + */ + public List convert2ClassBean(List> classList,String compName){ + if(CollectionUtils.isEmpty(classList)){ + return new ArrayList<>(); + } + List list = new ArrayList<>(); + for (Class clazz : classList){ + list.add(buildClassBean(clazz,compName)); + } + return list; + } + + + /** + * 批量转换 + * @param classList + * @return + */ + public List convert2InterfaceBean(List> classList,String compName){ + if(CollectionUtils.isEmpty(classList)){ + return new ArrayList<>(); + } + List list = new ArrayList<>(); + for (Class clazz : classList){ + list.add(buildInterfaceBean(clazz,compName)); + } + return list; + } + + /** + * 通过类加载将类的信息转换到代码模型上 + * @param clazz + * @return + */ + private ClassBean buildClassBean(Class clazz,String compName){ + ClassBean classBean = new ClassBean(); + classBean.setPackageName(clazz.getCanonicalName()); + classBean.setClassName(clazz.getSimpleName()); + classBean.setCompName(compName); + classBean.setFieldBeanList(buildFieldBeanList(clazz.getDeclaredFields())); + classBean.setMethodBeanList(buildMethodBeanList(clazz.getDeclaredMethods())); + return classBean; + } + + /** + * 通过类加载将类的信息转换到代码模型上 + * @param clazz + * @return + */ + private InterfaceBean buildInterfaceBean(Class clazz,String compName){ + InterfaceBean interfaceBean = new InterfaceBean(); + interfaceBean.setPackageName(clazz.getPackage().getName()); + interfaceBean.setClassName(clazz.getSimpleName()); + interfaceBean.setCompName(compName); + interfaceBean.setFieldBeanList(buildFieldBeanList(clazz.getDeclaredFields())); + + interfaceBean.setMethodBeanList(buildMethodBeanList(clazz.getDeclaredMethods())); + + return interfaceBean; + } + + + + /** + * 构建属性模型 + * @param fields + * @return + */ + private List buildFieldBeanList(Field[] fields){ + List fieldBeanList = new ArrayList<>(); + for (Field field : fields){ + FieldBean fieldBean = new FieldBean(); + fieldBean.setFieldSimpleName(field.getName()); + fieldBean.setFieldType(field.getType().getName()); + fieldBean.setFieldName(field.getType().getCanonicalName() +" "+field.getName()); + fieldBeanList.add(fieldBean); + } + return fieldBeanList; + } + + + /** + * 构建方法模型 + * @param methods + * @return + */ + private List buildMethodBeanList(Method [] methods){ + List methodBeanList = new ArrayList<>(); + for (Method method : methods){ + MethodBean methodBean = new MethodBean(); + String paramStr = buildSimpleMethodParam(method); + if(!StringUtils.isEmpty(paramStr)){ + methodBean.setMethodName(method.getName()+"("+paramStr+")"); + }else { + methodBean.setMethodName(method.getName()); + } + if(method.getGenericReturnType() != null){ + methodBean.setGenericReturnType(method.getGenericReturnType().getTypeName()); + } + methodBean.setReturnClass(buildSimpleReturnClass(methodBean.getGenericReturnType())); + methodBean.setClassName(method.getDeclaringClass().getSimpleName()); + methodBean.setReturnClassPackage(method.getReturnType().getCanonicalName()); + methodBean.buildParamArr(); + if (Modifier.isStatic(method.getModifiers())) { + methodBean.setStatic(true); + } + methodBean.setGenericParamList(getParamList(method)); + methodBeanList.add(methodBean); + } + return methodBeanList; + } + + + + /** + * 构建注解模型 + * @param annotationList + * @return + */ + public List convert2AnnotationBean(List annotationList){ + List annotationBeanList = new ArrayList<>(); + for (String annotation : annotationList){ + AnnotationBean annotationBean = new AnnotationBean(); + annotationBean.setPackageName(annotation); + annotationBean.setClassName(annotation.substring(annotation.lastIndexOf(".")+1)); + annotationBeanList.add(annotationBean); + } + + return annotationBeanList; + } + + /** + * 构建注解模型 + * @param annotationList + * @return + */ + public List convert2AnnotationBeanClass(List> annotationList){ + List annotationBeanList = new ArrayList<>(); + for (Class annotation : annotationList){ + AnnotationBean annotationBean = new AnnotationBean(); + annotationBean.setPackageName(annotation.getPackage().getName()); + annotationBean.setClassName(annotation.getSimpleName()); + annotationBeanList.add(annotationBean); + } + + return annotationBeanList; + } + + + + /** + * 根据反射构建简单方法名词 + * @param method + * @return + */ + private String buildSimpleMethodParam(Method method){ + // 获取参数，可能是多个，所以是数组 + Type[] parameterTypes = method.getGenericParameterTypes(); + if(parameterTypes == null){ + return null; + } + List simpleParamList = new ArrayList<>(); + for (Type paramType : parameterTypes) { + if(paramType == null || StringUtils.isEmpty(paramType.getTypeName())){ + continue; + } + if(paramType.getTypeName().contains(".")){ + String [] paramArr = paramType.getTypeName().split("\\."); + List paramList = new ArrayList<>(); + + String pattern = "^[A-Z].*?"; + for (String param : paramArr){ + boolean match = Pattern.matches(pattern, param); + if(match){ + paramList.add(param.replace("<","").replace(">","")); + } + } + + String paramStr = buildSimpleParam(paramList); + + simpleParamList.add(paramStr); + }else { + simpleParamList.add(paramType.getTypeName()+" "+paramType.getTypeName().substring(0,1).toLowerCase()); + } + } + if(simpleParamList.size() == 1){ + return simpleParamList.get(0); + } + return StringUtils.join(simpleParamList,", "); + } + + + /** + * 构建方法的每个参数 + * @param list + * @return + */ + private String buildSimpleParam(List list){ + if(CollectionUtils.isEmpty(list)){ + return null; + } + //简单参数类型，没有范型符号或者不是集合类数据 + if(list.size() == 1){ + return list.get(0) + " " + list.get(0).substring(0,1).toLowerCase()+list.get(0).substring(1); + } + String first = list.get(0); + if(list.size() == 2 && first.endsWith("List")){ + return list.get(0)+"<"+list.get(1)+">" + " list"; + } + if(list.size() == 2 && first.endsWith("Set")){ + return list.get(0) + "<" + list.get(1)+">"+" set"; + } + if(list.size() == 3 && first.endsWith("Map")){ + return list.get(0) + "<" + list.get(1)+","+list.get(2)+">"+" map"; + } + return null; + } + + + /** + * 从范型中构建精简的返回类型 + * @param genericReturnType + * @return + */ + private String buildSimpleReturnClass(String genericReturnType){ + if(StringUtils.isEmpty(genericReturnType) || genericReturnType.equals("void")){ + return "void"; + } + String [] paramArr = genericReturnType.split("\\."); + List paramList = new ArrayList<>(); + + String pattern = "^[A-Z].*?"; + for (String param : paramArr){ + boolean match = Pattern.matches(pattern, param); + if(match){ + if(param.contains("<")){ + param = param.split("<")[0]+"<"; + } + paramList.add(param); + } + } + return StringUtils.join(paramList,""); + } + + /** + * 获取组件方法的范型参数列表 + * @param method + * @return + */ + private List getParamList(Method method) { + List paramList = new ArrayList<>(); + Type[] types = method.getGenericParameterTypes();// 获取参数，可能是多个，所以是数组 + if(types == null){ + return new ArrayList<>(); + } + for (Type type : types) { + if(type == null || StringUtils.isEmpty(type.getTypeName())){ + continue; + } + paramList.add(type.getTypeName()); + } + return paramList; + } + +} diff --git a/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/classloader/CompClassLoadService.java b/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/classloader/CompClassLoadService.java new file mode 100644 index 0000000000000000000000000000000000000000..0bac3fb722a843bf96f595409ad2ab2a1fdbdd8c --- /dev/null +++ b/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/classloader/CompClassLoadService.java @@ -0,0 +1,187 @@ +package com.coderman.codemaker.classloader; + +import com.coderman.codemaker.bean.component.ComponentConfigBean; +import com.coderman.codemaker.bean.component.ComponentContextBean; +import com.coderman.codemaker.bean.plantuml.AnnotationBean; +import com.coderman.codemaker.bean.plantuml.ClassBean; +import com.coderman.codemaker.bean.plantuml.EnumBean; +import com.coderman.codemaker.bean.plantuml.InterfaceBean; +import com.coderman.utils.clazz.ClassUtils; +import org.apache.commons.lang3.ClassLoaderUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + + +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.*; +import java.util.jar.JarEntry; +import java.util.jar.JarFile; + +/** + * Description: + * date: 2021/11/22 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +@Service +//@Slf4j +public class CompClassLoadService { + /** jar中的文件路径分隔符 */ + private static final char SLASH_CHAR = '/'; + /** 包名分隔符 */ + private static final char DOT_CHAR = '.'; + + @Value(value = "${application.maven.repo.path}") + private String mavenRepoPath; + + + @Autowired + private CompClassFactory compClassFactory; + + /** + * 通过类加载机制加载组件内需要被依赖的class,enum,annotation,interfance + * @param componentConfigBean + * @return + */ + public ComponentContextBean loadComponent(ComponentConfigBean componentConfigBean){ + + ComponentContextBean componentContextBean = new ComponentContextBean(); + CompClassLoader classLoader = buildClassLoader(componentConfigBean); + List> classList = classLoader.loadClassList(componentConfigBean.getClassList()); + List classBeanList = compClassFactory.convert2ClassBean(classList, componentConfigBean.getServiceName()); + componentContextBean.setClassBeanList(classBeanList); + + + List> interfaceList = classLoader.loadClassList(componentConfigBean.getInterfaceList()); + List interfaceBeanList = compClassFactory.convert2InterfaceBean(interfaceList,componentConfigBean.getServiceName()); + componentContextBean.setInterfaceBeanList(interfaceBeanList); + + //注解 + componentContextBean.setAnnotationList(compClassFactory.convert2AnnotationBean(componentConfigBean.getAnnotationList())); + + //如果具体类没有扫描到，则进行包扫描，递归扫描组件的包内容 + if(componentContextBean.isEmpty()){ + try { + return loadComp(componentConfigBean); + } catch (IOException e) { + e.printStackTrace(); + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } + + } + return componentContextBean; + } + + + /** + * 根据组件模型构建一个类加载器 + * @param componentConfigBean + * @return + */ + private CompClassLoader buildClassLoader(ComponentConfigBean componentConfigBean){ + CompClassLoader myClassLoader = null; + try { + + myClassLoader = new CompClassLoader(componentConfigBean.buildRepoJarPath(mavenRepoPath), Thread.currentThread().getContextClassLoader().getParent()); + Thread.currentThread().setContextClassLoader(myClassLoader); + } catch (MalformedURLException e) { + e.printStackTrace(); + } + return myClassLoader; + } + + /** + * 扫描组件指定包下所有类 + * @param componentConfigBean + * @return + */ + private ComponentContextBean loadComp(ComponentConfigBean componentConfigBean) throws IOException, ClassNotFoundException { + ComponentContextBean componentContextBean = new ComponentContextBean(); + + String jarPath = componentConfigBean.buildJarPath(mavenRepoPath); + URL[] urls = new URL[1]; + urls[0] = new URL("file:" + jarPath); + + /** + * 组件需要暴露的枚举类 + */ + List> enumClassList = new ArrayList<>(128); + + /** + * 组件需要暴露的class类 + */ + List> classList = new ArrayList<>(128); + + /** + * 组件需要暴露的接口类 + */ + List> interfaceClassList = new ArrayList<>(128); + + /** + * 注解列表 + */ + List> annotationClassList = new ArrayList<>(128); + + URLClassLoader classLoader = new URLClassLoader(urls); + JarFile jarfile = new JarFile(jarPath); + Enumeration iterator = jarfile.entries(); + while (iterator.hasMoreElements()) { + //这里拿到的一般的"aa/bb/.../cc.class"格式的Entry或 "包路径" + JarEntry jarEntry = iterator.nextElement(); + if (!jarEntry.isDirectory()) { + String name = jarEntry.getName(); + //对于拿到的文件,要去除末尾的.class + int lastDotClassIndex = name.lastIndexOf(".class"); + if(lastDotClassIndex != -1) { + name = name.replace(SLASH_CHAR, DOT_CHAR); + Class clazz = classLoader.loadClass(name.replace(".class","")); + //如果配置了包名，则按报名扫描类 + if(StringUtils.isNotEmpty(componentConfigBean.getPackageName()) && clazz.getPackage().getName().contains(componentConfigBean.getPackageName())){ + if(clazz.isAnnotation()){ + annotationClassList.add(clazz); + } + else if(clazz.isInterface()){ + interfaceClassList.add(clazz); + }else if(clazz.isArray() || clazz.isMemberClass()){ + classList.add(clazz); + }else if(clazz.isEnum()){ + enumClassList.add(clazz); + }else if(!clazz.getName().contains("$")){ + classList.add(clazz); + } + }else { + if(clazz.isAnnotation()){ + annotationClassList.add(clazz); + } + else if(clazz.isInterface()){ + interfaceClassList.add(clazz); + }else if(clazz.isArray() || clazz.isMemberClass()){ + classList.add(clazz); + }else if(clazz.isEnum()){ + enumClassList.add(clazz); + }else if(!clazz.getName().contains("$")){ + classList.add(clazz); + } + } + } + } + } + List classBeanList = compClassFactory.convert2ClassBean(classList,componentConfigBean.getServiceName()); + List interfaceBeanList = compClassFactory.convert2InterfaceBean(interfaceClassList,componentConfigBean.getServiceName()); + List annotationBeanList = compClassFactory.convert2AnnotationBeanClass(annotationClassList); + //todo 枚举 + componentContextBean.setClassBeanList(classBeanList); + componentContextBean.setInterfaceBeanList(interfaceBeanList); + componentContextBean.setAnnotationList(annotationBeanList); + return componentContextBean; + } + +} diff --git a/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/classloader/CompClassLoader.java b/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/classloader/CompClassLoader.java new file mode 100644 index 0000000000000000000000000000000000000000..674a39abc4c04f46865e716d6288259eea78d968 --- /dev/null +++ b/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/classloader/CompClassLoader.java @@ -0,0 +1,96 @@ +package com.coderman.codemaker.classloader; + +import com.alibaba.fastjson.JSON; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; + +import java.io.IOException; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.ArrayList; +import java.util.List; + +/** + * Description: + * date: 2021/11/22 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +public class CompClassLoader extends URLClassLoader { + + + public CompClassLoader(final String path, final ClassLoader parent) throws MalformedURLException { + super(new URL[]{ new URL(path) }, parent); + } + + public static void main(String[] args) throws IOException, ClassNotFoundException { + String path = "jar:file:///Users/dasouche/.m2/repository/com/souche/trade/api/7.0.0-SNAPSHOT/api-7.0.0-SNAPSHOT.jar!/"; + CompClassLoader myClassLoader = new CompClassLoader(path, Thread.currentThread().getContextClassLoader().getParent()); + + + Thread.currentThread().setContextClassLoader(myClassLoader); + + Class clazz = Thread.currentThread() + .getContextClassLoader() + .loadClass("com.souche.trade.api.fullorder.TradeFullOrderFacade"); + System.out.println(clazz.getName()); + for (Method method : clazz.getMethods()){ + System.out.println(method.getName()); + method.getParameterTypes(); + for (Class paramType : method.getParameterTypes()){ + System.out.println( paramType.getName()); + } + } + + Class dtoClass = Thread.currentThread() + .getContextClassLoader() + .loadClass("com.souche.trade.api.fullorder.req.CreateMainOrderRequestDTO"); + System.out.println(dtoClass.getName()); + for (Field field : dtoClass.getDeclaredFields()){ + System.out.println(field.getName()); + } + myClassLoader.close(); + } + + + /** + * 批量加载类 + * @param classList + * @return + */ + public List> loadClassList(List classList){ + if(CollectionUtils.isEmpty(classList)){ + return null; + } + System.out.println(JSON.toJSONString(classList)); + List> list = new ArrayList<>(); + for (String classNamePath : classList){ + Class clazz = loadTargetClass(classNamePath); + list.add(clazz); + } + return list; + } + + /** + * 从jar包中加载具体类 + * @param classPath + * @return + */ + private Class loadTargetClass(String classPath){ + try { + return Thread.currentThread() + .getContextClassLoader() + .loadClass(classPath); + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } + return null; + } + + +} diff --git a/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/component/CompPropReadService.java b/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/component/CompPropReadService.java new file mode 100644 index 0000000000000000000000000000000000000000..11a9fba4b5fc20142b45eff8d14e4d1a7990d04a --- /dev/null +++ b/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/component/CompPropReadService.java @@ -0,0 +1,119 @@ +package com.coderman.codemaker.component; + +import com.coderman.codemaker.bean.GlobalConstant; +import com.coderman.codemaker.bean.component.ComponentConfigBean; +import lombok.extern.slf4j.Slf4j; +import org.springframework.core.io.ClassPathResource; +import org.springframework.stereotype.Service; + +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.*; + +/** + * Description: + * date: 2021/11/23 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +@Service +//@Slf4j +public class CompPropReadService { + /** + * 从配置文件中构建组件bean + * @return + */ + public ComponentConfigBean buildFromProp(String componentPath){ + try { + Properties properties = readPropertiesFile(componentPath); + if(properties == null){ + System.out.println("加载组件配置失败,componentPath = "+componentPath); + return null; + } + ComponentConfigBean componentBean = new ComponentConfigBean(); + + + Object packageValue = properties.getProperty(GlobalConstant.COMP_PACKAGE); + if(packageValue == null){ + componentBean.setPackageName(""); + }else { + componentBean.setPackageName(packageValue.toString()); + } + + for (Map.Entry entry : properties.entrySet()){ + if(entry.getKey().equals(GlobalConstant.COMP_GROUPID)){ + componentBean.setGroupId(entry.getValue().toString()); + } + if(entry.getKey().equals(GlobalConstant.COMP_VERSION)){ + componentBean.setVersion(entry.getValue().toString()); + } + if(entry.getKey().equals(GlobalConstant.COMP_ARTIFACTID)){ + componentBean.setArtifactId(entry.getValue().toString()); + } + if(entry.getKey().equals(GlobalConstant.COMP_SERVICE_NAME)){ + componentBean.setServiceName(entry.getValue().toString()); + } + if(entry.getKey().toString().equals(GlobalConstant.COMP_TYPE)){ + componentBean.setCompType(entry.getValue().toString()); + } + if(entry.getKey().toString().equals(GlobalConstant.COMP_SITE)){ + componentBean.setCompSite(entry.getValue().toString()); + } + if(entry.getKey().toString().equals(GlobalConstant.COMP_DESC)){ + componentBean.setCompDesc(entry.getValue().toString()); + } + if(entry.getKey().toString().equals(GlobalConstant.COMP_SINGLE_CLASS_TYPE)){ + componentBean.setClassType(entry.getValue().toString()); + } + + if(entry.getKey().toString().startsWith(GlobalConstant.COMP_CLASS_PRE)){ + componentBean.addClass(entry.getValue().toString()); + } + if(entry.getKey().toString().startsWith(GlobalConstant.COMP_INTERFACE_PRE)){ + componentBean.addInterface(entry.getValue().toString()); + } + if(entry.getKey().toString().startsWith(GlobalConstant.COMP_ANNOTATION_PRE)){ + componentBean.addAnnotation(entry.getValue().toString()); + } + if(entry.getKey().toString().startsWith(GlobalConstant.COMP_ENUM_PRE)){ + componentBean.addEnum(entry.getValue().toString()); + } + + if(entry.getKey().toString().startsWith(GlobalConstant.COMP_CLASS_METHOD_PRE)){ + componentBean.addMethod(entry.getValue().toString()); + } + } + return componentBean; + } catch (IOException e) { + e.printStackTrace(); + } + return null; + } + + /** + * 读取组件配置文件 + * @param filePath + * @return + * @throws IOException + */ + public Properties readPropertiesFile(String filePath) throws IOException { + InputStream inputStream = null; + try { + ClassPathResource classPathResource = new ClassPathResource(filePath); + inputStream = classPathResource.getInputStream(); + Properties props = new Properties(); + props.load(new InputStreamReader(inputStream, "UTF-8")); + return props; + } catch (Exception e) { + //log("读取组件配置失败,filePath={}",filePath); + return null; + } finally { + if (inputStream != null) { + inputStream.close(); + } + } + } +} diff --git a/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/component/decorate/AppCompDecorateServiceImpl.java b/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/component/decorate/AppCompDecorateServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..4f1997d94ca37179de57232605470a5fd4ef4354 --- /dev/null +++ b/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/component/decorate/AppCompDecorateServiceImpl.java @@ -0,0 +1,107 @@ +package com.coderman.codemaker.component.decorate; + +import com.coderman.codemaker.api.ICompDecorateService; +import com.coderman.codemaker.bean.component.ComponentContextBean; +import com.coderman.codemaker.bean.plantuml.*; +import com.coderman.codemaker.constant.ApiConstant; +import com.coderman.codemaker.element.ElementDecorateHandler; +import com.coderman.codemaker.enums.TemplateFileEnum; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; + +/** + * 装饰可以按一个组件一个组件的装饰实现也可以按应用维度一次性装饰多个组件到代码上下文模型中 + * + * 这里对controller和facade接口方法返回值和方法page参数用apiresult组件进行包装 + * date: 2021/11/26 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +@Component(value = "appCompDecorateService") +public class AppCompDecorateServiceImpl implements ICompDecorateService { + @Resource(name = "eleControllerDecorateHandler") + private ElementDecorateHandler eleControllerDecorateHandler; + + @Resource(name = "eleFacadeDecorateHandler") + private ElementDecorateHandler eleFacadeDecorateHandler; + + @Resource(name = "eleFeignDecorateHandler") + private ElementDecorateHandler eleFeignDecorateHandler; + + @Override + public void decorateComp(ComponentContextBean componentContextBean, PlantUmlContextBean plantUmlContextBean) { + + //包装应用代码内部相关的类 + ClassBean resultDataDtoClassBean = componentContextBean.getTargetClass(ApiConstant.CLASS_API_RESULT_DATA_DTO); + ClassBean pageVOClassBean = componentContextBean.getTargetClass(ApiConstant.CLASS_API_PAGE_VO); + Map controllerClassBeanMap = new HashMap<>(); + controllerClassBeanMap.put(ApiConstant.CLASS_API_RESULT_DATA_DTO, resultDataDtoClassBean); + controllerClassBeanMap.put(ApiConstant.CLASS_API_PAGE_VO, pageVOClassBean); + eleControllerDecorateHandler.decorateElement(controllerClassBeanMap, plantUmlContextBean); + + ClassBean pageDTOClassBean = componentContextBean.getTargetClass(ApiConstant.CLASS_API_PAGE_DTO); + Map apiClassBeanMap = new HashMap<>(); + apiClassBeanMap.put(ApiConstant.CLASS_API_RESULT_DATA_DTO, resultDataDtoClassBean); + apiClassBeanMap.put(ApiConstant.CLASS_API_PAGE_DTO, pageDTOClassBean); + eleFacadeDecorateHandler.decorateElement(apiClassBeanMap, plantUmlContextBean); + + + eleFeignDecorateHandler.decorateElement(apiClassBeanMap, plantUmlContextBean); + + } + + /** + * 包装controller + * @param abstractClassBean + * @param plantUmlContextBean + *//* + private void decorateControllerApiResult(AbstractClassBean abstractClassBean, PlantUmlContextBean plantUmlContextBean) { + if (abstractClassBean == null) { + return; + } + plantUmlContextBean.getDerivedPlantUmlContextBean().getClassBeanMap().forEach((k, v) -> { + if (k.toLowerCase().endsWith(TemplateFileEnum.CONTROLLER.getTempFileName())) { + v.getImportClassList().add(abstractClassBean.getPackageName()); + //导入分页对象 + Optional methodBeanOptional = v.getMethodBeanList().stream().filter(methodBean -> methodBean.getReturnClass().contains(ApiConstant.CLASS_API_PAGE_VO)).findFirst(); + if(methodBeanOptional.isPresent()){ + + } + v.getMethodBeanList().forEach(methodBean -> methodBean.setReturnClass(ApiConstant.CLASS_API_RESULT_DATA_DTO+"<"+methodBean.getReturnClass()+">")); + } + }); + } + + *//** + * 包装facadeimpl + * @param abstractClassBean + * @param plantUmlContextBean + *//* + private void decorateFacadeImpl(AbstractClassBean abstractClassBean, PlantUmlContextBean plantUmlContextBean) { + if (abstractClassBean == null) { + return; + } + plantUmlContextBean.getDerivedPlantUmlContextBean().getClassBeanMap().forEach((k, v) -> { + //装饰dubbo注解 + if (k.toLowerCase().endsWith(TemplateFileEnum.FACADE_IMPL.getTempFileName().toLowerCase()) && abstractClassBean.getPackageName().contains("dubbo")) { + v.setAnnotation("@" + abstractClassBean.getClassName()); + v.getImportClassList().add(abstractClassBean.getPackageName()); + + } + }); + + plantUmlContextBean.getDerivedPlantUmlContextBean().getInterfaceBeanMap().forEach((k, v) -> { + if (k.toLowerCase().endsWith(TemplateFileEnum.FACADE.getTempFileName().toLowerCase())) { + v.getImportClassList().add(abstractClassBean.getPackageName()); + v.getMethodBeanList().forEach(methodBean -> methodBean.setReturnClass(ApiConstant.CLASS_API_RESULT_DATA_DTO+"<"+methodBean.getReturnClass()+">")); + } + }); + + }*/ +} diff --git a/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/component/decorate/DefaultCompDecorateServiceImpl.java b/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/component/decorate/DefaultCompDecorateServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..6aacd349efcc059bb7fa6c5bf6238b79b02f1607 --- /dev/null +++ b/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/component/decorate/DefaultCompDecorateServiceImpl.java @@ -0,0 +1,57 @@ +package com.coderman.codemaker.component.decorate; + +import com.coderman.codemaker.api.ICompDecorateService; +import com.coderman.codemaker.bean.component.ComponentContextBean; +import com.coderman.codemaker.bean.plantuml.*; +import com.coderman.codemaker.constant.ArchConstant; +import com.coderman.codemaker.element.ElementDecorateHandler; +import com.coderman.codemaker.factory.SpringClassBeanFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.Map; + +/** + * Description:这里提供对springboot,springmvc,dubbo框架的代码元素包装包括接口协议的包装 + * 是codemaker本身默认提供的包装，如果是自研框架依然可以定制适配 + * + * date: 2021/11/23 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +@Component(value = "defaultCompDecorateService") +public class DefaultCompDecorateServiceImpl implements ICompDecorateService { + + @Resource(name = "eleControllerDecorateHandler") + private ElementDecorateHandler eleControllerDecorateHandler; + + @Resource(name = "eleFacadeDecorateHandler") + private ElementDecorateHandler eleFacadeDecorateHandler; + + @Resource(name = "eleFeignDecorateHandler") + private ElementDecorateHandler eleFeignDecorateHandler; + + @Autowired + private SpringClassBeanFactory springClassBeanFactory; + + @Override + public void decorateComp(ComponentContextBean componentContextBean, PlantUmlContextBean plantUmlContextBean) { + //只包装框架需要的注解class等信息 + Map controllerClassBeanMap = springClassBeanFactory.buildSpringArchBeanMap(componentContextBean); + + eleControllerDecorateHandler.decorateElement(controllerClassBeanMap, plantUmlContextBean); + + AnnotationBean dubboServiceBean = componentContextBean.getTargetAnnotation(ArchConstant.ANNO_DUBBO_SERVICE); + + Map facadeClassBeanMap = new HashMap<>(); + facadeClassBeanMap.put(ArchConstant.ANNO_DUBBO_SERVICE, dubboServiceBean); + eleFacadeDecorateHandler.decorateElement(facadeClassBeanMap, plantUmlContextBean); + + eleFeignDecorateHandler.decorateElement(controllerClassBeanMap, plantUmlContextBean); + } + +} diff --git a/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/component/package-info.java b/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/component/package-info.java new file mode 100644 index 0000000000000000000000000000000000000000..f4f11691452197e99efde04019b9ee0bbecfb73d --- /dev/null +++ b/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/component/package-info.java @@ -0,0 +1 @@ +package com.coderman.codemaker.component; \ No newline at end of file diff --git a/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/component/regist/CompSingleClassRegistServiceImpl.java b/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/component/regist/CompSingleClassRegistServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..f86d0c9b81e8d80f6e4153bee2a61dad1fa3264a --- /dev/null +++ b/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/component/regist/CompSingleClassRegistServiceImpl.java @@ -0,0 +1,129 @@ +package com.coderman.codemaker.component.regist; + +import com.alibaba.fastjson.JSON; +import com.coderman.codemaker.api.ICompRegistService; +import com.coderman.codemaker.bean.GlobalConstant; +import com.coderman.codemaker.bean.component.ComponentConfigBean; +import com.coderman.codemaker.bean.component.ComponentContextBean; +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.component.CompPropReadService; +import com.coderman.codemaker.enums.ClassEnum; +import com.google.common.collect.Lists; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.io.Resource; +import org.springframework.core.io.ResourceLoader; +import org.springframework.stereotype.Component; + +import java.io.File; +import java.io.IOException; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.List; + +/** + * Description: + * date: 2021/12/24 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +@Component(value = "compSingleClassRegistServiceImpl") +public class CompSingleClassRegistServiceImpl implements ICompRegistService { + @Autowired + private ResourceLoader resourceLoader; + + + @Autowired + private CompPropReadService compPropReadService; + + + @Override + public ComponentContextBean registSingleClass() { + String path = GlobalConstant.COMP_COMPONENT_SINGLE_CLASS_PATH; + Resource resource = resourceLoader.getResource("classpath:"+path); + + try { + File singleClassCompFile = resource.getFile(); + ComponentContextBean componentContextBean = new ComponentContextBean(); + List classBeanList = new ArrayList<>(); + List interfaceBeanList = new ArrayList<>(); + + for (File file : singleClassCompFile.listFiles()){ + ComponentConfigBean componentConfigBean = compPropReadService.buildFromProp(path+"/"+file.getName()); + + if(ClassEnum.CLASS.getClassType().equals(componentConfigBean.getClassType())){ + classBeanList.add(buildClassBean(componentConfigBean, file.getName().split("\\.")[0])); + } + else if(ClassEnum.INTERFACE.getClassType().equals(componentConfigBean.getClassType())){ + interfaceBeanList.add(buildInterfaceBean(componentConfigBean, file.getName().split("\\.")[0])); + } + } + componentContextBean.setClassBeanList(classBeanList); + componentContextBean.setInterfaceBeanList(interfaceBeanList); + return componentContextBean; + } catch (IOException e) { + e.printStackTrace(); + } + return null; + } + + + private ClassBean buildClassBean(ComponentConfigBean componentConfigBean,String className){ + ClassBean classBean = new ClassBean(); + classBean.setPackageName(componentConfigBean.getPackageName()); + classBean.setClassName(className); + classBean.setCompName(GlobalConstant.SINGLE_CLASS_COMMON); + classBean.setMethodBeanList(buildMethodBeanList(componentConfigBean.getMethodList())); + + return classBean; + } + + + private InterfaceBean buildInterfaceBean(ComponentConfigBean componentConfigBean,String className){ + InterfaceBean interfaceBean = new InterfaceBean(); + interfaceBean.setPackageName(componentConfigBean.getPackageName()); + interfaceBean.setClassName(className); + interfaceBean.setCompName(GlobalConstant.SINGLE_CLASS_COMMON); + + interfaceBean.setMethodBeanList(buildMethodBeanList(componentConfigBean.getMethodList())); + return interfaceBean; + } + + /** + * 构建方法列表 + * @param methodStrList + * @return + */ + private List buildMethodBeanList(List methodStrList){ + if(CollectionUtils.isEmpty(methodStrList)){ + return Lists.newArrayList(); + } + List methodBeanList = new ArrayList<>(); + for (String method : methodStrList){ + MethodBean methodBean = new MethodBean(); + if(method.contains("void")){ + methodBean.setReturnClass("void"); + }else { + String returnClass = method.replace("static","").trim().split(" ")[0]; + methodBean.setReturnClass(returnClass); + } + methodBean.setStatic(method.contains("static")); + String [] methodArr = method.split(" "); + for (String str : methodArr){ + if(str.contains("(")){ + String methodName = str.split("\\(")[0]; + methodBean.setMethodName(methodName+method.substring(method.indexOf("("))); + methodBean.buildParamArr(); + } + } + methodBeanList.add(methodBean); + } + return methodBeanList; + } + + +} diff --git a/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/component/scan/AppCompScanServiceImpl.java b/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/component/scan/AppCompScanServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..b721eb27ff1a984ad7b1ecfa8be01cf8a2b1f89b --- /dev/null +++ b/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/component/scan/AppCompScanServiceImpl.java @@ -0,0 +1,52 @@ +package com.coderman.codemaker.component.scan; + +import com.coderman.codemaker.api.ICompScanService; +import com.coderman.codemaker.bean.GlobalConstant; +import com.coderman.codemaker.bean.component.ComponentConfigBean; +import com.coderman.codemaker.bean.component.ComponentContextBean; +import com.coderman.codemaker.classloader.CompClassLoadService; +import com.coderman.codemaker.component.CompPropReadService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Description:应用层面依赖的业务组件进行扫描 + * + * 扫描可以按一个组件一个组件的扫描实现也可以按应用维度一次性扫描多个组件 + * + * 这里扫描apiresult组件进行接口方法返回值和方法page参数的包装 + * date: 2021/11/25 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +@Component(value = "appCompScanService") +public class AppCompScanServiceImpl implements ICompScanService { + @Autowired + private CompPropReadService compPropReadService; + + @Autowired + private CompClassLoadService compClassLoadService; + + @Override + public Map scanComponent(List componentList) { + Map componentContextBeanMap = new HashMap<>(); + for (String compName : componentList){ + String path = GlobalConstant.COMP_COMPONENT_PATH_PRE+compName+"/"+compName+".properties"; + ComponentConfigBean componentConfigBean = compPropReadService.buildFromProp(path); + if(componentConfigBean == null){ + continue; + } + ComponentContextBean componentContextBean = compClassLoadService.loadComponent(componentConfigBean); + componentContextBean.setComponentName(compName); + componentContextBean.setCompType(componentConfigBean.getCompType()); + componentContextBeanMap.put(compName,componentContextBean); + } + return componentContextBeanMap; + } +} diff --git a/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/component/scan/DefaultCompScanServiceImpl.java b/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/component/scan/DefaultCompScanServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..219aafbcf4308de2901def48b3a34f2bd7938356 --- /dev/null +++ b/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/component/scan/DefaultCompScanServiceImpl.java @@ -0,0 +1,56 @@ +package com.coderman.codemaker.component.scan; + +import com.coderman.codemaker.api.ICompScanService; +import com.coderman.codemaker.bean.GlobalConstant; +import com.coderman.codemaker.bean.component.ComponentConfigBean; +import com.coderman.codemaker.bean.component.ComponentContextBean; +import com.coderman.codemaker.classloader.CompClassLoadService; +import com.coderman.codemaker.component.CompPropReadService; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Description:组件扫描注册服务类 + * date: 2021/11/22 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +@Component(value = "defaultCompScanService") +public class DefaultCompScanServiceImpl implements ICompScanService { + + @Autowired + private CompPropReadService compPropReadService; + + @Autowired + private CompClassLoadService compClassLoadService; + + @Override + public Map scanComponent(List componentList){ + Map componentContextBeanMap = new HashMap<>(); + if(CollectionUtils.isEmpty(componentList)){ + return componentContextBeanMap; + } + + for (String compName : componentList){ + String path = GlobalConstant.COMP_COMPONENT_PATH_PRE+compName+"/"+compName+".properties"; + ComponentConfigBean componentConfigBean = compPropReadService.buildFromProp(path); + if(componentConfigBean == null){ + continue; + } + ComponentContextBean componentContextBean = compClassLoadService.loadComponent(componentConfigBean); + componentContextBean.setComponentName(compName); + componentContextBeanMap.put(compName,componentContextBean); + } + return componentContextBeanMap; + } + + + +} diff --git a/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/constant/ApiConstant.java b/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/constant/ApiConstant.java new file mode 100644 index 0000000000000000000000000000000000000000..4a6b3870bea2b5e9d1eef7e6138e7bbbb1319d78 --- /dev/null +++ b/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/constant/ApiConstant.java @@ -0,0 +1,18 @@ +package com.coderman.codemaker.constant; + +/** + * Description: api 相关包装类 + * date: 2021/11/24 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +public class ApiConstant { + public static final String CLASS_API_RESULT_DATA_DTO = "ResultDataDto"; + + public static final String CLASS_API_PAGE_DTO = "PageDTO"; + + + public static final String CLASS_API_PAGE_VO = "PageVO"; +} diff --git a/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/constant/ArchConstant.java b/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/constant/ArchConstant.java new file mode 100644 index 0000000000000000000000000000000000000000..27024fe00953ad6e6b7c0a02bf864efb447271a0 --- /dev/null +++ b/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/constant/ArchConstant.java @@ -0,0 +1,25 @@ +package com.coderman.codemaker.constant; + +/** + * Description:依赖的中间件框架的相关常量 + * date: 2021/11/24 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +public class ArchConstant { + public static final String ANNO_SPRING_RestController = "RestController"; + + /** + * dubbo注解 + */ + public static final String ANNO_DUBBO_SERVICE = "Service"; + + /** + * feignclient注解 + */ + public static final String ANNO_FEIGN_CLIENT = "FeignClient"; + + +} diff --git a/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/constant/ArchSpringConstant.java b/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/constant/ArchSpringConstant.java new file mode 100644 index 0000000000000000000000000000000000000000..fdee05207e793782ced6118ff3995d5556587b28 --- /dev/null +++ b/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/constant/ArchSpringConstant.java @@ -0,0 +1,29 @@ +package com.coderman.codemaker.constant; + +/** + * Description: + * date: 2021/12/13 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +public class ArchSpringConstant { + public static final String ANNO_SPRING_REST_CONTROLLER = "RestController"; + + public static final String ANNO_SPRING_GET_MAPPING = "GetMapping"; + + public static final String ANNO_SPRING_POST_MAPPING = "PostMapping"; + + public static final String ANNO_SPRING_REQUEST_BODY = "RequestBody"; + + public static final String ANNO_SPRING_REQUEST_MAPPING = "RequestMapping"; + + public static final String ANNO_SPRING_REQUEST_PARAM = "RequestParam"; + + /** + * feignclient注解 + */ + public static final String ANNO_FEIGN_CLIENT = "FeignClient"; + +} diff --git a/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/element/ElementDecorateHandler.java b/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/element/ElementDecorateHandler.java new file mode 100644 index 0000000000000000000000000000000000000000..b2293c75f2eaf7c144e03b06332e34193f7376fb --- /dev/null +++ b/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/element/ElementDecorateHandler.java @@ -0,0 +1,23 @@ +package com.coderman.codemaker.element; + +import com.coderman.codemaker.bean.plantuml.AbstractClassBean; +import com.coderman.codemaker.bean.plantuml.PlantUmlContextBean; + +import java.util.Map; + +/** + * Description:代码元素装饰处理器，抽象接口 + * date: 2021/11/26 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +public interface ElementDecorateHandler { + /** + * 代码元素包装处理接口 + * @param classCompMap + * @param plantUmlContextBean + */ + void decorateElement(Map classCompMap, PlantUmlContextBean plantUmlContextBean ); +} diff --git a/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/element/impl/EleControllerDecorateHandler.java b/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/element/impl/EleControllerDecorateHandler.java new file mode 100644 index 0000000000000000000000000000000000000000..62bea3584df24b5335658e7001805288f95ee192 --- /dev/null +++ b/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/element/impl/EleControllerDecorateHandler.java @@ -0,0 +1,129 @@ +package com.coderman.codemaker.element.impl; + +import com.coderman.codemaker.bean.plantuml.*; +import com.coderman.codemaker.constant.ApiConstant; +import com.coderman.codemaker.constant.ArchConstant; +import com.coderman.codemaker.constant.ArchSpringConstant; +import com.coderman.codemaker.element.ElementDecorateHandler; +import com.coderman.codemaker.enums.ModuleEnum; +import com.coderman.codemaker.enums.TemplateFileEnum; +import com.coderman.codemaker.enums.dynamic.DecorateTypeEnum; +import org.springframework.stereotype.Component; + +import java.util.Map; +import java.util.Optional; + +/** + * Description: controller代码元素包装 + * date: 2021/11/26 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +@Component(value = "eleControllerDecorateHandler") +public class EleControllerDecorateHandler implements ElementDecorateHandler { + @Override + public void decorateElement(Map classCompMap, PlantUmlContextBean plantUmlContextBean) { + AbstractClassBean resultDataDtoClassBean = classCompMap.get(ApiConstant.CLASS_API_RESULT_DATA_DTO); + AbstractClassBean pageVOClassBean = classCompMap.get(ApiConstant.CLASS_API_PAGE_VO); + AbstractClassBean restControllerBean = classCompMap.get(ArchConstant.ANNO_SPRING_RestController); + AbstractClassBean requestBodyBean = classCompMap.get(ArchSpringConstant.ANNO_SPRING_REQUEST_BODY); + AbstractClassBean requestMappingBean = classCompMap.get(ArchSpringConstant.ANNO_SPRING_REQUEST_MAPPING); + AbstractClassBean requestParamBean = classCompMap.get(ArchSpringConstant.ANNO_SPRING_REQUEST_PARAM); + + if (resultDataDtoClassBean != null) { + decorateController(resultDataDtoClassBean, plantUmlContextBean, DecorateTypeEnum.METHOD_RETURN_CLASS); + } + + if (pageVOClassBean != null) { + decorateController(pageVOClassBean, plantUmlContextBean, DecorateTypeEnum.METHOD_RETURN_PAGEVO_CLASS); + } + + if (restControllerBean != null) { + decorateController(restControllerBean, plantUmlContextBean, DecorateTypeEnum.CLASS_ANNOTATION); + } + + if(requestBodyBean != null){ + decorateController(requestBodyBean, plantUmlContextBean, DecorateTypeEnum.METHOD_ANNOTATION); + } + + if(requestMappingBean != null){ + decorateController(requestMappingBean, plantUmlContextBean, DecorateTypeEnum.METHOD_ANNOTATION); + } + + if(requestParamBean != null){ + decorateController(requestParamBean, plantUmlContextBean, DecorateTypeEnum.METHOD_ANNOTATION); + } + + + + + //如果applicationType=springcloud则对controller进行实现接口包装 + if (plantUmlContextBean.getApplicationType().equals(ModuleEnum.SC_FEIGN_API.getAppName())) { + decorateControllerImpl(plantUmlContextBean); + } + + } + + /** + * 包装controller + * + * @param abstractClassBean + * @param plantUmlContextBean + */ + private void decorateController(AbstractClassBean abstractClassBean, PlantUmlContextBean plantUmlContextBean, DecorateTypeEnum decorateTypeEnum) { + if (abstractClassBean == null) { + return; + } + plantUmlContextBean.getDerivedPlantUmlContextBean().getClassBeanMap().forEach((k, v) -> { + if (k.toLowerCase().endsWith(TemplateFileEnum.CONTROLLER.getTempFileName())) { + //包装方法返回值 + if (decorateTypeEnum.getCode() == DecorateTypeEnum.METHOD_RETURN_CLASS.getCode()) { + v.addImportClass(abstractClassBean.getPackageName()); + v.getMethodBeanList().forEach(methodBean -> methodBean.wrapperResultBody(ApiConstant.CLASS_API_RESULT_DATA_DTO)); + } + + //包装方法分页对象 + if (decorateTypeEnum.getCode() == DecorateTypeEnum.METHOD_RETURN_PAGEVO_CLASS.getCode()) { + Optional methodBeanOptional = v.getMethodBeanList().stream().filter(methodBean -> methodBean.getMethodName().toLowerCase().contains(ApiConstant.CLASS_API_PAGE_VO.toLowerCase())).findFirst(); + if (methodBeanOptional.isPresent()) { + v.addImportClass(abstractClassBean.getPackageName()); + } + } + + //包装类上的注解 + if (decorateTypeEnum.getCode() == DecorateTypeEnum.CLASS_ANNOTATION.getCode()) { + v.setAnnotation("@" + abstractClassBean.getClassName()); + v.addImportClass(abstractClassBean.getPackageName()); + } + + //包装方法注解 + if(decorateTypeEnum.getCode() == DecorateTypeEnum.METHOD_ANNOTATION.getCode()){ + v.addImportClass(abstractClassBean.getPackageName()); + } + } + }); + } + + /** + * 包装controllerImpl + * + * @param plantUmlContextBean + */ + private void decorateControllerImpl(PlantUmlContextBean plantUmlContextBean) { + + plantUmlContextBean.getDerivedPlantUmlContextBean().getClassBeanMap().forEach((k, v) -> { + if (k.toLowerCase().endsWith(TemplateFileEnum.CONTROLLER.getTempFileName())) { + String feignInterfaceName = k.replace("Controller", "Feign"); + InterfaceBean feignInterface = plantUmlContextBean.getDerivedPlantUmlContextBean().getInterfaceBeanMap().get(feignInterfaceName); + if (feignInterface != null) { + v.addImportClass(feignInterface.getPackageName() + "." + feignInterface.getClassName()); + v.setRelationClassStr(" implements " + feignInterface.getClassName()); + } + } + }); + } + + +} diff --git a/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/element/impl/EleFacadeDecorateHandler.java b/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/element/impl/EleFacadeDecorateHandler.java new file mode 100644 index 0000000000000000000000000000000000000000..dbcd410795cea6b2136484dde1c969815d9a4b1d --- /dev/null +++ b/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/element/impl/EleFacadeDecorateHandler.java @@ -0,0 +1,96 @@ +package com.coderman.codemaker.element.impl; + +import com.coderman.codemaker.bean.plantuml.AbstractClassBean; +import com.coderman.codemaker.bean.plantuml.MethodBean; +import com.coderman.codemaker.bean.plantuml.PlantUmlContextBean; +import com.coderman.codemaker.constant.ApiConstant; +import com.coderman.codemaker.constant.ArchConstant; +import com.coderman.codemaker.element.ElementDecorateHandler; +import com.coderman.codemaker.enums.TemplateFileEnum; +import com.coderman.codemaker.enums.dynamic.DecorateTypeEnum; +import org.springframework.stereotype.Component; + +import java.util.Map; +import java.util.Optional; + +/** + * Description: controller代码元素包装 + * date: 2021/11/26 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +@Component(value = "eleFacadeDecorateHandler") +public class EleFacadeDecorateHandler implements ElementDecorateHandler { + @Override + public void decorateElement(Map classCompMap, PlantUmlContextBean plantUmlContextBean) { + AbstractClassBean resultDataDtoClassBean = classCompMap.get(ApiConstant.CLASS_API_RESULT_DATA_DTO); + AbstractClassBean pageDTOClassBean = classCompMap.get(ApiConstant.CLASS_API_PAGE_DTO); + AbstractClassBean dubboServiceBean = classCompMap.get(ArchConstant.ANNO_DUBBO_SERVICE); + + if(resultDataDtoClassBean != null){ + decorateFacade(resultDataDtoClassBean, plantUmlContextBean, DecorateTypeEnum.METHOD_RETURN_CLASS); + } + if(pageDTOClassBean != null){ + decorateFacade(pageDTOClassBean, plantUmlContextBean, DecorateTypeEnum.METHOD_RETURN_PAGEDTO_CLASS); + } + + if(dubboServiceBean != null){ + decorateFacade(dubboServiceBean, plantUmlContextBean, DecorateTypeEnum.CLASS_ANNOTATION); + } + } + + /** + * 包装facade + * @param abstractClassBean + * @param plantUmlContextBean + */ + private void decorateFacade(AbstractClassBean abstractClassBean, PlantUmlContextBean plantUmlContextBean, DecorateTypeEnum decorateTypeEnum) { + if (abstractClassBean == null) { + return; + } + plantUmlContextBean.getDerivedPlantUmlContextBean().getClassBeanMap().forEach((k, v) -> { + if (k.toLowerCase().endsWith(TemplateFileEnum.FACADE_IMPL.getTempFileName().toLowerCase())) { + //包装方法返回值 + if(decorateTypeEnum.getCode() == DecorateTypeEnum.METHOD_RETURN_CLASS.getCode()){ + v.addImportClass(abstractClassBean.getPackageName()); + v.getMethodBeanList().forEach(methodBean -> methodBean.wrapperResultBody(ApiConstant.CLASS_API_RESULT_DATA_DTO)); + } + + //导入方法分页对象 + if(decorateTypeEnum.getCode() == DecorateTypeEnum.METHOD_RETURN_PAGEDTO_CLASS.getCode()){ + Optional methodBeanOptional = v.getMethodBeanList().stream().filter(methodBean -> methodBean.getMethodName().toLowerCase().contains(ApiConstant.CLASS_API_PAGE_DTO.toLowerCase())).findFirst(); + if(methodBeanOptional.isPresent()){ + v.addImportClass(abstractClassBean.getPackageName()); + } + } + + + if(decorateTypeEnum.getCode() == DecorateTypeEnum.CLASS_ANNOTATION.getCode()){ + //包装注解 + v.setAnnotation("@" + abstractClassBean.getClassName()); + v.addImportClass(abstractClassBean.getPackageName()); + } + } + }); + + plantUmlContextBean.getDerivedPlantUmlContextBean().getInterfaceBeanMap().forEach((k, v) -> { + if (k.toLowerCase().endsWith(TemplateFileEnum.FACADE.getTempFileName())) { + //包装方法返回值 + if(decorateTypeEnum.getCode() == DecorateTypeEnum.METHOD_RETURN_CLASS.getCode()){ + v.addImportClass(abstractClassBean.getPackageName()); + v.getMethodBeanList().forEach(methodBean -> methodBean.wrapperResultBody(ApiConstant.CLASS_API_RESULT_DATA_DTO)); + } + + //导入方法分页对象 + if(decorateTypeEnum.getCode() == DecorateTypeEnum.METHOD_RETURN_PAGEDTO_CLASS.getCode()){ + Optional methodBeanOptional = v.getMethodBeanList().stream().filter(methodBean -> methodBean.getMethodName().toLowerCase().contains(ApiConstant.CLASS_API_PAGE_DTO.toLowerCase())).findFirst(); + if(methodBeanOptional.isPresent()){ + v.addImportClass(abstractClassBean.getPackageName()); + } + } + } + }); + } +} diff --git a/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/element/impl/EleFeignDecorateHandler.java b/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/element/impl/EleFeignDecorateHandler.java new file mode 100644 index 0000000000000000000000000000000000000000..7b7bd542d215eda76bf699f3539a98fd91012bd8 --- /dev/null +++ b/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/element/impl/EleFeignDecorateHandler.java @@ -0,0 +1,103 @@ +package com.coderman.codemaker.element.impl; + +import com.coderman.codemaker.bean.plantuml.AbstractClassBean; +import com.coderman.codemaker.bean.plantuml.MethodBean; +import com.coderman.codemaker.bean.plantuml.PlantUmlContextBean; +import com.coderman.codemaker.constant.ApiConstant; +import com.coderman.codemaker.constant.ArchConstant; +import com.coderman.codemaker.constant.ArchSpringConstant; +import com.coderman.codemaker.element.ElementDecorateHandler; +import com.coderman.codemaker.enums.TemplateFileEnum; +import com.coderman.codemaker.enums.dynamic.DecorateTypeEnum; +import org.springframework.stereotype.Component; + +import java.util.Map; +import java.util.Optional; + +/** + * Description: controller代码元素包装 + * date: 2021/11/26 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +@Component(value = "eleFeignDecorateHandler") +public class EleFeignDecorateHandler implements ElementDecorateHandler { + @Override + public void decorateElement(Map classCompMap, PlantUmlContextBean plantUmlContextBean) { + AbstractClassBean resultDataDtoClassBean = classCompMap.get(ApiConstant.CLASS_API_RESULT_DATA_DTO); + AbstractClassBean pageDTOClassBean = classCompMap.get(ApiConstant.CLASS_API_PAGE_DTO); + AbstractClassBean feignClientBean = classCompMap.get(ArchSpringConstant.ANNO_FEIGN_CLIENT); + AbstractClassBean requestBodyBean = classCompMap.get(ArchSpringConstant.ANNO_SPRING_REQUEST_BODY); + AbstractClassBean requestMappingBean = classCompMap.get(ArchSpringConstant.ANNO_SPRING_REQUEST_MAPPING); + AbstractClassBean requestParamBean = classCompMap.get(ArchSpringConstant.ANNO_SPRING_REQUEST_PARAM); + + + if(resultDataDtoClassBean != null){ + decorateFeign(resultDataDtoClassBean, plantUmlContextBean, DecorateTypeEnum.METHOD_RETURN_CLASS); + } + if(pageDTOClassBean != null){ + decorateFeign(pageDTOClassBean, plantUmlContextBean, DecorateTypeEnum.METHOD_RETURN_PAGEDTO_CLASS); + } + + if(feignClientBean != null){ + decorateFeign(feignClientBean, plantUmlContextBean, DecorateTypeEnum.CLASS_ANNOTATION); + } + + if(requestBodyBean != null){ + decorateFeign(requestBodyBean, plantUmlContextBean, DecorateTypeEnum.METHOD_ANNOTATION); + } + + if(requestMappingBean != null){ + decorateFeign(requestMappingBean, plantUmlContextBean, DecorateTypeEnum.METHOD_ANNOTATION); + } + + if(requestParamBean != null){ + decorateFeign(requestParamBean, plantUmlContextBean, DecorateTypeEnum.METHOD_ANNOTATION); + } + + + + } + + /** + * 包装facade + * @param abstractClassBean + * @param plantUmlContextBean + */ + private void decorateFeign(AbstractClassBean abstractClassBean, PlantUmlContextBean plantUmlContextBean, DecorateTypeEnum decorateTypeEnum) { + if (abstractClassBean == null) { + return; + } + plantUmlContextBean.getDerivedPlantUmlContextBean().getInterfaceBeanMap().forEach((k, v) -> { + if (k.toLowerCase().endsWith(TemplateFileEnum.FEIGN.getTempFileName().toLowerCase())) { + //包装方法返回值 + if(decorateTypeEnum.getCode() == DecorateTypeEnum.METHOD_RETURN_CLASS.getCode()){ + v.addImportClass(abstractClassBean.getPackageName()); + v.getMethodBeanList().forEach(methodBean -> methodBean.wrapperResultBody(ApiConstant.CLASS_API_RESULT_DATA_DTO)); + } + + //导入方法分页对象 + if(decorateTypeEnum.getCode() == DecorateTypeEnum.METHOD_RETURN_PAGEDTO_CLASS.getCode()){ + Optional methodBeanOptional = v.getMethodBeanList().stream().filter(methodBean -> methodBean.getMethodName().toLowerCase().contains(ApiConstant.CLASS_API_PAGE_DTO.toLowerCase())).findFirst(); + if(methodBeanOptional.isPresent()){ + v.addImportClass(abstractClassBean.getPackageName()); + } + } + + + if(decorateTypeEnum.getCode() == DecorateTypeEnum.CLASS_ANNOTATION.getCode()){ + //包装注解 + v.setAnnotation("@" + abstractClassBean.getClassName()); + v.addImportClass(abstractClassBean.getPackageName()); + } + + + if(decorateTypeEnum.getCode() == DecorateTypeEnum.METHOD_ANNOTATION.getCode()){ + v.addImportClass(abstractClassBean.getPackageName()); + } + } + }); + } +} diff --git a/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/factory/SpringClassBeanFactory.java b/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/factory/SpringClassBeanFactory.java new file mode 100644 index 0000000000000000000000000000000000000000..87019c73620f082487d0de1944e0436a188b2e22 --- /dev/null +++ b/codemaker-parent/codemaker-apiImpl/src/main/java/com/coderman/codemaker/factory/SpringClassBeanFactory.java @@ -0,0 +1,52 @@ +package com.coderman.codemaker.factory; + +import com.coderman.codemaker.bean.component.ComponentContextBean; +import com.coderman.codemaker.bean.plantuml.AbstractClassBean; +import com.coderman.codemaker.bean.plantuml.AnnotationBean; +import com.coderman.codemaker.constant.ArchConstant; +import com.coderman.codemaker.constant.ArchSpringConstant; +import org.springframework.stereotype.Service; + +import javax.swing.*; +import java.util.HashMap; +import java.util.Map; + +/** + * Description: + * date: 2021/12/13 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +@Service +public class SpringClassBeanFactory { + + /** + * 包装spring框架需要的所有注解 + * @param componentContextBean + * @return + */ + public Map buildSpringArchBeanMap(ComponentContextBean componentContextBean){ + Map controllerClassBeanMap = new HashMap<>(); + + AnnotationBean restControllerBean = componentContextBean.getTargetAnnotation(ArchSpringConstant.ANNO_SPRING_REST_CONTROLLER); + AnnotationBean getMappingBean = componentContextBean.getTargetAnnotation(ArchSpringConstant.ANNO_SPRING_GET_MAPPING); + AnnotationBean postMappingBean = componentContextBean.getTargetAnnotation(ArchSpringConstant.ANNO_SPRING_POST_MAPPING); + AnnotationBean requestBodyBean = componentContextBean.getTargetAnnotation(ArchSpringConstant.ANNO_SPRING_REQUEST_BODY); + AnnotationBean requestMappingBean = componentContextBean.getTargetAnnotation(ArchSpringConstant.ANNO_SPRING_REQUEST_MAPPING); + AnnotationBean requestParamBean = componentContextBean.getTargetAnnotation(ArchSpringConstant.ANNO_SPRING_REQUEST_PARAM); + AnnotationBean feignClientBean = componentContextBean.getTargetAnnotation(ArchSpringConstant.ANNO_FEIGN_CLIENT); + + controllerClassBeanMap.put(ArchSpringConstant.ANNO_SPRING_REST_CONTROLLER, restControllerBean); + controllerClassBeanMap.put(ArchSpringConstant.ANNO_SPRING_GET_MAPPING, getMappingBean); + controllerClassBeanMap.put(ArchSpringConstant.ANNO_SPRING_POST_MAPPING, postMappingBean); + controllerClassBeanMap.put(ArchSpringConstant.ANNO_SPRING_REQUEST_BODY, requestBodyBean); + controllerClassBeanMap.put(ArchSpringConstant.ANNO_SPRING_REQUEST_MAPPING, requestMappingBean); + controllerClassBeanMap.put(ArchSpringConstant.ANNO_SPRING_REQUEST_PARAM, requestParamBean); + controllerClassBeanMap.put(ArchSpringConstant.ANNO_FEIGN_CLIENT, feignClientBean); + + + return controllerClassBeanMap; + } +} diff --git a/codemaker-core/pom.xml b/codemaker-parent/codemaker-core/pom.xml similarity index 90% rename from codemaker-core/pom.xml rename to codemaker-parent/codemaker-core/pom.xml index 3b45070a0ebf572f64168d168d6106772c6db9e5..da37363cd60e23b15b30a21c389e8ad33c063b78 100644 --- a/codemaker-core/pom.xml +++ b/codemaker-parent/codemaker-core/pom.xml @@ -4,14 +4,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.springframework.boot - spring-boot-starter-parent - 2.3.1.RELEASE - + com.coderman.codemaker + codemaker-parent + 1.2.2-SNAPSHOT com.coderman.codemaker codemaker-core - 1.2.1-beta + 1.2.2-SNAPSHOT codemaker-core @@ -31,6 +30,15 @@ + + + com.coderman.codemaker + codemaker-apiImpl + 1.0-SNAPSHOT + + + + org.springframework.boot spring-boot-starter @@ -169,6 +177,12 @@ 1.0.1-SNAPSHOT + + com.coderman.utils + coderman-utils + 1.0.4-SNAPSHOT + + org.projectlombok lombok @@ -183,8 +197,8 @@ org.apache.maven.plugins maven-compiler-plugin - 8 - 8 + 9 + 9 diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/Main.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/Main.java similarity index 99% rename from codemaker-core/src/main/java/com/coderman/codemaker/Main.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/Main.java index ae2a2df2a61ba26582eeedf13696925b8817148a..93351bce064bba75e43f8ddf503b69081ccf8aa3 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/Main.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/Main.java @@ -16,6 +16,10 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties @EnableConfigurationProperties public class Main { public static void main(String[] args) { + + + + SpringApplication.run(Main.class, args); } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/AppService.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/AppService.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/AppService.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/AppService.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/ColaAppService.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/ColaAppService.java similarity index 67% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/ColaAppService.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/ColaAppService.java index 85f928395d9cbc095f061184f61a2899940c0168..29502a7b1903b1b2556f85850b5c0fc213b52ff7 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/ColaAppService.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/ColaAppService.java @@ -32,6 +32,19 @@ public class ColaAppService implements AppService{ private IWriteFileService colaInfrastWriteService; + @Resource(name = "colaApiDocWriteService") + private IWriteFileService colaApiDocWriteService; + + + + @Resource(name = "colaStartWriteService") + private IWriteFileService colaStartWriteService; + + + @Resource(name = "colaFeignApiWriteService") + private IWriteFileService colaFeginApiWriteService; + + @Override public IWriteFileService getModelAppService(String moduleName) { if(moduleName.equals(ModuleEnum.COLA_INFRAST.getModuleName())){ @@ -44,6 +57,15 @@ public class ColaAppService implements AppService{ } else if (moduleName.equals(ModuleEnum.COLA_APP.getModuleName())) { return colaAppWriteService; } + else if (moduleName.equals(ModuleEnum.COLA_API_DOC.getModuleName())) { + return colaApiDocWriteService; + } + else if (moduleName.equals(ModuleEnum.COLA_START.getModuleName())) { + return colaStartWriteService; + } + else if (moduleName.equals(ModuleEnum.COLA_FEIGN_API.getModuleName())) { + return colaFeginApiWriteService; + } return colaAdapterWriteService; } } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/CommonWriteService.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/CommonWriteService.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/CommonWriteService.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/CommonWriteService.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/DubboAppService.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/DubboAppService.java similarity index 81% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/DubboAppService.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/DubboAppService.java index 88e649b8a6ea5b62c99e68214e64a2c631f8cbe3..ddf71282d3acd837286f44efed07084b845d9c8c 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/DubboAppService.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/DubboAppService.java @@ -25,6 +25,11 @@ public class DubboAppService implements AppService{ private IWriteFileService dubboCommonWriteFileService; + + @Resource(name = "dubboApiDocWriteFileService") + private IWriteFileService dubboApiDocWriteFileService; + + @Override public IWriteFileService getModelAppService(String moduleName) { if(moduleName.equals(ModuleEnum.DUBBO_API.getModuleName())){ @@ -32,6 +37,9 @@ public class DubboAppService implements AppService{ } else if (moduleName.equals(ModuleEnum.DUBBO_COMMON.getModuleName())) { return dubboCommonWriteFileService; } + else if (moduleName.equals(ModuleEnum.DUBBO_API_DOC.getModuleName())) { + return dubboApiDocWriteFileService; + } return dubboCoreWriteFileService; } } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/DynamicDDDAppService.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/DynamicDDDAppService.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/DynamicDDDAppService.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/DynamicDDDAppService.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/IWriteFileService.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/IWriteFileService.java similarity index 94% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/IWriteFileService.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/IWriteFileService.java index 2e95c16fd7d150b91b32610f7ac3956a2bf48051..7fb3fa0040c8b554ceef011241a26feeafe8ed78 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/IWriteFileService.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/IWriteFileService.java @@ -2,8 +2,6 @@ package com.coderman.codemaker.app; import com.coderman.codemaker.bean.WriteContentBean; -import java.util.Map; - /** * Description: * date: 2021/6/18 diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/SpringBootAppService.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/SpringBootAppService.java similarity index 47% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/SpringBootAppService.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/SpringBootAppService.java index eacbee3bf1a8fa48e04610d198c0acf6e7274948..c1cb1138954cc28dc51e06f055a1c4e739d6eb25 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/SpringBootAppService.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/SpringBootAppService.java @@ -1,5 +1,6 @@ package com.coderman.codemaker.app; +import com.coderman.codemaker.enums.ModuleEnum; import org.springframework.stereotype.Component; import javax.annotation.Resource; @@ -15,10 +16,22 @@ import javax.annotation.Resource; @Component(value = "springBootAppService") public class SpringBootAppService implements AppService{ @Resource(name = "springBootWriteService") - private IWriteFileService iWriteFileService; + private IWriteFileService springBootWriteService; + + + + @Resource(name = "springBootApiDocWriteService") + private IWriteFileService springBootApiDocWriteService; + @Override public IWriteFileService getModelAppService(String moduleName) { - return iWriteFileService; + if (moduleName.equals(ModuleEnum.SPRING_BOOT_WEB.getModuleName())) { + return springBootWriteService; + } + else if (moduleName.equals(ModuleEnum.SPRINGBOOT_API_DOC.getModuleName())) { + return springBootApiDocWriteService; + } + return null; } } diff --git a/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/SpringCloudAppService.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/SpringCloudAppService.java new file mode 100644 index 0000000000000000000000000000000000000000..9afab14549739c70062f6773195415b497410171 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/SpringCloudAppService.java @@ -0,0 +1,47 @@ +package com.coderman.codemaker.app; + +import com.coderman.codemaker.enums.ModuleEnum; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; + +/** + * Description: + * date: 2021/6/22 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +@Component(value = "springCloudAppService") +public class SpringCloudAppService implements AppService{ + @Resource(name = "sCFeignApiWriteService") + private IWriteFileService sCFeignApiWriteService; + + + + @Resource(name = "sCFeignProviderWriteService") + private IWriteFileService sCFeignProviderWriteService; + + + @Resource(name = "sCFeignApiDocWriteService") + private IWriteFileService sCFeignApiDocWriteService; + + + @Override + public IWriteFileService getModelAppService(String moduleName) { + if (moduleName.equals(ModuleEnum.SC_FEIGN_API.getModuleName())) { + return sCFeignApiWriteService; + } + else if (moduleName.equals(ModuleEnum.SPRINGBOOT_API_DOC.getModuleName())) { + return sCFeignApiDocWriteService; + } + else if (moduleName.equals(ModuleEnum.SC_FEIGN_PROVIDER.getModuleName())) { + return sCFeignProviderWriteService; + } + return null; + } + + + +} diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/WriteService.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/WriteService.java similarity index 86% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/WriteService.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/WriteService.java index ed33ea6eefcc36839cad4dbc2b820667ebd46063..9497470247f6e4167211f2caa5010d1969bd86f3 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/WriteService.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/WriteService.java @@ -1,6 +1,5 @@ package com.coderman.codemaker.app; -import com.alibaba.fastjson.JSON; import com.coderman.codemaker.bean.ClassContentBean; import com.coderman.codemaker.config.AppServiceConfig; import com.coderman.codemaker.utils.Constant; @@ -93,4 +92,20 @@ public abstract class WriteService { writeClassFileV2(classContentBean); } } + + /** + * 写 api doc 文件 + * + * @param content + * @param moduleName + */ + public void writeApiDoc(String content, String moduleName) { + String apiDocOutPath = appServiceConfig.getApiDocOutPath(); + String filePath = apiDocOutPath + "/" + moduleName+".md"; + 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/ColaAdapterWriteServiceImpl.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaAdapterWriteServiceImpl.java similarity index 93% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaAdapterWriteServiceImpl.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaAdapterWriteServiceImpl.java index 727f5fece12515d5d0fd19b63ee7d77af5a5f7a9..65190846008894dadbc163598d7f95da3cf1d17e 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaAdapterWriteServiceImpl.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaAdapterWriteServiceImpl.java @@ -3,6 +3,7 @@ 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.GlobalConstant; import com.coderman.codemaker.bean.WriteContentBean; import com.coderman.codemaker.config.ProjectTemplateColaConfig; import com.coderman.codemaker.enums.TemplateFileEnum; @@ -70,6 +71,11 @@ public class ColaAdapterWriteServiceImpl extends WriteService implements IWriteF if(writeContentBean.getTemplateName().equals(TemplateFileEnum.BASE_CONTROLLER.getTempFileName())){ commonWriteService.writeBaseController(writeContentBean.getContent(),projectTemplateColaConfig.getModuleAdapterPath()); } + + //写自定义工具类 + if(writeContentBean.getTemplateName().equals(GlobalConstant.SINGLE_CLASS_COMMON)){ + writeRoute(classContentBean); + } } } diff --git a/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaApiDocWriteServiceImpl.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaApiDocWriteServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..802f8fbc332e035d90bf8e6707f42508b0819356 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaApiDocWriteServiceImpl.java @@ -0,0 +1,30 @@ +package com.coderman.codemaker.app.cola; + +import com.coderman.codemaker.app.IWriteFileService; +import com.coderman.codemaker.app.WriteService; +import com.coderman.codemaker.bean.WriteContentBean; +import com.coderman.codemaker.config.AppServiceConfig; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * Description: + * date: 2021/7/6 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +@Component(value = "colaApiDocWriteService") +public class ColaApiDocWriteServiceImpl extends WriteService implements IWriteFileService { + + @Autowired + private AppServiceConfig appServiceConfig; + + @Override + public void writeContent(WriteContentBean writeContentBean) { + writeApiDoc(writeContentBean.getContent(),writeContentBean.getHumpClassName()); + } + + +} diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaAppWriteServiceImpl.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaAppWriteServiceImpl.java similarity index 92% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaAppWriteServiceImpl.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaAppWriteServiceImpl.java index 4b6bd7d6b7d36c302f6d6be9b63b3c2dfedc17cc..a91b1223ddae59bfd0aeb8a2bd29be508a41aff0 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaAppWriteServiceImpl.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaAppWriteServiceImpl.java @@ -3,6 +3,7 @@ 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.GlobalConstant; import com.coderman.codemaker.bean.WriteContentBean; import com.coderman.codemaker.config.AppServiceConfig; import com.coderman.codemaker.config.ProjectTemplateColaConfig; @@ -65,7 +66,7 @@ public class ColaAppWriteServiceImpl extends WriteService implements IWriteFileS writeRoute(classContentBean); } - //指定服务类 or 工具类 + /* //指定服务类 or 工具类 if(writeContentBean.getTemplateName().equals(TemplateFileEnum.SPRING_APPLICATION_CONTEXT.getTempFileName())){ commonWriteService.writeSpringApplicationContext(writeContentBean.getContent(),projectTemplateColaConfig.getModuleAppPath()); } @@ -73,6 +74,11 @@ public class ColaAppWriteServiceImpl extends WriteService implements IWriteFileS //指定服务类 or 工具类 if(writeContentBean.getTemplateName().equals(TemplateFileEnum.APP_EVENT_PUBLISHER.getTempFileName())){ commonWriteService.writeAppEventPublisher(writeContentBean.getContent(),projectTemplateColaConfig.getModuleAppPath()); + }*/ + + //写自定义工具类 + if(writeContentBean.getTemplateName().equals(GlobalConstant.SINGLE_CLASS_COMMON)){ + writeRoute(classContentBean); } } } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaClientWriteServiceImpl.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaClientWriteServiceImpl.java similarity index 94% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaClientWriteServiceImpl.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaClientWriteServiceImpl.java index 8749ac5a01b4ecf5cf96810fe1d4f223457937fb..dd4dcc447003f9306bb731ec0976b57117a9f8ea 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaClientWriteServiceImpl.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaClientWriteServiceImpl.java @@ -2,6 +2,7 @@ package com.coderman.codemaker.app.cola; import com.coderman.codemaker.app.WriteService; import com.coderman.codemaker.bean.ClassContentBean; +import com.coderman.codemaker.bean.GlobalConstant; import com.coderman.codemaker.bean.WriteContentBean; import com.coderman.codemaker.config.AppServiceConfig; import com.coderman.codemaker.config.ProjectTemplateColaConfig; @@ -71,6 +72,12 @@ public class ColaClientWriteServiceImpl extends WriteService implements IWriteFi writeClassFileV2(classContentBean); } } + + + //写自定义工具类 + if(writeContentBean.getTemplateName().equals(GlobalConstant.SINGLE_CLASS_COMMON)){ + writeRoute(classContentBean); + } } /** diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaDomainWriteServiceImpl.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaDomainWriteServiceImpl.java similarity index 89% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaDomainWriteServiceImpl.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaDomainWriteServiceImpl.java index e805ab7a514e02cb85328b51f89db0af6bf7c87e..273e2b3c1139a51e4dae6eb41cca9e32e43a9e20 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaDomainWriteServiceImpl.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaDomainWriteServiceImpl.java @@ -3,6 +3,7 @@ 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.GlobalConstant; import com.coderman.codemaker.bean.WriteContentBean; import com.coderman.codemaker.config.ProjectTemplateColaConfig; import com.coderman.codemaker.enums.TemplateFileEnum; @@ -75,6 +76,11 @@ public class ColaDomainWriteServiceImpl extends WriteService implements IWriteFi classContentBean.setChildPackageName("domain.gataway"); writeRoute(classContentBean); } + //写domain.repository + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.REPOSITORY.getTempFileName())){ + classContentBean.setChildPackageName("domain.repository"); + writeRoute(classContentBean); + } //写domain.factory if(writeContentBean.getTemplateName().equals(TemplateFileEnum.FACTORY.getTempFileName())){ classContentBean.setChildPackageName("domain.factory"); @@ -93,6 +99,12 @@ public class ColaDomainWriteServiceImpl extends WriteService implements IWriteFi if(writeContentBean.getTemplateName().equals(TemplateFileEnum.APP_EVENT_PUBLISHER.getTempFileName())){ commonWriteService.writeBaseEvent(writeContentBean.getContent(),projectTemplateColaConfig.getModuleDomainPath()); } + + //写自定义工具类 + if(writeContentBean.getTemplateName().equals(GlobalConstant.SINGLE_CLASS_COMMON)){ + writeRoute(classContentBean); + } + } } diff --git a/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaFeignApiWriteServiceImpl.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaFeignApiWriteServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..9c6c09d37584c1c96bb9dfc4b248d15fc435fab0 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaFeignApiWriteServiceImpl.java @@ -0,0 +1,101 @@ +package com.coderman.codemaker.app.cola; + +import com.coderman.codemaker.app.IWriteFileService; +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.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; + +/** + * Description: + * date: 2021/11/29 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ + +@Component(value = "colaFeignApiWriteService") +public class ColaFeignApiWriteServiceImpl extends WriteService implements IWriteFileService { + @Autowired + private ProjectTemplateColaConfig projectTemplateColaConfig; + + @Autowired + private AppServiceConfig appServiceConfig; + + + @Override + public void writeContent(WriteContentBean writeContentBean) { + ClassContentBean classContentBean = writeContentBean.buildClassContentBean(projectTemplateColaConfig.getModuleFeignApiPath()); + //写api.dto-ddd + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.DTO_DDD.getTempFileName())){ + classContentBean.setChildPackageName("api.dto"); + classContentBean.setClassSuffix("DTO.java"); + //走默认的包生成方式 + if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ + writeClassFile(classContentBean); + }else { + //走文档里的package包生成方式 + writeClassFileV2(classContentBean); + } + } + //写api.dto + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.DTO.getTempFileName())){ + classContentBean.setChildPackageName("dto"); + classContentBean.setClassSuffix("DTO.java"); + writeDTO(classContentBean); + } + + + //写feign + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.FEIGN.getTempFileName())){ + classContentBean.setHumpClassName(writeContentBean.getHumpClassName().toLowerCase().endsWith("feign") ? writeContentBean.getHumpClassName() : writeContentBean.getHumpClassName()+"Feign"); + classContentBean.setChildPackageName("api.feign"); + classContentBean.setClassSuffix("Feign.java"); + writeRoute(classContentBean); + } + //写domain.enum + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.ENUM.getTempFileName())){ + classContentBean.setChildPackageName("domain.enums"); + writeRoute(classContentBean); + } + + } + + /** + * 写dto文件 + * @param classContentBean + */ + public void writeDTO(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(); + } + } + + /** + * @param childPackageName 最后一级子包名称 + * @param humpClassName 驼峰式类名 + * @param classSuffix 文件后缀 egg：DTO.java + * @return + */ + private String getFilePath(String childPackageName, String humpClassName, String classSuffix) { + String packageName = appServiceConfig.getPackage(); + String packagePath = packageName.replace(".", "/") ; + packagePath = Constant.JAVA + "/" + packagePath + "/" + childPackageName; + String fileName = humpClassName + classSuffix; + return projectTemplateColaConfig.getModuleFeignApiPath() + packagePath + "/" + fileName; + } +} diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaInfrastWriteServiceImpl.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaInfrastWriteServiceImpl.java similarity index 94% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaInfrastWriteServiceImpl.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaInfrastWriteServiceImpl.java index 8aa7893f69a23fea33537df1dc6a57ab93317614..fb5050201f1dc8f7e87d9533ffd88ad18a343b92 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaInfrastWriteServiceImpl.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaInfrastWriteServiceImpl.java @@ -2,6 +2,7 @@ package com.coderman.codemaker.app.cola; import com.coderman.codemaker.app.WriteService; import com.coderman.codemaker.bean.ClassContentBean; +import com.coderman.codemaker.bean.GlobalConstant; import com.coderman.codemaker.bean.WriteContentBean; import com.coderman.codemaker.config.AppServiceConfig; import com.coderman.codemaker.config.ProjectTemplateColaConfig; @@ -109,6 +110,10 @@ public class ColaInfrastWriteServiceImpl extends WriteService implements IWriteF if(writeContentBean.getTemplateName().equals(TemplateFileEnum.ACL_PARAM.getTempFileName())){ writeClassFileV2(classContentBean); } + //写acl.param.convert + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.DTO2DTO_CONVERT.getTempFileName())){ + writeRoute(classContentBean); + } //写convert if(writeContentBean.getTemplateName().equals(TemplateFileEnum.CONVERT.getTempFileName())){ @@ -178,6 +183,16 @@ public class ColaInfrastWriteServiceImpl extends WriteService implements IWriteF writeMapperXml(classContentBean); } + //写infrast.cache + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.CACHE.getTempFileName())){ + classContentBean.setChildPackageName("infrast.cache"); + writeRoute(classContentBean); + } + + //写自定义工具类 + if(writeContentBean.getTemplateName().equals(GlobalConstant.SINGLE_CLASS_COMMON)){ + writeRoute(classContentBean); + } } /** diff --git a/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaStartWriteServiceImpl.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaStartWriteServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..aa24e2d54553e87f6ca02b0174deffbbb6ed5ae5 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/cola/ColaStartWriteServiceImpl.java @@ -0,0 +1,43 @@ +package com.coderman.codemaker.app.cola; + +import com.coderman.codemaker.app.IWriteFileService; +import com.coderman.codemaker.app.WriteService; +import com.coderman.codemaker.bean.ClassContentBean; +import com.coderman.codemaker.bean.GlobalConstant; +import com.coderman.codemaker.bean.WriteContentBean; +import com.coderman.codemaker.config.AppServiceConfig; +import com.coderman.codemaker.config.ProjectTemplateColaConfig; +import com.coderman.codemaker.utils.Constant; +import org.apache.commons.io.FileUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.io.File; +import java.io.IOException; + +/** + * Description: + * date: 2021/7/6 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +@Component(value = "colaStartWriteService") +public class ColaStartWriteServiceImpl extends WriteService implements IWriteFileService { + @Autowired + private ProjectTemplateColaConfig projectTemplateColaConfig; + + @Autowired + private AppServiceConfig appServiceConfig; + + @Override + public void writeContent(WriteContentBean writeContentBean) { + ClassContentBean classContentBean = writeContentBean.buildClassContentBean(projectTemplateColaConfig.getModuleStartPath()); + //写自定义工具类 + if(writeContentBean.getTemplateName().equals(GlobalConstant.SINGLE_CLASS_COMMON)){ + writeRoute(classContentBean); + } + } + +} diff --git a/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dubbo/DubboApiDocWriteServiceImpl.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dubbo/DubboApiDocWriteServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..57b7f2c955464b77f23e8beff970b9b9b78bb6b3 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dubbo/DubboApiDocWriteServiceImpl.java @@ -0,0 +1,29 @@ +package com.coderman.codemaker.app.dubbo; + +import com.coderman.codemaker.app.IWriteFileService; +import com.coderman.codemaker.app.WriteService; +import com.coderman.codemaker.bean.WriteContentBean; +import com.coderman.codemaker.config.AppServiceConfig; +import com.coderman.codemaker.config.ProjectTemplateDubboConfig; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * Description: + * date: 2021/6/18 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + * + * 写api模块服务 + */ +@Component(value = "dubboApiDocWriteFileService") +public class DubboApiDocWriteServiceImpl extends WriteService implements IWriteFileService { + + @Override + public void writeContent(WriteContentBean writeContentBean) { + writeApiDoc(writeContentBean.getContent(),writeContentBean.getHumpClassName()); + + } +} diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dubbo/DubboApiWriteServiceImpl.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dubbo/DubboApiWriteServiceImpl.java similarity index 94% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/dubbo/DubboApiWriteServiceImpl.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dubbo/DubboApiWriteServiceImpl.java index bd1fa1a266e79c5fc637b7aafd4f568240efee31..915f51e7846fba4ec2c5aa64168e8ea9b0596d04 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/dubbo/DubboApiWriteServiceImpl.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dubbo/DubboApiWriteServiceImpl.java @@ -2,6 +2,7 @@ package com.coderman.codemaker.app.dubbo; import com.coderman.codemaker.app.WriteService; import com.coderman.codemaker.bean.ClassContentBean; +import com.coderman.codemaker.bean.GlobalConstant; import com.coderman.codemaker.bean.WriteContentBean; import com.coderman.codemaker.config.AppServiceConfig; import com.coderman.codemaker.config.ProjectTemplateDubboConfig; @@ -62,6 +63,11 @@ public class DubboApiWriteServiceImpl extends WriteService implements IWriteFile classContentBean.setChildPackageName("domain.enums"); writeRoute(classContentBean); } + + //写自定义工具类 + if(writeContentBean.getTemplateName().equals(GlobalConstant.SINGLE_CLASS_COMMON)){ + writeRoute(classContentBean); + } } /** diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dubbo/DubboCommonWriteServiceImpl.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dubbo/DubboCommonWriteServiceImpl.java similarity index 95% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/dubbo/DubboCommonWriteServiceImpl.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dubbo/DubboCommonWriteServiceImpl.java index 0bdbe9fe392057598fa6ed98fd483a7c7aa3a181..91724cc40c78cde0bbb870f31f930c7d86d69e77 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/dubbo/DubboCommonWriteServiceImpl.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dubbo/DubboCommonWriteServiceImpl.java @@ -2,6 +2,7 @@ package com.coderman.codemaker.app.dubbo; import com.coderman.codemaker.app.WriteService; import com.coderman.codemaker.bean.ClassContentBean; +import com.coderman.codemaker.bean.GlobalConstant; import com.coderman.codemaker.bean.WriteContentBean; import com.coderman.codemaker.config.AppServiceConfig; import com.coderman.codemaker.config.ProjectTemplateDubboConfig; @@ -61,6 +62,11 @@ public class DubboCommonWriteServiceImpl extends WriteService implements IWriteF classContentBean.setChildPackageName("infrast.dao.mapper"); writeRoute(classContentBean); } + + //写自定义工具类 + if(writeContentBean.getTemplateName().equals(GlobalConstant.SINGLE_CLASS_COMMON)){ + writeRoute(classContentBean); + } } /** diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dubbo/DubboCoreWriteServiceImpl.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dubbo/DubboCoreWriteServiceImpl.java similarity index 95% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/dubbo/DubboCoreWriteServiceImpl.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dubbo/DubboCoreWriteServiceImpl.java index 9a9a3c6ad7bce08d90dedfd5771496cb8efd6867..31a2f774f036436044255a7f02acc192b17dc498 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/dubbo/DubboCoreWriteServiceImpl.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dubbo/DubboCoreWriteServiceImpl.java @@ -3,6 +3,7 @@ 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.GlobalConstant; import com.coderman.codemaker.bean.WriteContentBean; import com.coderman.codemaker.config.AppServiceConfig; import com.coderman.codemaker.config.ProjectTemplateDubboConfig; @@ -141,6 +142,11 @@ public class DubboCoreWriteServiceImpl extends WriteService implements IWriteFi classContentBean.setChildPackageName("domain.gataway"); writeRoute(classContentBean); } + //写domain.repository + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.REPOSITORY.getTempFileName())){ + classContentBean.setChildPackageName("domain.repository"); + writeRoute(classContentBean); + } //写domain.gataway.impl if(writeContentBean.getTemplateName().equals(TemplateFileEnum.GATAWAY_IMPL.getTempFileName())){ @@ -212,6 +218,12 @@ public class DubboCoreWriteServiceImpl extends WriteService implements IWriteFi } + //写infrast.cache + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.CACHE.getTempFileName())){ + classContentBean.setChildPackageName("infrast.cache"); + writeRoute(classContentBean); + } + //写infras.mq.consumer if(writeContentBean.getTemplateName().equals(TemplateFileEnum.MQ_CONSUMER.getTempFileName())){ classContentBean.setChildPackageName("infrast.mq.consumer"); @@ -252,9 +264,9 @@ public class DubboCoreWriteServiceImpl extends WriteService implements IWriteFi } - //写BaseEvent - if(writeContentBean.getTemplateName().equals(TemplateFileEnum.APP_EVENT_PUBLISHER.getTempFileName())){ - commonWriteService.writeBaseEvent(writeContentBean.getContent(),projectTemplateDubboConfig.getModuleCorePath()); + //写自定义工具类 + if(writeContentBean.getTemplateName().equals(GlobalConstant.SINGLE_CLASS_COMMON)){ + writeRoute(classContentBean); } } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/ClassBeanFactory.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/ClassBeanFactory.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/ClassBeanFactory.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/ClassBeanFactory.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/ClassConvertFactory.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/ClassConvertFactory.java similarity index 80% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/ClassConvertFactory.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/ClassConvertFactory.java index a2aa8ec73c4e80c2ea523e7b065409b8f114a847..3fe2ff04cf30625b7874d6b6809c3e1e7ca70612 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/ClassConvertFactory.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/ClassConvertFactory.java @@ -4,6 +4,8 @@ import com.coderman.codemaker.bean.plantuml.*; import com.coderman.codemaker.config.AppServiceConfig; import com.coderman.codemaker.enums.DomainDerivedElementEnum; import com.coderman.codemaker.enums.DomainElementEnum; +import com.coderman.codemaker.enums.TemplateFileEnum; +import com.coderman.codemaker.enums.VisibilityEnum; import com.coderman.codemaker.utils.StringHelperUtils; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -46,7 +48,7 @@ public class ClassConvertFactory { List fieldBeanList = classBean.buildSimpleFieldList(); String[] classNameArr = classBean.getExtendFieldBean().getDtoKeyList(); for (String className : classNameArr) { - dtoClassList.add(classBeanFactory.buildDtoClassBean(className,classBean,fieldBeanList)); + dtoClassList.add(classBeanFactory.buildDtoClassBean(className, classBean, fieldBeanList)); } } return dtoClassList; @@ -68,7 +70,7 @@ public class ClassConvertFactory { continue; } for (String className : classNameArr) { - voClassList.add(classBeanFactory.buildVOClassBean(className,classBean,fieldBeanList)); + voClassList.add(classBeanFactory.buildVOClassBean(className, classBean, fieldBeanList)); } } @@ -87,7 +89,7 @@ public class ClassConvertFactory { for (ClassBean classBean : dtoClassList) { InterfaceBean interfaceBean = classBeanFactory.buildInterfaceBean(classBean); - if(interfaceBean == null){ + if (interfaceBean == null) { continue; } facadeInterfaceList.add(interfaceBean); @@ -254,10 +256,10 @@ public class ClassConvertFactory { classBean.setClassName(className); classBean.setClassDesc(classBean.getClassDesc()); classBean.setPlantUMLPackage("app.facadeimpl"); - List methodBeanList = new ArrayList<>(interfaceBean.getMethodBeanList()); - + List methodBeanList = new ArrayList<>(); + interfaceBean.getMethodBeanList().forEach(methodBean -> methodBeanList.add(methodBean.copySelf(""))); List fieldBeanList = new ArrayList<>(interfaceBean.getFieldBeanList()); - + classBean.setContext(interfaceBean.getContext()); classBean.setMethodBeanList(methodBeanList); classBean.setFieldBeanList(fieldBeanList); classBean.setImportClassList(interfaceBean.getImportClassList()); @@ -306,15 +308,17 @@ public class ClassConvertFactory { if (CollectionUtils.isNotEmpty(classMethodList)) { //通过特定字符过滤facade方法 List newMethodList = classMethodList.stream().filter(methodBean -> - methodBean.getReturnClass().toLowerCase().contains("dto") + (methodBean.getReturnClass().toLowerCase().contains("dto") || methodBean.getReturnClass().toLowerCase().contains("result") || methodBean.getMethodName().toLowerCase().contains("facade") - || methodBean.getMethodName().toLowerCase().contains("dto") + || methodBean.getMethodName().toLowerCase().contains("dto")) + && !methodBean.isExportAclKey() ).collect(Collectors.toList()); if (CollectionUtils.isNotEmpty(newMethodList)) { facadeMethodList.addAll(newMethodList); } } + facadeInterfaceBean.setContext(classBean.getContext()); }); facadeMethodList.forEach(methodBean -> methodBean.buildParamArr()); facadeInterfaceBean.setMethodBeanList(facadeMethodList); @@ -326,6 +330,32 @@ public class ClassConvertFactory { } + /** + * 处理派生类controller->feign + * + * @param controllerClassList + * @return + */ + public List getFeignClassList(List controllerClassList) { + List interfaceBeanList = new ArrayList<>(); + controllerClassList.forEach(classBean -> { + InterfaceBean feignInterfaceBean = new InterfaceBean(); + feignInterfaceBean.setContext(classBean.getContext()); + feignInterfaceBean.setClassName(classBean.getClassName().replace("Controller","") + "Feign"); + feignInterfaceBean.setPlantUMLPackage("api.feign"); + List feignMethodList = new ArrayList<>(); + + classBean.getMethodBeanList().stream().forEach(methodBean -> { + feignMethodList.add(methodBean.copySelf("")); + }); + feignMethodList.forEach(methodBean -> methodBean.buildParamArr()); + feignInterfaceBean.setMethodBeanList(feignMethodList); + feignInterfaceBean.setFieldBeanList(new ArrayList<>()); + interfaceBeanList.add(feignInterfaceBean); + }); + return interfaceBeanList; + } + /** * 处理派生类bo->controller @@ -358,10 +388,10 @@ public class ClassConvertFactory { controllerBean.setClassName(k + "Controller"); } controllerBean.setPlantUMLPackage("adapter.controller"); - List controllerMethodList = new ArrayList<>(); v.stream().forEach(classBean -> { + controllerBean.setContext(classBean.getContext()); List classMethodList = classBean.getMethodBeanList(); if (CollectionUtils.isNotEmpty(classMethodList)) { //通过特定字符过滤facade方法 @@ -479,12 +509,12 @@ public class ClassConvertFactory { Map map = new HashMap<>(); classMethodList .stream().filter(methodBean -> - !methodBean.getMethodName().toLowerCase().contains("response") && - !methodBean.getMethodName().toLowerCase().contains("responsedto") && - !methodBean.getReturnClass().toLowerCase().contains("request") && - !methodBean.getReturnClass().toLowerCase().contains("requestdto") || - methodBean.getReturnClass().toLowerCase().contains("requestbo") - ).collect(Collectors.toList()).forEach(methodBean -> map.putIfAbsent(methodBean.getReturnClass() + methodBean.getMethodName(), methodBean)); + !methodBean.getMethodName().toLowerCase().contains("response") && + !methodBean.getMethodName().toLowerCase().contains("responsedto") && + !methodBean.getReturnClass().toLowerCase().contains("request") && + !methodBean.getReturnClass().toLowerCase().contains("requestdto") || + methodBean.getReturnClass().toLowerCase().contains("requestbo") + ).collect(Collectors.toList()).forEach(methodBean -> map.putIfAbsent(methodBean.getReturnClass() + methodBean.getMethodName(), methodBean)); convertInterfaceBean.setMethodBeanList(map.values().stream().collect(Collectors.toList())); convertInterfaceBean.getMethodBeanList().forEach(methodBean -> methodBean.buildParamArr()); interfaceConvertBeanList.add(convertInterfaceBean); @@ -552,6 +582,7 @@ public class ClassConvertFactory { 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)); @@ -580,7 +611,7 @@ public class ClassConvertFactory { MethodBean boList2dtoList = new MethodBean(); String bolist2volist = methodBeanFactory.getbolist2voListMethod(i); - boList2dtoList.setMethodName(bolist2volist+"(List<" + classBean.getClassName() + "> " + varBOClassName + "List)"); + boList2dtoList.setMethodName(bolist2volist + "(List<" + classBean.getClassName() + "> " + varBOClassName + "List)"); boList2dtoList.setReturnClass("List<" + voClassName + ">"); methodBeanList.add(boList2dtoList); i++; @@ -595,12 +626,12 @@ public class ClassConvertFactory { Map map = new HashMap<>(); classMethodList .stream().filter(methodBean -> - !methodBean.getMethodName().toLowerCase().contains("response") && - !methodBean.getMethodName().toLowerCase().contains("responsevo") && - !methodBean.getReturnClass().toLowerCase().contains("request") && - !methodBean.getReturnClass().toLowerCase().contains("requestvo") || - methodBean.getReturnClass().toLowerCase().contains("requestbo") - ).collect(Collectors.toList()).forEach(methodBean -> map.putIfAbsent(methodBean.getReturnClass() + methodBean.getMethodName(), methodBean)); + !methodBean.getMethodName().toLowerCase().contains("response") && + !methodBean.getMethodName().toLowerCase().contains("responsevo") && + !methodBean.getReturnClass().toLowerCase().contains("request") && + !methodBean.getReturnClass().toLowerCase().contains("requestvo") || + methodBean.getReturnClass().toLowerCase().contains("requestbo") + ).collect(Collectors.toList()).forEach(methodBean -> map.putIfAbsent(methodBean.getReturnClass() + methodBean.getMethodName(), methodBean)); convertInterfaceBean.setMethodBeanList(map.values().stream().collect(Collectors.toList())); convertInterfaceBean.getMethodBeanList().forEach(methodBean -> methodBean.buildParamArr()); interfaceConvertBeanList.add(convertInterfaceBean); @@ -712,16 +743,121 @@ public class ClassConvertFactory { /** * 构建api的枚举数据 + * * @param enumBeanList * @return */ - public List getApiEnumBeanList(List enumBeanList){ + public List getApiEnumBeanList(List enumBeanList) { List apiEnumBeanList = new ArrayList<>(); enumBeanList.forEach(enumBean -> apiEnumBeanList.add(enumBean.copySelf())); - apiEnumBeanList.forEach(enumBean -> enumBean.setPackageName(appServiceConfig.getPackage()+".api.enums")); + apiEnumBeanList.forEach(enumBean -> enumBean.setPackageName(appServiceConfig.getPackage() + ".api.enums")); return apiEnumBeanList; } + /** + * 处理派生类bo->dto + * + * @param domainBOClassList + * @return + */ + public List getQueryDTOClassList(List domainBOClassList) { + List dtoClassList = new ArrayList<>(); + for (ClassBean classBean : domainBOClassList) { + Optional optionalFieldBeanQueryDTOKey = classBean.getFieldBeanList().stream().filter(f -> f.isQueryDtoKey()).findFirst(); + if (!optionalFieldBeanQueryDTOKey.isPresent()) { + continue; + } + ClassBean queryDtoBean = optionalFieldBeanQueryDTOKey.get().buildQueryClass(); + queryDtoBean.setAuthor(classBean.getAuthor()); + queryDtoBean.setContext(classBean.getContext()); + queryDtoBean.setClassDesc("查询" + classBean.getClassDesc() + "请求DTO"); + dtoClassList.add(queryDtoBean); + } + return dtoClassList; + } + + + /** + * 处理派生类bo->dto + * + * @param domainBOClassList + * @return + */ + public List getQueryVOClassList(List domainBOClassList) { + List dtoClassList = new ArrayList<>(); + for (ClassBean classBean : domainBOClassList) { + Optional optionalFieldBeanQueryVOKey = classBean.getFieldBeanList().stream().filter(f -> f.isQueryVoKey()).findFirst(); + if (!optionalFieldBeanQueryVOKey.isPresent()) { + continue; + } + ClassBean queryDtoBean = optionalFieldBeanQueryVOKey.get().buildQueryClass(); + queryDtoBean.setAuthor(classBean.getAuthor()); + queryDtoBean.setClassDesc("查询" + classBean.getClassDesc() + "请求VO"); + queryDtoBean.setContext(classBean.getContext()); + dtoClassList.add(queryDtoBean); + } + return dtoClassList; + } + + + /** + * 处理派生类bo->导出到acl适配防腐下游参数 + * + * @param domainBOClassList + * @return + */ + public List getExportAclDTOClassList(List domainBOClassList) { + Map classBeanMap = new HashMap<>(); + + for (ClassBean classBean : domainBOClassList) { + Optional optionalMethodBeanQueryDTOKey = classBean.getMethodBeanList().stream().filter(f -> f.isExportAclKey()).findFirst(); + if (!optionalMethodBeanQueryDTOKey.isPresent()) { + continue; + } + //String DepartmentQueryDTO(roleList->list) + if(!optionalMethodBeanQueryDTOKey.get().getMethodName().contains("(")){ + continue; + } + + String [] classArr = optionalMethodBeanQueryDTOKey.get().getMethodName().trim().split("\\("); + + //对className打标防止被dto,vo handler扫描到当成bo->dto/vo的派生类处理， + //打标的类会被aclHandler专门扫描处理 + String className = classArr[0]+TemplateFileEnum.ACL.getTempFileName(); + ClassBean aclDtoclassBean = classBeanMap.get(className); + if(aclDtoclassBean == null){ + aclDtoclassBean = new ClassBean(); + aclDtoclassBean.setClassName(className); + aclDtoclassBean.setFieldBeanList(new ArrayList<>()); + } + + String fieldMappingStr = classArr[1].replace(")",""); + String [] fieldMappingArr = fieldMappingStr.split(","); + for(String fieldMapping : fieldMappingArr){ + String [] fieldArr; + if(fieldMapping.contains("->")){ + fieldArr = fieldMapping.split("->"); + }else { + fieldArr = fieldMapping.split("-"); + } + Optional fieldBeanOptional = classBean.getFieldBeanList().stream().filter(fieldBean -> fieldBean.getSimpleName().equals(fieldArr[0])).findFirst(); + if(fieldBeanOptional.isPresent()){ + FieldBean boFieldBean = fieldBeanOptional.get(); + String fieldType = boFieldBean.getFieldType(); + FieldBean fieldBean = new FieldBean(); + fieldBean.setFieldName(fieldType + " " + fieldArr[1]); + fieldBean.setDesc(boFieldBean.getDesc()); + fieldBean.setVisibility(VisibilityEnum.PRIVATE.getVisibility()); + fieldBean.buildFieldDetail(); + aclDtoclassBean.addField(fieldBean); + } + + } + classBeanMap.put(className,aclDtoclassBean); + } + + return Lists.newArrayList(classBeanMap.values()); + } } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/DerivedClassFactory.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/DerivedClassFactory.java similarity index 37% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/DerivedClassFactory.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/DerivedClassFactory.java index d39dd5519d4ff14c1d27c1d85a11c87871bfc4bd..7365b60c7680bb336549a67ea418f61cfeab3b51 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/DerivedClassFactory.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/DerivedClassFactory.java @@ -1,6 +1,7 @@ package com.coderman.codemaker.app.dynamicddd; import com.coderman.codemaker.bean.plantuml.*; +import com.coderman.codemaker.enums.TemplateFileEnum; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -21,235 +22,214 @@ public class DerivedClassFactory { @Autowired private ClassConvertFactory classConvertFactory; + /** * 处理bo到dto的派生 + * * @param domainBoElementBeanList * @param plantUmlContextBean */ - public void deriveBo2DTO(List domainBoElementBeanList, PlantUmlContextBean plantUmlContextBean){ + public void deriveBo2DTO(List domainBoElementBeanList, PlantUmlContextBean plantUmlContextBean) { List dtoList = classConvertFactory.getDTOClassList(domainBoElementBeanList); - if(plantUmlContextBean.getDerivedPlantUmlContextBean() == null){ - PlantUmlContextBean derivedPlantUmlContextBean = new PlantUmlContextBean(); - //将派生类放到派生类上下文里面 - dtoList.forEach(v->derivedPlantUmlContextBean.addClassBean(v)); - plantUmlContextBean.setDerivedPlantUmlContextBean(derivedPlantUmlContextBean); - }else { - //将派生类放到派生类上下文里面 - dtoList.forEach(v->plantUmlContextBean.getDerivedPlantUmlContextBean().addClassBean(v)); - } + //将派生类放到派生类上下文里面 + dtoList.forEach(v -> plantUmlContextBean.getDerivedPlantUmlContextBean().addClassBean(v)); } - /** * 处理enum到enum的派生 + * * @param domainEnumElementBeanList * @param plantUmlContextBean */ - public void deriveEnum2Enum(List domainEnumElementBeanList, PlantUmlContextBean plantUmlContextBean){ - + public void deriveEnum2Enum(List domainEnumElementBeanList, PlantUmlContextBean plantUmlContextBean) { List enumBeanList = classConvertFactory.getApiEnumBeanList(domainEnumElementBeanList); - if(plantUmlContextBean.getDerivedPlantUmlContextBean() == null){ - PlantUmlContextBean derivedPlantUmlContextBean = new PlantUmlContextBean(); - //将派生类放到派生类上下文里面 - enumBeanList.forEach(v->derivedPlantUmlContextBean.addEnumBean(v)); - plantUmlContextBean.setDerivedPlantUmlContextBean(derivedPlantUmlContextBean); - }else { - //将派生类放到派生类上下文里面 - enumBeanList.forEach(v->plantUmlContextBean.getDerivedPlantUmlContextBean().addEnumBean(v)); - } + //将派生类放到派生类上下文里面 + enumBeanList.forEach(v -> plantUmlContextBean.getDerivedPlantUmlContextBean().addEnumBean(v)); } - /** * 处理dto到facade的派生 + * * @param dtoElementBeanList * @param plantUmlContextBean */ - public void deriveDTO2Facade(List dtoElementBeanList, PlantUmlContextBean plantUmlContextBean){ + public void deriveDTO2Facade(List dtoElementBeanList, PlantUmlContextBean plantUmlContextBean) { List dtoList = classConvertFactory.getFacadeInterfaceList(dtoElementBeanList); - if(plantUmlContextBean.getDerivedPlantUmlContextBean() == null){ - PlantUmlContextBean derivedPlantUmlContextBean = new PlantUmlContextBean(); - //将派生类放到派生类上下文里面 - dtoList.forEach(v->derivedPlantUmlContextBean.addInterfaceBean(v)); - plantUmlContextBean.setDerivedPlantUmlContextBean(derivedPlantUmlContextBean); - }else { - //将派生类放到派生类上下文里面 - dtoList.forEach(v->plantUmlContextBean.getDerivedPlantUmlContextBean().addInterfaceBean(v)); - } + //将派生类放到派生类上下文里面 + dtoList.forEach(v -> plantUmlContextBean.getDerivedPlantUmlContextBean().addInterfaceBean(v)); } /** * 处理dto-boconvert的派生 + * * @param dtoElementBeanList * @param plantUmlContextBean */ - public void deriveDTOBOConvert(List dtoElementBeanList, PlantUmlContextBean plantUmlContextBean){ + public void deriveDTOBOConvert(List dtoElementBeanList, PlantUmlContextBean plantUmlContextBean) { List dtoboConvertList = classConvertFactory.getDTOBOConvertInterfaceList(dtoElementBeanList); - if(plantUmlContextBean.getDerivedPlantUmlContextBean() == null){ - PlantUmlContextBean derivedPlantUmlContextBean = new PlantUmlContextBean(); - //将派生类放到派生类上下文里面 - dtoboConvertList.forEach(v->derivedPlantUmlContextBean.addInterfaceBean(v)); - plantUmlContextBean.setDerivedPlantUmlContextBean(derivedPlantUmlContextBean); - }else { - //将派生类放到派生类上下文里面 - dtoboConvertList.forEach(v->plantUmlContextBean.getDerivedPlantUmlContextBean().addInterfaceBean(v)); - } + //将派生类放到派生类上下文里面 + dtoboConvertList.forEach(v -> plantUmlContextBean.getDerivedPlantUmlContextBean().addInterfaceBean(v)); } + /** * 处理do-boconvert的派生 + * * @param boElementBeanList * @param plantUmlContextBean */ - public void deriveDOBOConvert(List boElementBeanList, PlantUmlContextBean plantUmlContextBean){ - Map convertMap = classConvertFactory.getDOBOConvertInterfaceList(boElementBeanList); - List doboConvertInterfaceList = (List)convertMap.get("doboConvertList"); - Map BoConvertRelationMap = (Map)convertMap.get("doboConvertRelationMap"); - if(plantUmlContextBean.getDerivedPlantUmlContextBean() == null){ - PlantUmlContextBean derivedPlantUmlContextBean = new PlantUmlContextBean(); - //将派生类放到派生类上下文里面 - doboConvertInterfaceList.forEach(v->derivedPlantUmlContextBean.addInterfaceBean(v)); - plantUmlContextBean.setDerivedPlantUmlContextBean(derivedPlantUmlContextBean); - }else { - //将派生类放到派生类上下文里面 - doboConvertInterfaceList.forEach(v->plantUmlContextBean.getDerivedPlantUmlContextBean().addInterfaceBean(v)); - } + public void deriveDOBOConvert(List boElementBeanList, PlantUmlContextBean plantUmlContextBean) { + Map convertMap = classConvertFactory.getDOBOConvertInterfaceList(boElementBeanList); + List doboConvertInterfaceList = (List) convertMap.get("doboConvertList"); + Map BoConvertRelationMap = (Map) convertMap.get("doboConvertRelationMap"); + + //将派生类放到派生类上下文里面 + doboConvertInterfaceList.forEach(v -> plantUmlContextBean.getDerivedPlantUmlContextBean().addInterfaceBean(v)); //将dobo转换接口挂到BO类上 boElementBeanList.forEach(classBean -> { ClassBean boClassBean = plantUmlContextBean.getClassBeanMap().get(classBean.getClassName()); boClassBean.setBodoConvertInterface(BoConvertRelationMap.get(classBean.getClassName())); }); - - } /** * 处理bo到dto的派生 + * * @param domainBoElementBeanList * @param plantUmlContextBean */ - public void deriveBo2VO(List domainBoElementBeanList, PlantUmlContextBean plantUmlContextBean){ + public void deriveBo2VO(List domainBoElementBeanList, PlantUmlContextBean plantUmlContextBean) { List dtoList = classConvertFactory.getVOClassList(domainBoElementBeanList); - if(plantUmlContextBean.getDerivedPlantUmlContextBean() == null){ - PlantUmlContextBean derivedPlantUmlContextBean = new PlantUmlContextBean(); - //将派生类放到派生类上下文里面 - dtoList.forEach(v->derivedPlantUmlContextBean.addClassBean(v)); - plantUmlContextBean.setDerivedPlantUmlContextBean(derivedPlantUmlContextBean); - }else { - //将派生类放到派生类上下文里面 - dtoList.forEach(v->plantUmlContextBean.getDerivedPlantUmlContextBean().addClassBean(v)); - } + //将派生类放到派生类上下文里面 + dtoList.forEach(v -> plantUmlContextBean.getDerivedPlantUmlContextBean().addClassBean(v)); } /** * 处理bo到facade的派生 + * * @param domainBoElementBeanList * @param plantUmlContextBean */ - public void deriveBo2Facade(List domainBoElementBeanList, PlantUmlContextBean plantUmlContextBean){ + public void deriveBo2Facade(List domainBoElementBeanList, PlantUmlContextBean plantUmlContextBean) { List facadeList = classConvertFactory.getFacadeClassList(domainBoElementBeanList); - if(plantUmlContextBean.getDerivedPlantUmlContextBean() == null){ - PlantUmlContextBean derivedPlantUmlContextBean = new PlantUmlContextBean(); - facadeList.forEach(v->derivedPlantUmlContextBean.addInterfaceBean(v)); - plantUmlContextBean.setDerivedPlantUmlContextBean(derivedPlantUmlContextBean); - }else { - //将派生类放到派生类上下文里面 - facadeList.forEach(v-> { - - if(v.getClassName().contains(",")){ - String [] classNameArr = v.getClassName().split(","); - for (String className : classNameArr){ - InterfaceBean interfaceBean = new InterfaceBean(); - - interfaceBean.setClassName(className); - interfaceBean.setImportClassList(v.getImportClassList()); - interfaceBean.setPackageName(v.getPackageName()); - interfaceBean.setMethodBeanList(v.getMethodBeanList()); - interfaceBean.setPlantUMLPackage(v.getPlantUMLPackage()); - interfaceBean.setRelationClassStr(v.getRelationClassStr()); - interfaceBean.setFieldBeanList(v.getFieldBeanList()); - interfaceBean.setImplInterfaceBean(v.getImplInterfaceBean()); - interfaceBean.setAuthor(v.getAuthor()); - interfaceBean.setDerived(v.isDerived()); - plantUmlContextBean.getDerivedPlantUmlContextBean().addInterfaceBean(interfaceBean); - } - }else { - plantUmlContextBean.getDerivedPlantUmlContextBean().addInterfaceBean(v); + //将派生类放到派生类上下文里面 + facadeList.forEach(v -> { + if (v.getClassName().contains(",")) { + String[] classNameArr = v.getClassName().split(","); + for (String className : classNameArr) { + InterfaceBean interfaceBean = new InterfaceBean(); + + interfaceBean.setClassName(className); + interfaceBean.setImportClassList(v.getImportClassList()); + interfaceBean.setPackageName(v.getPackageName()); + interfaceBean.setMethodBeanList(v.getMethodBeanList()); + interfaceBean.setPlantUMLPackage(v.getPlantUMLPackage()); + interfaceBean.setRelationClassStr(v.getRelationClassStr()); + interfaceBean.setFieldBeanList(v.getFieldBeanList()); + interfaceBean.setImplInterfaceBean(v.getImplInterfaceBean()); + interfaceBean.setAuthor(v.getAuthor()); + interfaceBean.setContext(v.getContext()); + interfaceBean.setDerived(v.isDerived()); + plantUmlContextBean.getDerivedPlantUmlContextBean().addInterfaceBean(interfaceBean); } - }); - } + } else { + plantUmlContextBean.getDerivedPlantUmlContextBean().addInterfaceBean(v); + } + }); } + /** + * 处理controller到feign的派生 + * + * @param controllerElementBeanList + * @param plantUmlContextBean + */ + public void deriveController2Feign(List controllerElementBeanList, PlantUmlContextBean plantUmlContextBean) { + List feignInterfaceList = classConvertFactory.getFeignClassList(controllerElementBeanList); + //将派生类放到派生类上下文里面 + feignInterfaceList.forEach(v -> { + if (v.getClassName().contains(",")) { + String[] classNameArr = v.getClassName().split(","); + for (String className : classNameArr) { + InterfaceBean interfaceBean = new InterfaceBean(); + + interfaceBean.setClassName(className); + interfaceBean.setImportClassList(v.getImportClassList()); + interfaceBean.setPackageName(v.getPackageName()); + interfaceBean.setMethodBeanList(v.getMethodBeanList()); + interfaceBean.setPlantUMLPackage(v.getPlantUMLPackage()); + interfaceBean.setRelationClassStr(v.getRelationClassStr()); + interfaceBean.setFieldBeanList(v.getFieldBeanList()); + interfaceBean.setImplInterfaceBean(v.getImplInterfaceBean()); + interfaceBean.setAuthor(v.getAuthor()); + interfaceBean.setDerived(v.isDerived()); + plantUmlContextBean.getDerivedPlantUmlContextBean().addInterfaceBean(interfaceBean); + } + } else { + plantUmlContextBean.getDerivedPlantUmlContextBean().addInterfaceBean(v); + } + }); + } + + + /** * 处理bo到facade的派生 + * * @param domainBoElementBeanList * @param plantUmlContextBean */ - public void deriveBo2Controller(List domainBoElementBeanList, PlantUmlContextBean plantUmlContextBean){ + public void deriveBo2Controller(List domainBoElementBeanList, PlantUmlContextBean plantUmlContextBean) { List controllerBeanList = classConvertFactory.getControllerClassList(domainBoElementBeanList); - if(plantUmlContextBean.getDerivedPlantUmlContextBean() == null){ - PlantUmlContextBean derivedPlantUmlContextBean = new PlantUmlContextBean(); - controllerBeanList.forEach(v->derivedPlantUmlContextBean.addClassBean(v)); - plantUmlContextBean.setDerivedPlantUmlContextBean(derivedPlantUmlContextBean); - }else { - - //将派生类放到派生类上下文里面 - controllerBeanList.forEach(v-> { - - if(v.getClassName().contains(",")){ - String [] classNameArr = v.getClassName().split(","); - for (String className : classNameArr){ - ClassBean classBean = new ClassBean(); - classBean.setClassName(className); - classBean.setImportClassList(v.getImportClassList()); - classBean.setPackageName(v.getPackageName()); - classBean.setMethodBeanList(v.getMethodBeanList()); - classBean.setPlantUMLPackage(v.getPlantUMLPackage()); - classBean.setRelationClassStr(v.getRelationClassStr()); - classBean.setFieldBeanList(v.getFieldBeanList()); - classBean.setImplInterfaceBean(v.getImplInterfaceBean()); - classBean.setAuthor(v.getAuthor()); - classBean.setDerived(v.isDerived()); - plantUmlContextBean.getDerivedPlantUmlContextBean().addClassBean(classBean); - } - }else { - plantUmlContextBean.getDerivedPlantUmlContextBean().addClassBean(v); + //将派生类放到派生类上下文里面 + controllerBeanList.forEach(v -> { + if (v.getClassName().contains(",")) { + String[] classNameArr = v.getClassName().split(","); + for (String className : classNameArr) { + ClassBean classBean = new ClassBean(); + classBean.setClassName(className); + classBean.setImportClassList(v.getImportClassList()); + classBean.setPackageName(v.getPackageName()); + classBean.setMethodBeanList(v.getMethodBeanList()); + classBean.setPlantUMLPackage(v.getPlantUMLPackage()); + classBean.setRelationClassStr(v.getRelationClassStr()); + classBean.setFieldBeanList(v.getFieldBeanList()); + classBean.setContext(v.getContext()); + classBean.setImplInterfaceBean(v.getImplInterfaceBean()); + classBean.setAuthor(v.getAuthor()); + classBean.setDerived(v.isDerived()); + plantUmlContextBean.getDerivedPlantUmlContextBean().addClassBean(classBean); } - }); - } + } else { + plantUmlContextBean.getDerivedPlantUmlContextBean().addClassBean(v); + } + }); + } /** * 处理bo-dto到convert的派生 + * * @param domainBoElementBeanList * @param plantUmlContextBean */ - public void deriveBoDTO2Convert(List domainBoElementBeanList, PlantUmlContextBean plantUmlContextBean){ - Map convertMap = classConvertFactory.getConvertInterfaceBeanList(domainBoElementBeanList); - - List convertList = (List)convertMap.get("interfaceList"); - Map facadeConvertRelationMap = (Map)convertMap.get("facadeconvertrelation"); - - if(plantUmlContextBean.getDerivedPlantUmlContextBean() == null){ - PlantUmlContextBean derivedPlantUmlContextBean = new PlantUmlContextBean(); - //将派生类放到派生类上下文里面 - convertList.forEach(v->derivedPlantUmlContextBean.addInterfaceBean(v)); - plantUmlContextBean.setDerivedPlantUmlContextBean(derivedPlantUmlContextBean); - }else { - //将派生类放到派生类上下文里面 - convertList.forEach(v->plantUmlContextBean.getDerivedPlantUmlContextBean().addInterfaceBean(v)); - } + public void deriveBoDTO2Convert(List domainBoElementBeanList, PlantUmlContextBean plantUmlContextBean) { + Map convertMap = classConvertFactory.getConvertInterfaceBeanList(domainBoElementBeanList); + List convertList = (List) convertMap.get("interfaceList"); + Map facadeConvertRelationMap = (Map) convertMap.get("facadeconvertrelation"); + //将派生类放到派生类上下文里面 + convertList.forEach(v -> plantUmlContextBean.getDerivedPlantUmlContextBean().addInterfaceBean(v)); //facade接口关联对应的convert接口 - plantUmlContextBean.getDerivedPlantUmlContextBean().getInterfaceBeanMap().forEach((k,v)->{ - if(k.toLowerCase().endsWith("facade")){ + plantUmlContextBean.getDerivedPlantUmlContextBean().getInterfaceBeanMap().forEach((k, v) -> { + if (k.toLowerCase().endsWith("facade")) { v.setBodtoConvertInterface(facadeConvertRelationMap.get(k)); } }); @@ -257,82 +237,64 @@ public class DerivedClassFactory { /** * 处理bo-vo到convert的派生 + * * @param domainBoElementBeanList * @param plantUmlContextBean */ - public void deriveBoVO2Convert(List domainBoElementBeanList, PlantUmlContextBean plantUmlContextBean){ - Map convertMap = classConvertFactory.getConvertBOVOInterfaceBeanList(domainBoElementBeanList); - List bovoConvertInterfaceList = (List)convertMap.get("voboconvertlist"); - Map BoConvertRelationMap = (Map)convertMap.get("voboconvertrelation"); - - - if(plantUmlContextBean.getDerivedPlantUmlContextBean() == null){ - PlantUmlContextBean derivedPlantUmlContextBean = new PlantUmlContextBean(); - //将派生类放到派生类上下文里面 - bovoConvertInterfaceList.forEach(v->derivedPlantUmlContextBean.addInterfaceBean(v)); - plantUmlContextBean.setDerivedPlantUmlContextBean(derivedPlantUmlContextBean); - }else { - //将派生类放到派生类上下文里面 - bovoConvertInterfaceList.forEach(v->plantUmlContextBean.getDerivedPlantUmlContextBean().addInterfaceBean(v)); - } + public void deriveBoVO2Convert(List domainBoElementBeanList, PlantUmlContextBean plantUmlContextBean) { + Map convertMap = classConvertFactory.getConvertBOVOInterfaceBeanList(domainBoElementBeanList); + List bovoConvertInterfaceList = (List) convertMap.get("voboconvertlist"); + Map BoConvertRelationMap = (Map) convertMap.get("voboconvertrelation"); + //将派生类放到派生类上下文里面 + bovoConvertInterfaceList.forEach(v -> plantUmlContextBean.getDerivedPlantUmlContextBean().addInterfaceBean(v)); //将dobo转换接口挂到BO类上,也挂到VO类上便于调用链路绘制 domainBoElementBeanList.forEach(classBean -> { ClassBean boClassBean = plantUmlContextBean.getClassBeanMap().get(classBean.getClassName()); boClassBean.setBovoConvertInterface(BoConvertRelationMap.get(classBean.getClassName())); Optional optionalFieldBean = classBean.getFieldBeanList().stream().filter(fieldBean -> fieldBean.isVoKey()).findFirst(); - if(optionalFieldBean.isPresent()){ + if (optionalFieldBean.isPresent()) { FieldBean fieldBean = optionalFieldBean.get(); - String [] classNameArr = fieldBean.getFieldName() - .replace("String","") - .replace("string","") + String[] classNameArr = fieldBean.getFieldName() + .replace("String", "") + .replace("string", "") .trim() .split(","); - for (String voClassname : classNameArr){ - String voClassName = voClassname.endsWith("VO") ? voClassname : voClassname+"VO"; + for (String voClassname : classNameArr) { + String voClassName = voClassname.endsWith("VO") ? voClassname : voClassname + "VO"; ClassBean voClassBean = plantUmlContextBean.getDerivedPlantUmlContextBean().getClassBeanMap().get(voClassName); - if(voClassBean == null){ + if (voClassBean == null) { continue; } voClassBean.setBovoConvertInterface(BoConvertRelationMap.get(classBean.getClassName())); } } }); - } - /** * 处理facade到facadeimpl的派生 + * * @param dtoElementBeanList * @param plantUmlContextBean */ - public void deriveFacade2FacadeImpl(List dtoElementBeanList, PlantUmlContextBean plantUmlContextBean){ + public void deriveFacade2FacadeImpl(List dtoElementBeanList, PlantUmlContextBean plantUmlContextBean) { List facadeImplList = classConvertFactory.getFacadeImplList(dtoElementBeanList); - if(plantUmlContextBean.getDerivedPlantUmlContextBean() == null){ - PlantUmlContextBean derivedPlantUmlContextBean = new PlantUmlContextBean(); - //将派生类放到派生类上下文里面 - facadeImplList.forEach(v->derivedPlantUmlContextBean.addClassBean(v)); - plantUmlContextBean.setDerivedPlantUmlContextBean(derivedPlantUmlContextBean); - }else { - //将派生类放到派生类上下文里面 - facadeImplList.forEach(v->plantUmlContextBean.getDerivedPlantUmlContextBean().addClassBean(v)); - } + //将派生类放到派生类上下文里面 + facadeImplList.forEach(v -> plantUmlContextBean.getDerivedPlantUmlContextBean().addClassBean(v)); } /** * 处理gataway到gatawayimpl的派生 + * * @param dtoElementBeanList * @param plantUmlContextBean */ - public List deriveGataway2GatawayImpl(List dtoElementBeanList, PlantUmlContextBean plantUmlContextBean){ + public List deriveGataway2GatawayImpl(List dtoElementBeanList, PlantUmlContextBean plantUmlContextBean) { List gatawayImplList = classConvertFactory.getGatawayImplList(dtoElementBeanList); - - if(CollectionUtils.isNotEmpty(gatawayImplList)){ - gatawayImplList.forEach(classBean -> { - plantUmlContextBean.getClassBeanMap().put(classBean.getClassName(),classBean); - }); + if (CollectionUtils.isNotEmpty(gatawayImplList)) { + gatawayImplList.forEach(classBean -> plantUmlContextBean.getClassBeanMap().put(classBean.getClassName(), classBean)); } return gatawayImplList; } @@ -340,45 +302,62 @@ public class DerivedClassFactory { /** * 处理infrast acl到infrastaclimpl的派生 + * * @param infrastAclElementBeanList * @param plantUmlContextBean */ - public List deriveInfrastAcl2InfrastImpl(List infrastAclElementBeanList, PlantUmlContextBean plantUmlContextBean){ + public List deriveInfrastAcl2InfrastImpl(List infrastAclElementBeanList, PlantUmlContextBean plantUmlContextBean) { List gatawayImplList = classConvertFactory.getInfrastAclImplList(infrastAclElementBeanList); - if(CollectionUtils.isNotEmpty(gatawayImplList)){ - gatawayImplList.forEach(classBean -> { - plantUmlContextBean.getClassBeanMap().put(classBean.getClassName(),classBean); - }); + if (CollectionUtils.isNotEmpty(gatawayImplList)) { + gatawayImplList.forEach(classBean -> plantUmlContextBean.getClassBeanMap().put(classBean.getClassName(), classBean)); } return gatawayImplList; } /** * 处理Repository到Repositoryimpl的派生 + * * @param dtoElementBeanList * @param plantUmlContextBean */ - public List deriveRepository2RepositoryImpl(List dtoElementBeanList, PlantUmlContextBean plantUmlContextBean){ + public List deriveRepository2RepositoryImpl(List dtoElementBeanList, PlantUmlContextBean plantUmlContextBean) { List repositoryImplList = classConvertFactory.getRepositoryImplList(dtoElementBeanList); - if(CollectionUtils.isNotEmpty(repositoryImplList)){ - repositoryImplList.forEach(classBean -> { - plantUmlContextBean.getClassBeanMap().put(classBean.getClassName(),classBean); - }); + if (CollectionUtils.isNotEmpty(repositoryImplList)) { + repositoryImplList.forEach(classBean -> plantUmlContextBean.getClassBeanMap().put(classBean.getClassName(), classBean)); } return repositoryImplList; } + /** - * 构建方法内容 - * @param methodBeanList - * @return + * 处理bo到querydto的派生 + * + * @param domainBoElementBeanList + * @param plantUmlContextBean */ - private List getMethodBeanList(List methodBeanList){ - for (MethodBean methodBean : methodBeanList){ - methodBean.buildMethodContent(); + public void deriveBo2Query(List domainBoElementBeanList, PlantUmlContextBean plantUmlContextBean, String element) { + List queryClassBeanList; + if (element.equals(TemplateFileEnum.DTO.getTempFileName())) { + queryClassBeanList = classConvertFactory.getQueryDTOClassList(domainBoElementBeanList); + } else { + queryClassBeanList = classConvertFactory.getQueryVOClassList(domainBoElementBeanList); } - return methodBeanList; + //将派生类放到派生类上下文里面 + queryClassBeanList.forEach(v -> plantUmlContextBean.getDerivedPlantUmlContextBean().addClassBean(v)); + } + + + /** + * 处理bo到acl param的派生 + * + * @param domainBoElementBeanList + * @param plantUmlContextBean + */ + public void deriveBo2AclDTO(List domainBoElementBeanList, PlantUmlContextBean plantUmlContextBean) { + List queryClassBeanList = classConvertFactory.getExportAclDTOClassList(domainBoElementBeanList); + //将派生类放到派生类上下文里面 + queryClassBeanList.forEach(v -> plantUmlContextBean.getDerivedPlantUmlContextBean().addClassBean(v)); } } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/DomainElementHandler.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/DomainElementHandler.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/DomainElementHandler.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/DomainElementHandler.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/DynamicDDDWriteServiceImpl.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/DynamicDDDWriteServiceImpl.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/DynamicDDDWriteServiceImpl.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/DynamicDDDWriteServiceImpl.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/MethodBeanFactory.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/MethodBeanFactory.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/MethodBeanFactory.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/MethodBeanFactory.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedControllerElementHandler.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedControllerElementHandler.java similarity index 94% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedControllerElementHandler.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedControllerElementHandler.java index b8fd10732739c5d655d1bd00b8ced7d81c658513..eb718f677cee337925feb5d903fe1041c30440e9 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedControllerElementHandler.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedControllerElementHandler.java @@ -1,5 +1,6 @@ package com.coderman.codemaker.app.dynamicddd.derivedhandler; +import com.coderman.codemaker.app.dynamicddd.DerivedClassFactory; import com.coderman.codemaker.enums.dynamic.ReadWriteTypeEnum; import com.coderman.codemaker.service.ImportPackageService; import com.coderman.codemaker.app.dynamicddd.DomainElementHandler; @@ -11,7 +12,6 @@ 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; @@ -33,6 +33,11 @@ public class DerivedControllerElementHandler implements DomainElementHandler importPackageService.dealImportClass(v,plantUmlContextBean)); controllerElementBean.setClassBeanList(classBeanList); diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedDOBOConvertElementHandler.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedDOBOConvertElementHandler.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedDOBOConvertElementHandler.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedDOBOConvertElementHandler.java diff --git a/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedDTO2DTOConvertElementHandler.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedDTO2DTOConvertElementHandler.java new file mode 100644 index 0000000000000000000000000000000000000000..958f9147f871a3af584dbd629e5b71d12f214065 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedDTO2DTOConvertElementHandler.java @@ -0,0 +1,54 @@ +package com.coderman.codemaker.app.dynamicddd.derivedhandler; + +import com.coderman.codemaker.app.dynamicddd.DomainElementHandler; +import com.coderman.codemaker.bean.dddelementderive.Dto2DtoConvertElementBean; +import com.coderman.codemaker.bean.dddelementderive.VoBoConvertElementBean; +import com.coderman.codemaker.bean.plantuml.InterfaceBean; +import com.coderman.codemaker.bean.plantuml.PlantUmlContextBean; +import com.coderman.codemaker.enums.DomainDerivedElementEnum; +import com.coderman.codemaker.service.ImportPackageService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.ArrayList; +import java.util.List; + +/** + * Description: + * date: 2021/7/8 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + * 处理派生类bo->dto + */ +@Component(value = "derivedDTO2DTOConvertElementHandler") +public class DerivedDTO2DTOConvertElementHandler implements DomainElementHandler { + + @Autowired + private ImportPackageService importPackageService; + + @Override + public Dto2DtoConvertElementBean getElementBeanList(PlantUmlContextBean plantUmlContextBean) { + if(plantUmlContextBean.getDerivedPlantUmlContextBean() == null){ + return null; + } + Dto2DtoConvertElementBean dto2DtoConvertElementBean = new Dto2DtoConvertElementBean(); + List convertElementBeanList = new ArrayList<>(); + plantUmlContextBean.getDerivedPlantUmlContextBean().getInterfaceBeanMap().forEach((k,v)->{ + if(v.getClassName().toLowerCase().endsWith(DomainDerivedElementEnum.DTO2DTO_CONVERT.getElement())){ + importPackageService.setPackageName(v,"infrast.acl.convert"); + String className = v.getClassName().substring(0,1).toUpperCase().concat(v.getClassName().substring(1)).replace("DTO",""); + v.setClassName(className); + convertElementBeanList.add(v); + } + }); + + + convertElementBeanList.stream().forEach(v-> importPackageService.dealImportClass(v,plantUmlContextBean)); + + dto2DtoConvertElementBean.setInterfaceBeanList(convertElementBeanList); + + return dto2DtoConvertElementBean; + } +} diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedDTOBOConvertElementHandler.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedDTOBOConvertElementHandler.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedDTOBOConvertElementHandler.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedDTOBOConvertElementHandler.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedDTOElementHandler.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedDTOElementHandler.java similarity index 94% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedDTOElementHandler.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedDTOElementHandler.java index 87be23d0d524dc5138b0db8a0c5a4e903a2e9d26..a7df0ae26a21294982660014457090af1568491b 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedDTOElementHandler.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedDTOElementHandler.java @@ -1,5 +1,6 @@ package com.coderman.codemaker.app.dynamicddd.derivedhandler; +import com.alibaba.fastjson.JSON; import com.coderman.codemaker.service.ImportPackageService; import com.coderman.codemaker.app.dynamicddd.DerivedClassFactory; import com.coderman.codemaker.app.dynamicddd.DomainElementHandler; @@ -10,6 +11,7 @@ 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.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -42,6 +44,9 @@ public class DerivedDTOElementHandler implements DomainElementHandler dtoElementBeanList = new ArrayList<>(); plantUmlContextBean.getDerivedPlantUmlContextBean().getClassBeanMap().forEach((k,v)->{ + if(StringUtils.isEmpty(v.getClassName())){ + System.out.println(JSON.toJSONString(v)); + } if(v.getClassName().toLowerCase().endsWith(DomainDerivedElementEnum.DTO.getElement())){ importPackageService.setPackageName(v,"api.dto"); String className = v.getClassName().substring(0,1).toUpperCase().concat(v.getClassName().substring(1)); diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedEnumElementHandler.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedEnumElementHandler.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedEnumElementHandler.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedEnumElementHandler.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedFacadeElementHandler.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedFacadeElementHandler.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedFacadeElementHandler.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedFacadeElementHandler.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedFacadeImplElementHandler.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedFacadeImplElementHandler.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedFacadeImplElementHandler.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedFacadeImplElementHandler.java diff --git a/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedFeignElementHandler.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedFeignElementHandler.java new file mode 100644 index 0000000000000000000000000000000000000000..fb55e1c7209e17bb8f707f356298cee229cafcdd --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedFeignElementHandler.java @@ -0,0 +1,62 @@ +package com.coderman.codemaker.app.dynamicddd.derivedhandler; + +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.FeignElementBean; +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.DomainDerivedElementEnum; +import com.coderman.codemaker.service.ImportPackageService; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +/** + * Description: + * date: 2021/7/8 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + * 处理派生类bo->dto + */ +@Component(value = "derivedFeignElementHandler") +public class DerivedFeignElementHandler implements DomainElementHandler { + @Autowired + private DerivedClassFactory derivedClassFactory; + + @Autowired + private ImportPackageService importPackageService; + + @Override + public FeignElementBean getElementBeanList(PlantUmlContextBean plantUmlContextBean) { + if(plantUmlContextBean.getDerivedPlantUmlContextBean() == null){ + return null; + } + FeignElementBean feignElementBean = new FeignElementBean(); + List feignElementBeanList = new ArrayList<>(); + plantUmlContextBean.getDerivedPlantUmlContextBean().getInterfaceBeanMap().forEach((k,v)->{ + if(v.getClassName().toLowerCase().endsWith(DomainDerivedElementEnum.FEIGN.getElement())){ + importPackageService.setPackageName(v,"api.feign"); + v.setDerived(true); + importPackageService.dealImportClass(v,plantUmlContextBean); + feignElementBeanList.add(v); + } + }); + + feignElementBeanList.stream().forEach(v-> importPackageService.dealImportClass(v,plantUmlContextBean)); + //处理feign 到feignimpl这里需要看情况是否是单独实现还是由controller实现 + //derivedClassFactory.deriveFacade2FacadeImpl(feignElementBeanList,plantUmlContextBean); + feignElementBean.setInterfaceBeanList(feignElementBeanList); + + return feignElementBean; + + } +} diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedGatawayImplElementHandler.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedGatawayImplElementHandler.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedGatawayImplElementHandler.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedGatawayImplElementHandler.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedInfrastAclImplElementHandler.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedInfrastAclImplElementHandler.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedInfrastAclImplElementHandler.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedInfrastAclImplElementHandler.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedRepositoryImplElementHandler.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedRepositoryImplElementHandler.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedRepositoryImplElementHandler.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedRepositoryImplElementHandler.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedVOBOConvertElementHandler.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedVOBOConvertElementHandler.java similarity index 70% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedVOBOConvertElementHandler.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedVOBOConvertElementHandler.java index 3435e60e04d74dca5a792adba7b426d6605bd68e..ba0cb30e4ee9dad3a3d4a8f832e4f5873731445d 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedVOBOConvertElementHandler.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedVOBOConvertElementHandler.java @@ -1,5 +1,6 @@ package com.coderman.codemaker.app.dynamicddd.derivedhandler; +import com.coderman.codemaker.bean.plantuml.ClassBean; import com.coderman.codemaker.service.ImportPackageService; import com.coderman.codemaker.app.dynamicddd.DomainElementHandler; import com.coderman.codemaker.bean.dddelementderive.VoBoConvertElementBean; @@ -39,6 +40,22 @@ public class DerivedVOBOConvertElementHandler implements DomainElementHandler importClassList = v.getImportClassList(); + List newImport = new ArrayList<>(); + for (String importClass : importClassList){ + String [] arr = importClass.split("\\."); + String importClassName = arr[arr.length - 1]; + ClassBean classBean = plantUmlContextBean.getDerivedPlantUmlContextBean().getClassBeanMap().get(importClassName); + if(classBean == null){ + newImport.add(importClass); + continue; + }else { + newImport.add(classBean.getPackageName()+"."+classBean.getClassName()); + } + } + v.setImportClassList(newImport); convertElementBeanList.add(v); } }); diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedVOElementHandler.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedVOElementHandler.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedVOElementHandler.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/derivedhandler/DerivedVOElementHandler.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/AppCmdElementHandler.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/AppCmdElementHandler.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/AppCmdElementHandler.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/AppCmdElementHandler.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/AppExeElementHandler.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/AppExeElementHandler.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/AppExeElementHandler.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/AppExeElementHandler.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/AppListenerElementHandler.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/AppListenerElementHandler.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/AppListenerElementHandler.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/AppListenerElementHandler.java diff --git a/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/CacheElementHandler.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/CacheElementHandler.java new file mode 100644 index 0000000000000000000000000000000000000000..6405d7a6632249d00ff962dc886ad21dfd1e3c4b --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/CacheElementHandler.java @@ -0,0 +1,57 @@ +package com.coderman.codemaker.app.dynamicddd.handler; + +import com.coderman.codemaker.app.dynamicddd.DomainElementHandler; +import com.coderman.codemaker.bean.dddelement.CacheElementBean; +import com.coderman.codemaker.bean.plantuml.ClassBean; +import com.coderman.codemaker.bean.plantuml.PlantUmlContextBean; +import com.coderman.codemaker.enums.DomainElementEnum; +import com.coderman.codemaker.service.ImportPackageService; +import org.apache.commons.lang3.StringUtils; +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 = "cacheElementHandler") +public class CacheElementHandler implements DomainElementHandler { + + @Autowired + private ImportPackageService importPackageService; + + @Override + public CacheElementBean getElementBeanList(PlantUmlContextBean plantUmlContextBean) { + CacheElementBean cacheElementBean = new CacheElementBean(); + List cacheBeanList = new ArrayList<>(); + plantUmlContextBean.getClassBeanMap().forEach((k,v)->{ + if(v.getClassName().toLowerCase().endsWith(DomainElementEnum.CACHE.getElement())){ + String moduleTag = "infrast"; + if(StringUtils.isEmpty(v.getPlantUMLPackage())){ + moduleTag = moduleTag+".cache"; + }else if(v.getPlantUMLPackage().contains(moduleTag)){ + moduleTag = ""; + } + importPackageService.setPackageNameWithModule(v,moduleTag); + + String className = v.getClassName().substring(0,1).toUpperCase().concat(v.getClassName().substring(1)); + v.setClassName(className); + importPackageService.dealImportClass(v,plantUmlContextBean); + v.getMethodBeanList().forEach(methodBean -> methodBean.buildDoc()); + + cacheBeanList.add(v); + } + }); + cacheElementBean.setClassBeanList(cacheBeanList); + return cacheElementBean; + } + +} + diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/DomainBoElementHandler.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/DomainBoElementHandler.java similarity index 74% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/DomainBoElementHandler.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/DomainBoElementHandler.java index 9d842c752a859f8fad190d303e314c05feecb88f..efdb56a1b046a2e6b9076570c33d9780ad8452df 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/DomainBoElementHandler.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/DomainBoElementHandler.java @@ -1,6 +1,7 @@ package com.coderman.codemaker.app.dynamicddd.handler; import com.coderman.codemaker.bean.TableBean; +import com.coderman.codemaker.enums.TemplateFileEnum; import com.coderman.codemaker.service.ImportPackageService; import com.coderman.codemaker.app.dynamicddd.DerivedClassFactory; import com.coderman.codemaker.app.dynamicddd.DomainElementHandler; @@ -42,28 +43,52 @@ public class DomainBoElementHandler implements DomainElementHandler boWithFacadeKeyList = new ArrayList<>(); List boWithVoKeyList = new ArrayList<>(); List boWithControllerKeyList = new ArrayList<>(); + List boWithQueryDTOKeyList = new ArrayList<>(); + List boWithQueryVOKeyList = new ArrayList<>(); + List boWithExportACLKeyList = new ArrayList<>(); + //过滤带有数据库表映射的bo plantUmlContextBean.getClassBeanMap().forEach((k, v) -> { //过滤掉pagebo if (v.getClassName().toLowerCase().endsWith(DomainElementEnum.BO.getElement()) && !v.getClassName().equals("PageBO")) { + + Optional optionalFieldBeanContextKey = v.getFieldBeanList().stream().filter(f -> f.isContextKey()).findFirst(); + if (optionalFieldBeanContextKey.isPresent()) { + v.setContext(optionalFieldBeanContextKey.get().getSimpleName()); + } + + Optional optionalFieldBeanQueryDTOKey = v.getFieldBeanList().stream().filter(f -> f.isQueryDtoKey()).findFirst(); + if (optionalFieldBeanQueryDTOKey.isPresent()) { + boWithQueryDTOKeyList.add(v); + } + + Optional optionalFieldBeanQueryVOKey = v.getFieldBeanList().stream().filter(f -> f.isQueryVoKey()).findFirst(); + if (optionalFieldBeanQueryVOKey.isPresent()) { + boWithQueryVOKeyList.add(v); + } + + importPackageService.setPackageName(v, "domain.bo"); - Optional optionalFieldBean = v.getFieldBeanList().stream().filter(f -> f.isTableKey()).findFirst(); - if (optionalFieldBean.isPresent()) { + + Optional optionalFieldBeanTableKey = v.getFieldBeanList().stream().filter(f -> f.isTableKey()).findFirst(); + if (optionalFieldBeanTableKey.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()); + setTableBean(v,plantUmlContextBean,optionalFieldBeanTableKey.get().getFieldName()); + v.getExtendFieldBean().buildTableKey(optionalFieldBeanTableKey.get().getFieldName()); } + Optional optionalFieldBeanDtoKey = v.getFieldBeanList().stream().filter(f -> f.isDtoKey()).findFirst(); if (optionalFieldBeanDtoKey.isPresent()) { boWithDtoKeyList.add(v); v.getExtendFieldBean().buildDtoKeyArr(optionalFieldBeanDtoKey.get().getFieldName()); } + Optional optionalFieldBeanFacadeKey = v.getFieldBeanList().stream().filter(f -> f.isFacadeKey()).findFirst(); if (optionalFieldBeanFacadeKey.isPresent()) { boWithFacadeKeyList.add(v); @@ -74,22 +99,25 @@ public class DomainBoElementHandler implements DomainElementHandler optionalFieldBeanControllerKey = v.getFieldBeanList().stream().filter(f -> f.isControllerKey()).findFirst(); if (optionalFieldBeanControllerKey.isPresent()) { boWithControllerKeyList.add(v); v.getExtendFieldBean().buildControllerKeyArr(optionalFieldBeanControllerKey.get().getFieldName()); - } Optional optionalFieldBeanInvokeFileKey= v.getFieldBeanList().stream().filter(f -> f.isInvokeFileKey()).findFirst(); if (optionalFieldBeanInvokeFileKey.isPresent()) { v.getExtendFieldBean().buildInvokeFileKeyArr(optionalFieldBeanInvokeFileKey.get().getFieldName()); - String invokeFileName = optionalFieldBeanInvokeFileKey.get().getFieldName().replace("String","").replace("string","").trim(); plantUmlContextBean.addDynamicInvokeFile(invokeFileName); } + + Optional optionalExportAclKey = v.getMethodBeanList().stream().filter(methodBean -> methodBean.isExportAclKey()).findFirst(); + if (optionalExportAclKey.isPresent()) { + boWithExportACLKeyList.add(v); + } } }); //bo 派生 do-bo convert @@ -103,6 +131,17 @@ public class DomainBoElementHandler implements DomainElementHandler { if (v.getClassName().toLowerCase().endsWith(DomainElementEnum.BO.getElement()) && !v.getClassName().equals("PageBO")) { //过滤扩展属性 - List beanList = v.getFieldBeanList().stream().filter(f -> !f.isTableKey() - && !f.isDtoKey() - && !f.isFacadeKey() - && !f.isVoKey() - && !f.isControllerKey() - && !f.isInvokeFileKey() - ).collect(Collectors.toList()); + List beanList = v.getFieldBeanList().stream().filter(f -> f.isSimpleField()).collect(Collectors.toList()); v.setFieldBeanList(beanList); - //过滤扩展方法 List methodBeanList = v.getMethodBeanList().stream().filter(methodBean -> - !methodBean.getReturnClass().toLowerCase().contains("dto") - && !methodBean.getMethodName().toLowerCase().contains("dto") - && !methodBean.getReturnClass().toLowerCase().contains("vo") - && !methodBean.getMethodName().toLowerCase().contains("vo") + !methodBean.isModelExtendMethod() ).collect(Collectors.toList()); + //对bo本身的方法返回值做refresh操作 + methodBeanList.stream().forEach(methodBean -> {methodBean.refreshReturnBodyByReturnType();}); v.setMethodBeanList(methodBeanList); String className = v.getClassName().substring(0, 1).toUpperCase().concat(v.getClassName().substring(1)); @@ -152,6 +191,7 @@ public class DomainBoElementHandler implements DomainElementHandler importPackageService.dealImportClass(v, plantUmlContextBean)); domainBoElementBean.setClassBeanList(domainBoElementBeanList); diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/DomainFactoryElementHandler.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/DomainFactoryElementHandler.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/DomainFactoryElementHandler.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/DomainFactoryElementHandler.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/DomainGatawayElementHandler.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/DomainGatawayElementHandler.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/DomainGatawayElementHandler.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/DomainGatawayElementHandler.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/DynamicMapperElementHandler.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/DynamicMapperElementHandler.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/DynamicMapperElementHandler.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/DynamicMapperElementHandler.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/DynamicMapperXmlElementHandler.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/DynamicMapperXmlElementHandler.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/DynamicMapperXmlElementHandler.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/DynamicMapperXmlElementHandler.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/EventElementHandler.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/EventElementHandler.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/EventElementHandler.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/EventElementHandler.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/InfrastAclElementHandler.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/InfrastAclElementHandler.java similarity index 69% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/InfrastAclElementHandler.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/InfrastAclElementHandler.java index df41695e6e9c69265074cbd4e7419cde6025846d..b5ed0fec49c8aa44539938a57308a07f831aac9a 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/InfrastAclElementHandler.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/InfrastAclElementHandler.java @@ -1,5 +1,6 @@ package com.coderman.codemaker.app.dynamicddd.handler; +import com.coderman.codemaker.enums.TemplateFileEnum; import com.coderman.codemaker.service.ImportPackageService; import com.coderman.codemaker.app.dynamicddd.DomainElementHandler; import com.coderman.codemaker.bean.dddelement.InfrastAclElementBean; @@ -63,13 +64,17 @@ public class InfrastAclElementHandler implements DomainElementHandler()); + newClassBean.setMethodBeanList(new ArrayList<>()); + + newClassBean.setPackageName(packageName); + newClassBean.setAuthor(interfaceBean.getAuthor()); interfaceBean.getImportClassList().add(packageName+"."+className); - classBeanList.add(classBean); + classBeanList.add(newClassBean); } } } @@ -112,5 +122,28 @@ public class InfrastAclElementHandler implements DomainElementHandler()); + classBean.setFieldBeanList(new ArrayList<>()); + } + classBean.setPackageName(packageName); + plantUmlContextBean.getDerivedPlantUmlContextBean().getClassBeanMap().put(newClassName,classBean); + + + } + } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/MqConsumerElementHandler.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/MqConsumerElementHandler.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/MqConsumerElementHandler.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/MqConsumerElementHandler.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/MqHandlerElementHandler.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/MqHandlerElementHandler.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/MqHandlerElementHandler.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/MqHandlerElementHandler.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/MqProducerElementHandler.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/MqProducerElementHandler.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/MqProducerElementHandler.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/MqProducerElementHandler.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/MsgBodyElementHandler.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/MsgBodyElementHandler.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/MsgBodyElementHandler.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/MsgBodyElementHandler.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/RepositoryElementHandler.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/RepositoryElementHandler.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/RepositoryElementHandler.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/RepositoryElementHandler.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/ValueObjectElementHandler.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/ValueObjectElementHandler.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/ValueObjectElementHandler.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/dynamicddd/handler/ValueObjectElementHandler.java diff --git a/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/springboot/SpringBootApiDocWriteServiceImpl.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/springboot/SpringBootApiDocWriteServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..7f463afdb982f1b03b201a4d30182aace8cf9a40 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/springboot/SpringBootApiDocWriteServiceImpl.java @@ -0,0 +1,29 @@ +package com.coderman.codemaker.app.springboot; + +import com.coderman.codemaker.app.CommonWriteService; +import com.coderman.codemaker.app.IWriteFileService; +import com.coderman.codemaker.app.WriteService; +import com.coderman.codemaker.bean.WriteContentBean; +import com.coderman.codemaker.config.AppServiceConfig; +import com.coderman.codemaker.config.ProjectTemplateSpringbootConfig; +import com.coderman.codemaker.service.dberpicture.DBErPictureService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * Description: + * date: 2021/6/22 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +@Component(value = "springBootApiDocWriteService") +public class SpringBootApiDocWriteServiceImpl extends WriteService implements IWriteFileService { + + @Override + public void writeContent(WriteContentBean writeContentBean) { + writeApiDoc(writeContentBean.getContent(),writeContentBean.getHumpClassName()); + } + +} diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/app/springboot/SpringBootWriteServiceImpl.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/springboot/SpringBootWriteServiceImpl.java similarity index 97% rename from codemaker-core/src/main/java/com/coderman/codemaker/app/springboot/SpringBootWriteServiceImpl.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/springboot/SpringBootWriteServiceImpl.java index 2448ddb2af4740988de2c184a02887eaaaafe2c1..0f89daae0a59c92a366eaab94fd156697d438088 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/app/springboot/SpringBootWriteServiceImpl.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/springboot/SpringBootWriteServiceImpl.java @@ -2,10 +2,7 @@ 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; -import com.coderman.codemaker.bean.TableBean; -import com.coderman.codemaker.bean.WriteContentBean; +import com.coderman.codemaker.bean.*; import com.coderman.codemaker.config.AppServiceConfig; import com.coderman.codemaker.config.ProjectTemplateSpringbootConfig; import com.coderman.codemaker.enums.TemplateFileEnum; @@ -158,12 +155,12 @@ public class SpringBootWriteServiceImpl extends WriteService implements IWriteFi writeTest(writeContentBean.getContent(), writeContentBean.getHumpClassName()); } - //指定服务类 or 工具类 + /* //指定服务类 or 工具类 if(writeContentBean.getTemplateName().equals(TemplateFileEnum.SPRING_APPLICATION_CONTEXT.getTempFileName())){ commonWriteService.writeSpringApplicationContext(writeContentBean.getContent(),projectTemplateConfig.getOutPath()); - } + }*/ - //指定服务类 or 工具类 + /* //指定服务类 or 工具类 if(writeContentBean.getTemplateName().equals(TemplateFileEnum.BASE_CONTROLLER.getTempFileName())){ writeBaseController(writeContentBean.getContent()); } @@ -181,7 +178,7 @@ public class SpringBootWriteServiceImpl extends WriteService implements IWriteFi 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())){ @@ -268,6 +265,12 @@ public class SpringBootWriteServiceImpl extends WriteService implements IWriteFi } } + //写domain.repository + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.REPOSITORY.getTempFileName())){ + classContentBean.setChildPackageName("domain.repository"); + writeRoute(classContentBean); + } + //写domain.gataway.impl if(writeContentBean.getTemplateName().equals(TemplateFileEnum.GATAWAY_IMPL.getTempFileName())){ classContentBean.setChildPackageName("gataway.impl"); @@ -382,6 +385,13 @@ public class SpringBootWriteServiceImpl extends WriteService implements IWriteFi } } + //写infrast.cache + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.CACHE.getTempFileName())){ + classContentBean.setChildPackageName("infrast.cache"); + writeRoute(classContentBean); + } + + //写infras.mq.consumer if(writeContentBean.getTemplateName().equals(TemplateFileEnum.MQ_CONSUMER.getTempFileName())){ classContentBean.setChildPackageName("infrast.mq.consumer"); @@ -426,6 +436,11 @@ public class SpringBootWriteServiceImpl extends WriteService implements IWriteFi classContentBean.setChildPackageName("infrast.dao.mapper"); writeRoute(classContentBean); } + + //写自定义工具类 + if(writeContentBean.getTemplateName().equals(GlobalConstant.SINGLE_CLASS_COMMON)){ + writeRoute(classContentBean); + } } /** diff --git a/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/springcloud/SCFeignApiDocWriteServiceImpl.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/springcloud/SCFeignApiDocWriteServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..babb26fc5627b6f14612d30d89c746cf5d68a908 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/springcloud/SCFeignApiDocWriteServiceImpl.java @@ -0,0 +1,23 @@ +package com.coderman.codemaker.app.springcloud; + +import com.coderman.codemaker.app.IWriteFileService; +import com.coderman.codemaker.app.WriteService; +import com.coderman.codemaker.bean.WriteContentBean; +import org.springframework.stereotype.Component; + +/** + * Description: + * date: 2021/11/29 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +@Component(value = "sCFeignApiDocWriteService") +public class SCFeignApiDocWriteServiceImpl extends WriteService implements IWriteFileService { + + @Override + public void writeContent(WriteContentBean writeContentBean) { + writeApiDoc(writeContentBean.getContent(),writeContentBean.getHumpClassName()); + } +} diff --git a/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/springcloud/SCFeignApiWriteServiceImpl.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/springcloud/SCFeignApiWriteServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..277c1801b6fed5522df3b583ea8c97c272a9b3f1 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/springcloud/SCFeignApiWriteServiceImpl.java @@ -0,0 +1,116 @@ +package com.coderman.codemaker.app.springcloud; + +import com.coderman.codemaker.app.CommonWriteService; +import com.coderman.codemaker.app.IWriteFileService; +import com.coderman.codemaker.app.WriteService; +import com.coderman.codemaker.bean.ClassContentBean; +import com.coderman.codemaker.bean.GlobalConstant; +import com.coderman.codemaker.bean.WriteContentBean; +import com.coderman.codemaker.config.AppServiceConfig; +import com.coderman.codemaker.config.ProjectTemplateSpringCloudConfig; +import com.coderman.codemaker.enums.TemplateFileEnum; +import com.coderman.codemaker.service.dberpicture.DBErPictureService; +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; + +/** + * Description: + * date: 2021/11/29 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ + +@Component(value = "sCFeignApiWriteService") +public class SCFeignApiWriteServiceImpl extends WriteService implements IWriteFileService { + @Autowired + private ProjectTemplateSpringCloudConfig projectTemplateSpringCloudConfig; + + + @Autowired + private AppServiceConfig appServiceConfig; + + @Autowired + private DBErPictureService erPictureService; + + + @Autowired + private CommonWriteService commonWriteService; + + @Override + public void writeContent(WriteContentBean writeContentBean) { + ClassContentBean classContentBean = writeContentBean.buildClassContentBean(projectTemplateSpringCloudConfig.getModuleFeginApiPath()); + //写api.dto-ddd + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.DTO_DDD.getTempFileName())){ + classContentBean.setChildPackageName("api.dto"); + classContentBean.setClassSuffix("DTO.java"); + //走默认的包生成方式 + if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ + writeClassFile(classContentBean); + }else { + //走文档里的package包生成方式 + writeClassFileV2(classContentBean); + } + } + //写api.dto + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.DTO.getTempFileName())){ + classContentBean.setChildPackageName("dto"); + classContentBean.setClassSuffix("DTO.java"); + writeDTO(classContentBean); + } + + + //写feign + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.FEIGN.getTempFileName())){ + classContentBean.setHumpClassName(writeContentBean.getHumpClassName().toLowerCase().endsWith("feign") ? writeContentBean.getHumpClassName() : writeContentBean.getHumpClassName()+"Feign"); + classContentBean.setChildPackageName("api.feign"); + classContentBean.setClassSuffix("Feign.java"); + writeRoute(classContentBean); + } + //写domain.enum + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.ENUM.getTempFileName())){ + classContentBean.setChildPackageName("domain.enums"); + writeRoute(classContentBean); + } + + //写自定义工具类 + if(writeContentBean.getTemplateName().equals(GlobalConstant.SINGLE_CLASS_COMMON)){ + writeRoute(classContentBean); + } + + } + + /** + * 写dto文件 + * @param classContentBean + */ + public void writeDTO(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(); + } + } + + /** + * @param childPackageName 最后一级子包名称 + * @param humpClassName 驼峰式类名 + * @param classSuffix 文件后缀 egg：DTO.java + * @return + */ + private String getFilePath(String childPackageName, String humpClassName, String classSuffix) { + String packageName = appServiceConfig.getPackage(); + String packagePath = packageName.replace(".", "/") ; + packagePath = Constant.JAVA + "/" + packagePath + "/" + childPackageName; + String fileName = humpClassName + classSuffix; + return projectTemplateSpringCloudConfig.getModuleFeginApiPath() + packagePath + "/" + fileName; + } +} diff --git a/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/springcloud/SCFeignProviderWriteServiceImpl.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/springcloud/SCFeignProviderWriteServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..c813d265f4c21546d989b7d233ab9378bcce3b37 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/app/springcloud/SCFeignProviderWriteServiceImpl.java @@ -0,0 +1,751 @@ +package com.coderman.codemaker.app.springcloud; + +import com.coderman.codemaker.app.CommonWriteService; +import com.coderman.codemaker.app.IWriteFileService; +import com.coderman.codemaker.app.WriteService; +import com.coderman.codemaker.bean.*; +import com.coderman.codemaker.config.AppServiceConfig; +import com.coderman.codemaker.config.ProjectTemplateSpringCloudConfig; +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; +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.ArrayList; +import java.util.List; +import java.util.Map; + +/** + * Description: + * date: 2021/11/29 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +@Component(value = "sCFeignProviderWriteService") +public class SCFeignProviderWriteServiceImpl extends WriteService implements IWriteFileService { + @Autowired + private ProjectTemplateSpringCloudConfig projectTemplateSpringCloudConfig; + + + @Autowired + private AppServiceConfig appServiceConfig; + + @Autowired + private DBErPictureService erPictureService; + + + @Autowired + private CommonWriteService commonWriteService; + + + @Override + public void writeContent(WriteContentBean writeContentBean) { + + ClassContentBean classContentBean = writeContentBean.buildClassContentBean(projectTemplateSpringCloudConfig.getModuleFeginProviderPath()); + + //写entity class + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.ENTITY.getTempFileName())){ + classContentBean.setChildPackageName("entity"); + classContentBean.setClassSuffix("Entity.java"); + writeClassFile(classContentBean); + } + + //写do class + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.DATA_OBJECT.getTempFileName())){ + classContentBean.setChildPackageName("infrast.dao.dataobject"); + classContentBean.setClassSuffix("DO.java"); + // writeDO(classContentBean); + writeClassFile(classContentBean); + } + //写mapper class + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.MAPPER.getTempFileName())){ + classContentBean.setChildPackageName("dao.mapper"); + classContentBean.setClassSuffix("Mapper.java"); + writeClassFile(classContentBean); + } + + //写mapper.xml + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.MAPPER_XML.getTempFileName())){ + writeMapperXml(writeContentBean.getContent(), writeContentBean.getHumpClassName()); + } + + //写vo + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.VO.getTempFileName())){ + classContentBean.setChildPackageName("vo"); + classContentBean.setClassSuffix("VO.java"); + writeClassFile(classContentBean); + } + + //写vo-ddd + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.VO_DDD.getTempFileName())){ + classContentBean.setChildPackageName("adapter.vo"); + classContentBean.setClassSuffix("VO.java"); + //走默认的包生成方式 + if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ + writeClassFile(classContentBean); + }else { + //走文档里的package包生成方式 + writeClassFileV2(classContentBean); + } + } + + + //写service + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.SERVICE.getTempFileName())){ + classContentBean.setChildPackageName("service"); + classContentBean.setClassSuffix("Service.java"); + writeClassFile(classContentBean); + } + + //写serviceImpl + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.SERVICE_IMPL.getTempFileName())){ + classContentBean.setChildPackageName("service.impl"); + classContentBean.setClassSuffix("ServiceImpl.java"); + writeClassFile(classContentBean); + } + + //写controller + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.CONTROLLER.getTempFileName())){ + classContentBean.setChildPackageName("controller"); + classContentBean.setClassSuffix("Controller.java"); + writeClassFile(classContentBean); + } + + //写controller-ddd + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.CONTROLLER_DDD.getTempFileName())){ + classContentBean.setChildPackageName("adapter.controller"); + classContentBean.setClassSuffix("Controller.java"); + //走默认的包生成方式 + if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ + writeClassFile(classContentBean); + }else { + //走文档里的package包生成方式 + writeClassFileV2(classContentBean); + } + } + + //写test + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.TEST.getTempFileName())){ + writeTest(writeContentBean.getContent(), writeContentBean.getHumpClassName()); + } + + //指定服务类 or 工具类 + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.SPRING_APPLICATION_CONTEXT.getTempFileName())){ + commonWriteService.writeSpringApplicationContext(writeContentBean.getContent(),projectTemplateSpringCloudConfig.getModuleFeginProviderPath()); + } + + //指定服务类 or 工具类 + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.BASE_CONTROLLER.getTempFileName())){ + writeBaseController(writeContentBean.getContent()); + } + + //指定服务类 or 工具类 + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.APPLICATION.getTempFileName())){ + writeApplication(writeContentBean.getContent()); + } + //指定服务类 or 工具类 + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.APP_EVENT_PUBLISHER.getTempFileName())){ + commonWriteService.writeAppEventPublisher(writeContentBean.getContent(),projectTemplateSpringCloudConfig.getModuleFeginProviderPath()); + } + + //写BaseEvent + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.APP_EVENT_PUBLISHER.getTempFileName())){ + commonWriteService.writeBaseEvent(writeContentBean.getContent(),projectTemplateSpringCloudConfig.getModuleFeginProviderPath()); + } + + + //写model.bo + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.BUSINESS_OBJECT.getTempFileName())){ + classContentBean.setChildPackageName("bo"); + classContentBean.setClassSuffix("BO.java"); + writeClassFile(classContentBean); + } + //写domain.bo-ddd + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.BUSINESS_OBJECT_DDD.getTempFileName())){ + classContentBean.setChildPackageName("domain.bo"); + //走默认的包生成方式 + if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ + writeClassFile(classContentBean); + }else { + //走文档里的package包生成方式 + writeClassFileV2(classContentBean); + } + } + + //写convert + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.CONVERT.getTempFileName())){ + writeClassFileV2(classContentBean); + } + //写domain.enum + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.ENUM.getTempFileName())){ + classContentBean.setChildPackageName("domain.enums"); + //走默认的包生成方式 + if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ + writeClassFile(classContentBean); + }else { + //走文档里的package包生成方式 + writeClassFileV2(classContentBean); + } + } + + //写domain.valueobject + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.VALUE_OBJECT.getTempFileName())){ + classContentBean.setChildPackageName("domain.valueobject"); + //走默认的包生成方式 + if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ + writeClassFile(classContentBean); + }else { + //走文档里的package包生成方式 + writeClassFileV2(classContentBean); + } + } + + //写domain.event + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.EVENT_BODY.getTempFileName())){ + classContentBean.setChildPackageName("domain.event"); + //走默认的包生成方式 + if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ + writeClassFile(classContentBean); + }else { + //走文档里的package包生成方式 + writeClassFileV2(classContentBean); + } + + } + + + //写domain.msgbody + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.MESSAGE_BODY.getTempFileName())){ + classContentBean.setChildPackageName("domain.msgbody"); + //走默认的包生成方式 + if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ + writeClassFile(classContentBean); + }else { + //走文档里的package包生成方式 + writeClassFileV2(classContentBean); + } + + } + + //写domain.gataway + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.GATAWAY.getTempFileName())){ + classContentBean.setChildPackageName("domain.gataway"); + //走默认的包生成方式 + if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ + writeClassFile(classContentBean); + }else { + //走文档里的package包生成方式 + writeClassFileV2(classContentBean); + } + } + + //写domain.repository + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.REPOSITORY.getTempFileName())){ + classContentBean.setChildPackageName("domain.repository"); + writeRoute(classContentBean); + } + + //写domain.gataway.impl + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.GATAWAY_IMPL.getTempFileName())){ + classContentBean.setChildPackageName("gataway.impl"); + //走默认的包生成方式 + 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())){ + if(writeContentBean.getHumpClassName().toLowerCase().contains(TemplateFileEnum.ACL.getTempFileName())){ + classContentBean.setChildPackageName("infrast.acl"); + }else { + classContentBean.setChildPackageName("infrast.adapter"); + } + //走默认的包生成方式 + if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ + writeClassFile(classContentBean); + }else { + //走文档里的package包生成方式 + writeClassFileV2(classContentBean); + } + } + //写infrast.acl.impl + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.ACL_IMPL.getTempFileName())){ + if(writeContentBean.getHumpClassName().toLowerCase().contains(TemplateFileEnum.ACL.getTempFileName())){ + classContentBean.setChildPackageName("infrast.acl.impl"); + }else { + classContentBean.setChildPackageName("infrast.adapter.impl"); + } + + //走默认的包生成方式 + if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ + writeClassFile(classContentBean); + }else { + //走文档里的package包生成方式 + writeClassFileV2(classContentBean); + } + } + + //写acl.param + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.ACL_PARAM.getTempFileName())){ + writeClassFileV2(classContentBean); + } + + //写app.cmd + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.CMD.getTempFileName())){ + classContentBean.setChildPackageName("app.command"); + //走默认的包生成方式 + if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ + writeClassFile(classContentBean); + }else { + //走文档里的package包生成方式 + writeClassFileV2(classContentBean); + } + } + //写app.exe + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.EXE.getTempFileName())){ + classContentBean.setChildPackageName("app.executor"); + //走默认的包生成方式 + if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ + writeClassFile(classContentBean); + }else { + //走文档里的package包生成方式 + writeClassFileV2(classContentBean); + } + } + + //写domain.factory + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.FACTORY.getTempFileName())){ + classContentBean.setChildPackageName("domain.factory"); + + //走默认的包生成方式 + if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ + writeClassFile(classContentBean); + }else { + //走文档里的package包生成方式 + writeClassFileV2(classContentBean); + } + } + + + //写app.listener + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.MQ_LISTENER.getTempFileName())){ + classContentBean.setChildPackageName("app.listener"); + //走默认的包生成方式 + if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ + writeClassFile(classContentBean); + }else { + //走文档里的package包生成方式 + writeClassFileV2(classContentBean); + } + } + + //写infrast.cache + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.CACHE.getTempFileName())){ + classContentBean.setChildPackageName("infrast.cache"); + writeRoute(classContentBean); + } + + + //写infras.mq.consumer + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.MQ_CONSUMER.getTempFileName())){ + classContentBean.setChildPackageName("infrast.mq.consumer"); + //走默认的包生成方式 + 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.setChildPackageName("infrast.mq.handler"); + //走默认的包生成方式 + if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ + writeClassFile(classContentBean); + }else { + classContentBean.setClassPackageName(appServiceConfig.getPackage()+".infrast.mq.handler"); + //走文档里的package包生成方式 + writeClassFileV2(classContentBean); + } + } + + //写infras.mq.producer + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.MQ_PRODUCER.getTempFileName())){ + classContentBean.setChildPackageName("infrast.mq.producer"); + //走默认的包生成方式 + if(StringUtils.isEmpty(classContentBean.getClassPackageName())){ + writeClassFile(classContentBean); + }else { + //走文档里的package包生成方式 + classContentBean.setClassPackageName(appServiceConfig.getPackage()+".infrast.mq.producer"); + writeClassFileV2(classContentBean); + } + } + + //写infrast.dao.mapper + if(writeContentBean.getTemplateName().equals(TemplateFileEnum.MAPPER_DDD.getTempFileName())){ + classContentBean.setChildPackageName("infrast.dao.mapper"); + writeRoute(classContentBean); + } + + //写自定义工具类 + if(writeContentBean.getTemplateName().equals(GlobalConstant.SINGLE_CLASS_COMMON)){ + writeRoute(classContentBean); + } + } + + /** + * 写mapper xml文件 + * + * @param content + * @param humpClassName + */ + public void writeMapperXml(String content, String humpClassName) { + String fileName = humpClassName + "Mapper.xml"; + String filePath = projectTemplateSpringCloudConfig.getModuleFeginProviderPath() + Constant.MAPPER + "/" + fileName; + try { + FileUtils.write(new File(filePath), content, "UTF-8"); + } catch (IOException e) { + e.printStackTrace(); + } + } + + /** + * 写entity文件 + * + * @param content + * @param humpClassName + */ + public void writeEntity(String content, String humpClassName) { + String packageName = appServiceConfig.getPackage(); + String packagePath = packageName.replace(".", "/"); + String filePath = Constant.JAVA + "/" + packagePath + "/entity"; + String fileName = humpClassName + "Entity.java"; + filePath = projectTemplateSpringCloudConfig.getModuleFeginProviderPath() + filePath + "/" + fileName; + try { + FileUtils.write(new File(filePath), content, "UTF-8"); + } catch (IOException e) { + e.printStackTrace(); + } + } + + + /** + * 写entity文件 + * + * @param content + * @param humpClassName + */ + public void writeVO(String content, String humpClassName) { + String packageName = appServiceConfig.getPackage(); + String packagePath = packageName.replace(".", "/"); + String filePath = Constant.JAVA + "/" + packagePath + "/vo"; + String fileName = humpClassName + "VO.java"; + filePath = projectTemplateSpringCloudConfig.getModuleFeginProviderPath() + filePath + "/" + fileName; + try { + FileUtils.write(new File(filePath), content, "UTF-8"); + } catch (IOException e) { + e.printStackTrace(); + } + } + + + /** + * 写mapper class文件 + * + * @param content + * @param humpClassName + */ + public void writeMapper(String content, String humpClassName) { + String packageName = appServiceConfig.getPackage(); + String packagePath = packageName.replace(".", "/"); + String filePath = Constant.JAVA + "/" + packagePath + "/mapper"; + String fileName = humpClassName + "Mapper.java"; + filePath = projectTemplateSpringCloudConfig.getModuleFeginProviderPath() + filePath + "/" + fileName; + try { + FileUtils.write(new File(filePath), content, "UTF-8"); + } catch (IOException e) { + e.printStackTrace(); + } + } + + /** + * 写service文件 + * + * @param content + * @param humpClassName + */ + public void writeService(String content, String humpClassName) { + String packageName = appServiceConfig.getPackage(); + String packagePath = packageName.replace(".", "/"); + String filePath = Constant.JAVA + "/" + packagePath + "/service"; + String fileName = humpClassName + "Service.java"; + filePath = projectTemplateSpringCloudConfig.getModuleFeginProviderPath() + filePath + "/" + fileName; + try { + FileUtils.write(new File(filePath), content, "UTF-8"); + } catch (IOException e) { + e.printStackTrace(); + } + } + + /** + * 写serviceImpl文件 + * + * @param content + * @param humpClassName + */ + public void writeServiceImpl(String content, String humpClassName) { + String packageName = appServiceConfig.getPackage(); + String packagePath = packageName.replace(".", "/"); + String filePath = Constant.JAVA + "/" + packagePath + "/service/impl"; + String fileName = humpClassName + "ServiceImpl.java"; + filePath = projectTemplateSpringCloudConfig.getModuleFeginProviderPath() + 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 packageName = appServiceConfig.getPackage(); + String packagePath = packageName.replace(".", "/"); + String filePath = Constant.JAVA + "/" + packagePath + "/controller"; + String fileName = "BaseController.java"; + filePath = projectTemplateSpringCloudConfig.getModuleFeginProviderPath() + filePath + "/" + fileName; + try { + FileUtils.write(new File(filePath), content, "UTF-8"); + } catch (IOException e) { + e.printStackTrace(); + } + } + + /** + * 写测试文件 + * + * @param content + */ + public void writeTest(String content, String humpClassName) { + String packageName = appServiceConfig.getPackage(); + String packagePath = packageName.replace(".", "/"); + String filePath = Constant.TEST_JAVA + "/" + packagePath + "/service/test"; + String fileName = humpClassName + "ServiceTest.java"; + filePath = projectTemplateSpringCloudConfig.getModuleFeginProviderPath() + filePath + "/" + fileName; + try { + FileUtils.write(new File(filePath), content, "UTF-8"); + } catch (IOException e) { + e.printStackTrace(); + } + } + + /** + * 写应用启动类 + * + * @param content + */ + public void writeApplication(String content) { + String packageName = appServiceConfig.getPackage(); + String packagePath = packageName.replace(".", "/"); + String filePath = Constant.JAVA + "/" + packagePath + ""; + String fileName = "Application.java"; + filePath = projectTemplateSpringCloudConfig.getModuleFeginProviderPath() + filePath + "/" + fileName; + try { + FileUtils.write(new File(filePath), content, "UTF-8"); + } catch (IOException e) { + e.printStackTrace(); + } + } + + + /** + * 写controller文件 + * + * @param content + * @param humpClassName + */ + public void writeController(String content, String humpClassName) { + String packageName = appServiceConfig.getPackage(); + String packagePath = packageName.replace(".", "/"); + String filePath = Constant.JAVA + "/" + packagePath + "/controller"; + String fileName = humpClassName + "Controller.java"; + filePath = projectTemplateSpringCloudConfig.getModuleFeginProviderPath() + filePath + "/" + fileName; + try { + FileUtils.write(new File(filePath), content, "UTF-8"); + } catch (IOException e) { + e.printStackTrace(); + } + } + + /** + * 一次性生成单表需要的所有模块代码 + * + * @param humpClassName + * @param varMap + */ + public void writeAll(String humpClassName, Map varMap, String fast) { + String entityContent = FreemarkerUtils.parseTpl(fast+ TemplateFileEnum.ENTITY.getTempFileName(), varMap); + this.writeEntity(entityContent, humpClassName); + + String serviceContent = FreemarkerUtils.parseTpl(fast+ TemplateFileEnum.SERVICE.getTempFileName(), varMap); + this.writeService(serviceContent, humpClassName); + + String serviceImplContent = FreemarkerUtils.parseTpl(fast+ TemplateFileEnum.SERVICE_IMPL.getTempFileName(), varMap); + this.writeServiceImpl(serviceImplContent, humpClassName); + + String mapperXmlContent = FreemarkerUtils.parseTpl(fast+ TemplateFileEnum.MAPPER_XML.getTempFileName(), varMap); + this.writeMapperXml(mapperXmlContent, humpClassName); + + String mapperContent = FreemarkerUtils.parseTpl(fast+ TemplateFileEnum.MAPPER.getTempFileName(), varMap); + this.writeMapper(mapperContent, humpClassName); + + String controllerContent = FreemarkerUtils.parseTpl(fast+ TemplateFileEnum.CONTROLLER.getTempFileName(), varMap); + this.writeController(controllerContent, humpClassName); + + String voContent = FreemarkerUtils.parseTpl(fast+ TemplateFileEnum.VO.getTempFileName(), varMap); + this.writeVO(voContent, humpClassName); + + String testContent = FreemarkerUtils.parseTpl(fast+ TemplateFileEnum.TEST.getTempFileName(), varMap); + this.writeTest(testContent, humpClassName); + + + } + + /** + * 写公共基础服务类 + * + * @param varMap + */ + public void writeCommon(Map varMap, String fast) { + String baseControllerContent = FreemarkerUtils.parseTpl(fast+ TemplateFileEnum.BASE_CONTROLLER.getTempFileName(), varMap); + this.writeBaseController(baseControllerContent); + + String SpringApplicationContextContent = FreemarkerUtils.parseTpl(fast+ TemplateFileEnum.SPRING_APPLICATION_CONTEXT.getTempFileName(), varMap); + commonWriteService.writeSpringApplicationContext(SpringApplicationContextContent,projectTemplateSpringCloudConfig.getModuleFeginProviderPath()); + + String application = FreemarkerUtils.parseTpl(fast+ TemplateFileEnum.APPLICATION.getTempFileName(), varMap); + this.writeApplication(application); + + } + + /** + * 整合e-r图生成工具 + * + * @param tableBeanMap + * @param columnBeanListMap + */ + public void writeERPicture(Map tableBeanMap, Map> columnBeanListMap) { + String filePath = projectTemplateSpringCloudConfig.getModuleFeginProviderPath() + Constant.ER_PICTURE + "/" + projectTemplateSpringCloudConfig.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); + } + + + /** + * 写class文件 + * @param classContentBean + */ + public void writeClassFile(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(); + } + } + + /** + * @param childPackageName 最后一级子包名称 + * @param humpClassName 驼峰式类名 + * @param classSuffix 文件后缀 egg：DTO.java + * @return + */ + private String getFilePath(String childPackageName, String humpClassName, String classSuffix) { + String packageName = appServiceConfig.getPackage(); + String packagePath = packageName.replace(".", "/") ; + packagePath = Constant.JAVA + "/" + packagePath + "/" + childPackageName; + String fileName = humpClassName + classSuffix; + return projectTemplateSpringCloudConfig.getModuleFeginProviderPath() + packagePath + "/" + fileName; + } + + /** + * 写DO文件 + * @param classContentBean + */ + public void writeDO(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(); + } + } + + /** + * 写dto文件 + * @param classContentBean + */ + public void writeDTO(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(); + } + } +} diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/config/AppServiceConfig.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/config/AppServiceConfig.java similarity index 35% rename from codemaker-core/src/main/java/com/coderman/codemaker/config/AppServiceConfig.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/config/AppServiceConfig.java index 72787029aa9ca3351b5b8c61b8c350b102e187c9..6f58621184825d849c8e6a4c7f30a3f1d196f530 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/config/AppServiceConfig.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/config/AppServiceConfig.java @@ -2,13 +2,17 @@ package com.coderman.codemaker.config; +import com.coderman.codemaker.api.ICompDecorateService; +import com.coderman.codemaker.api.ICompScanService; import com.coderman.codemaker.app.AppService; import com.coderman.codemaker.enums.ModuleEnum; import com.coderman.codemaker.exceptions.ConfigException; import com.coderman.codemaker.app.IWriteFileService; -import com.coderman.codemaker.service.adapter.IClazzAdapter; import com.coderman.codemaker.utils.SpringContextHolder; +import com.google.common.collect.Sets; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.assertj.core.util.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -16,6 +20,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import javax.annotation.Resource; +import java.util.*; /** * Description: @@ -41,8 +46,22 @@ public class AppServiceConfig { @Value(value = "${application.global.author}") private String author; - @Value(value = "${application.global.package.adapterbean}") - private String packageAdapterBean; + + @Value(value = "${application.maven.repo.path}") + private String mavenRepoPath; + + /** + * 全局组件 + */ + @Value(value = "${application.component.scan.config}") + private String defaultComponentConfig; + + @Value(value = "${application.component.scan.bean}") + private String defaultComponentScanBean; + + + @Value(value = "${application.component.decorate.bean}") + private String defaultComponentDecorateBean; @Resource(name = "colaAppService") private AppService colaAppService; @@ -53,10 +72,13 @@ public class AppServiceConfig { @Resource(name = "springBootAppService") private AppService springBootAppService; - @Resource(name = "dynamicDDDAppService") private AppService dynamicDDDAppService; + @Resource(name = "springCloudAppService") + private AppService springCloudAppService; + + @Autowired private ProjectTemplateSpringbootConfig projectTemplateSpringbootConfig; @@ -66,6 +88,9 @@ public class AppServiceConfig { @Autowired private ProjectTemplateColaConfig projectTemplateColaConfig; + @Autowired + private ProjectTemplateSpringCloudConfig projectTemplateSpringCloudConfig; + /** * 从应用框架的视角获取应用服务 * @return @@ -84,6 +109,9 @@ public class AppServiceConfig { else if(applicationType.equals(ModuleEnum.COLA_ADAPTER.getAppName())){ return colaAppService; } + else if(applicationType.equals(ModuleEnum.SC_FEIGN_API.getAppName())){ + return springCloudAppService; + } throw new ConfigException("application.type="+applicationType+" not support!"); } @@ -104,6 +132,21 @@ public class AppServiceConfig { return null; } + /** + * 根据模块名称获取模块服务 + * @param moduleName + * @return + */ + public IWriteFileService getWriteServiceByModuleName(String moduleName){ + try { + AppService appService = this.getAppService(); + return appService.getModelAppService(moduleName); + } catch (Exception e) { + logger.error("get WriteFileService impl error.templateName={}",moduleName); + } + return null; + } + /** * 获取dynamicddd代码写服务 * @return @@ -121,6 +164,9 @@ public class AppServiceConfig { String moduleName = null; if(applicationType.equals(ModuleEnum.SPRING_BOOT_WEB.getAppName())){ moduleName = ModuleEnum.SPRING_BOOT_WEB.getTemplateFileSet().contains(templateName) ? ModuleEnum.SPRING_BOOT_WEB.getModuleName() : null; + if(StringUtils.isEmpty(moduleName)){ + moduleName = ModuleEnum.SPRINGBOOT_API_DOC.getTemplateFileSet().contains(templateName) ? ModuleEnum.SPRINGBOOT_API_DOC.getModuleName() : null; + } } else if(applicationType.equals(ModuleEnum.DUBBO_API.getAppName())){ moduleName = ModuleEnum.DUBBO_API.getTemplateFileSet().contains(templateName) ? ModuleEnum.DUBBO_API.getModuleName() : null; @@ -130,6 +176,10 @@ public class AppServiceConfig { if(StringUtils.isEmpty(moduleName)){ moduleName = ModuleEnum.DUBBO_CORE.getTemplateFileSet().contains(templateName) ? ModuleEnum.DUBBO_CORE.getModuleName() : null; } + + if(StringUtils.isEmpty(moduleName)){ + moduleName = ModuleEnum.DUBBO_API_DOC.getTemplateFileSet().contains(templateName) ? ModuleEnum.DUBBO_API_DOC.getModuleName() : null; + } } else if(applicationType.equals(ModuleEnum.COLA_ADAPTER.getAppName())){ moduleName = ModuleEnum.COLA_ADAPTER.getTemplateFileSet().contains(templateName) ? ModuleEnum.COLA_ADAPTER.getModuleName() : null; @@ -145,7 +195,27 @@ public class AppServiceConfig { if(StringUtils.isEmpty(moduleName)){ moduleName = ModuleEnum.COLA_INFRAST.getTemplateFileSet().contains(templateName) ? ModuleEnum.COLA_INFRAST.getModuleName() : null; } + if(StringUtils.isEmpty(moduleName)){ + moduleName = ModuleEnum.COLA_API_DOC.getTemplateFileSet().contains(templateName) ? ModuleEnum.COLA_API_DOC.getModuleName() : null; + } + if(StringUtils.isEmpty(moduleName)){ + moduleName = ModuleEnum.COLA_START.getTemplateFileSet().contains(templateName) ? ModuleEnum.COLA_START.getModuleName() : null; + } + if(StringUtils.isEmpty(moduleName)){ + moduleName = ModuleEnum.COLA_FEIGN_API.getTemplateFileSet().contains(templateName) ? ModuleEnum.COLA_FEIGN_API.getModuleName() : null; + } } + else if(applicationType.equals(ModuleEnum.SC_FEIGN_API.getAppName())){ + moduleName = ModuleEnum.SC_FEIGN_API.getTemplateFileSet().contains(templateName) ? ModuleEnum.SC_FEIGN_API.getModuleName() : null; + if(StringUtils.isEmpty(moduleName)){ + moduleName = ModuleEnum.SC_FEIGN_PROVIDER.getTemplateFileSet().contains(templateName) ? ModuleEnum.SC_FEIGN_PROVIDER.getModuleName() : null; + } + if(StringUtils.isEmpty(moduleName)){ + moduleName = ModuleEnum.SC_API_DOC.getTemplateFileSet().contains(templateName) ? ModuleEnum.SC_API_DOC.getModuleName() : null; + } + } + + if(StringUtils.isEmpty(moduleName)){ logger.error("templatefile:"+templateName+" not in the application:"+applicationType); } @@ -165,6 +235,9 @@ public class AppServiceConfig { return projectTemplateDubboConfig.getDbName(); } else if (applicationType.equals(ModuleEnum.COLA_ADAPTER.getAppName())) { return projectTemplateColaConfig.getDbName(); + + } else if (applicationType.equals(ModuleEnum.SC_FEIGN_API.getAppName())) { + return projectTemplateSpringCloudConfig.getDbName(); } return ""; } @@ -177,6 +250,14 @@ public class AppServiceConfig { return this.packageName; } + public String getMavenRepoPath() { + return mavenRepoPath; + } + + public void setMavenRepoPath(String mavenRepoPath) { + this.mavenRepoPath = mavenRepoPath; + } + /** * 获取配置中的plantUML类图文件名 * @return @@ -188,6 +269,8 @@ public class AppServiceConfig { return projectTemplateDubboConfig.getPlantumlName(); } else if (applicationType.equals(ModuleEnum.COLA_ADAPTER.getAppName())) { return projectTemplateColaConfig.getPlantumlName(); + } else if (applicationType.equals(ModuleEnum.SC_FEIGN_API.getAppName())) { + return projectTemplateSpringCloudConfig.getPlantumlName(); } return ""; } @@ -203,6 +286,8 @@ public class AppServiceConfig { return projectTemplateDubboConfig.getApplicationName(); } else if (applicationType.equals(ModuleEnum.COLA_ADAPTER.getAppName())) { return projectTemplateColaConfig.getApplicationName(); + } else if (applicationType.equals(ModuleEnum.SC_FEIGN_API.getAppName())) { + return projectTemplateSpringCloudConfig.getApplicationName(); } return ""; } @@ -218,17 +303,285 @@ public class AppServiceConfig { return projectTemplateDubboConfig.getModuleCommonPath(); } else if (applicationType.equals(ModuleEnum.COLA_ADAPTER.getAppName())) { return projectTemplateColaConfig.getModuleInfrastPath(); + } else if (applicationType.equals(ModuleEnum.SC_FEIGN_API.getAppName())) { + return projectTemplateSpringCloudConfig.getModuleFeginProviderPath(); } return null; } + /** + * 获取不同项目的文档输出路径 + * @return + */ + public String getApiDocOutPath(){ + if (applicationType.equals(ModuleEnum.SPRING_BOOT_WEB.getAppName())) { + return projectTemplateSpringbootConfig.getApiDocPath(); + } else if (applicationType.equals(ModuleEnum.DUBBO_API.getAppName())) { + return projectTemplateDubboConfig.getApiDocPath(); + } else if (applicationType.equals(ModuleEnum.COLA_ADAPTER.getAppName())) { + return projectTemplateColaConfig.getApiDocPath(); + } else if (applicationType.equals(ModuleEnum.SC_FEIGN_API.getAppName())) { + return projectTemplateSpringCloudConfig.getApiDocPath(); + } + return null; + } + + + /** + * 获取配置中的文档生成开关 + * @return + */ + public Boolean getApiDocGenerator() { + if (applicationType.equals(ModuleEnum.SPRING_BOOT_WEB.getAppName())) { + return projectTemplateSpringbootConfig.getApiGenerate(); + } else if (applicationType.equals(ModuleEnum.DUBBO_API.getAppName())) { + return projectTemplateDubboConfig.getApiGenerate(); + } else if (applicationType.equals(ModuleEnum.COLA_ADAPTER.getAppName())) { + return projectTemplateColaConfig.getApiGenerate(); + } else if (applicationType.equals(ModuleEnum.SC_FEIGN_API.getAppName())) { + return projectTemplateSpringCloudConfig.getApiGenerate(); + } + return false; + } + + + + + /** + * 获取配置中的自定义读操作统一语言 + * @return + */ + public Set getReadDslSet() { + String readSence = null; + if (applicationType.equals(ModuleEnum.SPRING_BOOT_WEB.getAppName())) { + readSence = projectTemplateSpringbootConfig.getReadSenceSet(); + + } else if (applicationType.equals(ModuleEnum.DUBBO_API.getAppName())) { + readSence = projectTemplateDubboConfig.getReadSenceSet(); + + } else if (applicationType.equals(ModuleEnum.COLA_ADAPTER.getAppName())) { + readSence = projectTemplateColaConfig.getReadSenceSet(); + }else if (applicationType.equals(ModuleEnum.SC_FEIGN_API.getAppName())) { + readSence = projectTemplateSpringCloudConfig.getReadSenceSet(); + } + if(StringUtils.isEmpty(readSence)){ + return null; + } + return Sets.newHashSet(readSence.split(",")); + } + + + /** + * 获取reuest分子包配置 + * @return + */ + public boolean getRequestAsSubPackage() { + + if (applicationType.equals(ModuleEnum.SPRING_BOOT_WEB.getAppName())) { + return projectTemplateSpringbootConfig.getRequest(); + + } else if (applicationType.equals(ModuleEnum.DUBBO_API.getAppName())) { + return projectTemplateDubboConfig.getRequest(); + + } else if (applicationType.equals(ModuleEnum.COLA_ADAPTER.getAppName())) { + return projectTemplateColaConfig.getRequest(); + } else if (applicationType.equals(ModuleEnum.SC_FEIGN_API.getAppName())) { + return projectTemplateSpringCloudConfig.getRequest(); + } + return false; + } + + + /** + * 获取response分子包配置 + * @return + */ + public boolean getResponseAsSubPackage() { + + if (applicationType.equals(ModuleEnum.SPRING_BOOT_WEB.getAppName())) { + return projectTemplateSpringbootConfig.getResponse(); + + } else if (applicationType.equals(ModuleEnum.DUBBO_API.getAppName())) { + return projectTemplateDubboConfig.getResponse(); + } else if (applicationType.equals(ModuleEnum.COLA_ADAPTER.getAppName())) { + return projectTemplateColaConfig.getResponse(); + } else if (applicationType.equals(ModuleEnum.SC_FEIGN_API.getAppName())) { + return projectTemplateSpringCloudConfig.getResponse(); + } + return false; + } + + + /** + * 获取配置中的自定义写操作统一语言 + * @return + */ + public Set getWriteDslSet() { + String writeSence = null; + if (applicationType.equals(ModuleEnum.SPRING_BOOT_WEB.getAppName())) { + writeSence = projectTemplateSpringbootConfig.getWriteSenceSet(); + + } else if (applicationType.equals(ModuleEnum.DUBBO_API.getAppName())) { + writeSence = projectTemplateDubboConfig.getWriteSenceSet(); + + } else if (applicationType.equals(ModuleEnum.COLA_ADAPTER.getAppName())) { + writeSence = projectTemplateColaConfig.getWriteSenceSet(); + } else if (applicationType.equals(ModuleEnum.SC_FEIGN_API.getAppName())) { + writeSence = projectTemplateSpringCloudConfig.getWriteSenceSet(); + } + if(StringUtils.isEmpty(writeSence)){ + return null; + } + return Sets.newHashSet(writeSence.split(",")); + } + + + + /** * 获取定制化的packageAdapter适配器 * @return */ - public IClazzAdapter getPackageAdapterBean(){ + /*public IClazzAdapter getPackageAdapterBean(){ return SpringContextHolder.getBean(this.packageAdapterBean,IClazzAdapter.class); + }*/ + + /** + * 获取项目自定义的需要注入的组件列表 + * @return + */ + public List getCustomComponentList(){ + String componentList = null; + if (applicationType.equals(ModuleEnum.SPRING_BOOT_WEB.getAppName())) { + componentList = projectTemplateSpringbootConfig.getComponentList(); + } else if (applicationType.equals(ModuleEnum.DUBBO_API.getAppName())) { + componentList = projectTemplateDubboConfig.getComponentList(); + } else if (applicationType.equals(ModuleEnum.COLA_ADAPTER.getAppName())) { + componentList = projectTemplateColaConfig.getComponentList(); + } else if (applicationType.equals(ModuleEnum.SC_FEIGN_API.getAppName())) { + componentList = projectTemplateSpringCloudConfig.getComponentList(); + } + if(StringUtils.isEmpty(componentList)){ + return null; + } + return Lists.newArrayList(componentList.split(",")); } + /** + * 获取需要初始化到项目里的工具类组件 + * @return + */ + public Map> getInitClassMapList(){ + + String initClazz = null; + if (applicationType.equals(ModuleEnum.SPRING_BOOT_WEB.getAppName())) { + initClazz = projectTemplateSpringbootConfig.getInitClazz(); + } else if (applicationType.equals(ModuleEnum.DUBBO_API.getAppName())) { + initClazz = projectTemplateDubboConfig.getInitClazz(); + } else if (applicationType.equals(ModuleEnum.COLA_ADAPTER.getAppName())) { + initClazz = projectTemplateColaConfig.getInitClazz(); + } else if (applicationType.equals(ModuleEnum.SC_FEIGN_API.getAppName())) { + initClazz = projectTemplateSpringCloudConfig.getInitClazz(); + } + + if(StringUtils.isEmpty(initClazz)){ + return null; + } + + String [] array = initClazz.split(","); + Map> initClassMap = new HashMap<>(); + for (String clazz : array){ + String [] kvArr = clazz.trim().split(":"); + String className = kvArr[0]; + String moduleName = applicationType + "-" + kvArr[1]; + List classList = initClassMap.get(moduleName); + if (CollectionUtils.isEmpty(classList)){ + classList = new ArrayList<>(); + } + classList.add(className); + initClassMap.put(moduleName, classList); + } + return initClassMap; + } + + + + /** + * 获取配置的组件扫描bean + * @return + */ + public List getCustomICompScanServiceList(){ + String componentScanBeanStr = null; + if (applicationType.equals(ModuleEnum.SPRING_BOOT_WEB.getAppName())) { + componentScanBeanStr = projectTemplateSpringbootConfig.getComponentScanBeans(); + } else if (applicationType.equals(ModuleEnum.DUBBO_API.getAppName())) { + componentScanBeanStr = projectTemplateDubboConfig.getComponentScanBeans(); + } else if (applicationType.equals(ModuleEnum.COLA_ADAPTER.getAppName())) { + componentScanBeanStr = projectTemplateColaConfig.getComponentScanBeans(); + } else if (applicationType.equals(ModuleEnum.SC_FEIGN_API.getAppName())) { + componentScanBeanStr = projectTemplateSpringCloudConfig.getComponentScanBeans(); + } + if(StringUtils.isEmpty(componentScanBeanStr)){ + return null; + } + List componentScanBeanList = Lists.newArrayList(componentScanBeanStr.split(",")); + List compScanServiceList = new ArrayList<>(); + + for (String scanBeanName : componentScanBeanList){ + compScanServiceList.add(SpringContextHolder.getBean(scanBeanName,ICompScanService.class)); + } + return compScanServiceList; + } + + /** + * 获取配置的组件装饰bean + * @return + */ + public List getCustomICompDecorateServiceList(){ + String componentDecorateBeanStr = null; + if (applicationType.equals(ModuleEnum.SPRING_BOOT_WEB.getAppName())) { + componentDecorateBeanStr = projectTemplateSpringbootConfig.getComponentDecorateBeans(); + } else if (applicationType.equals(ModuleEnum.DUBBO_API.getAppName())) { + componentDecorateBeanStr = projectTemplateDubboConfig.getComponentDecorateBeans(); + } else if (applicationType.equals(ModuleEnum.COLA_ADAPTER.getAppName())) { + componentDecorateBeanStr = projectTemplateColaConfig.getComponentDecorateBeans(); + } else if (applicationType.equals(ModuleEnum.SC_FEIGN_API.getAppName())) { + componentDecorateBeanStr = projectTemplateSpringCloudConfig.getComponentDecorateBeans(); + } + if(StringUtils.isEmpty(componentDecorateBeanStr)){ + return null; + } + List componentDecorateBeanList = Lists.newArrayList(componentDecorateBeanStr.split(",")); + List compDecorateServiceList = new ArrayList<>(); + + for (String decorateBeanName : componentDecorateBeanList){ + compDecorateServiceList.add(SpringContextHolder.getBean(decorateBeanName,ICompDecorateService.class)); + } + return compDecorateServiceList; + } + + /** + * 获取全局组件 + * @return + */ + public List getDefaultComponentList(){ + return Lists.newArrayList(this.defaultComponentConfig.split(",")); + } + + /** + * 获取默认的框架级全局组件扫描服务 + * @return + */ + public ICompScanService getDefaultCompScanService(){ + return SpringContextHolder.getBean(this.defaultComponentScanBean,ICompScanService.class); + } + + /** + * 获取默认的框架级全局组件装饰服务 + * @return + */ + public ICompDecorateService getDefaultCompDecorateService(){ + return SpringContextHolder.getBean(this.defaultComponentDecorateBean,ICompDecorateService.class); + } } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/config/DefaultPackageConfig.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/config/DefaultPackageConfig.java similarity index 85% rename from codemaker-core/src/main/java/com/coderman/codemaker/config/DefaultPackageConfig.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/config/DefaultPackageConfig.java index 39a5ccf549226f83b8a8214340eea72ee64027b0..6e37197c9a81b70abf3852a449b68a391ebc17a3 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/config/DefaultPackageConfig.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/config/DefaultPackageConfig.java @@ -1,6 +1,7 @@ package com.coderman.codemaker.config; import com.coderman.codemaker.service.adapter.PackgeConstants; +import com.coderman.codemaker.service.packageimport.PackageImportService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -20,7 +21,7 @@ public class DefaultPackageConfig { private static Map defaultPackageMap = new HashMap<>(); @Autowired - private AppServiceConfig appServiceConfig; + private PackageImportService packageImportService; /** @@ -30,7 +31,7 @@ public class DefaultPackageConfig { public synchronized void addAdapterPackages(){ if(defaultPackageMap.isEmpty()){ defaultPackageMap.putAll(PackgeConstants.getDefaultPackageMap()); - defaultPackageMap.putAll(appServiceConfig.getPackageAdapterBean().getClazzWrapper()); + defaultPackageMap.putAll(packageImportService.getSystemImportPackageConfig()); } } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/config/ProjectTemplateColaConfig.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/config/ProjectTemplateColaConfig.java similarity index 46% rename from codemaker-core/src/main/java/com/coderman/codemaker/config/ProjectTemplateColaConfig.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/config/ProjectTemplateColaConfig.java index bb4f82c11442fd9b883f1b856d8f9028c2b684fb..5c672d9dd351d82263171272943bcbec3cbfca18 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/config/ProjectTemplateColaConfig.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/config/ProjectTemplateColaConfig.java @@ -1,5 +1,6 @@ package com.coderman.codemaker.config; +import com.coderman.codemaker.bean.GlobalConstant; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; @@ -16,7 +17,7 @@ import org.springframework.stereotype.Component; */ @Configuration @Component -@PropertySource( "classpath:projecttemplate-cola.properties") +@PropertySource("classpath:projecttemplate-cola.properties") public class ProjectTemplateColaConfig { /** @@ -60,12 +61,117 @@ public class ProjectTemplateColaConfig { @Value(value = "${cola.code.outpath.cola-domain}") private String moduleDomainPath; + /** + * cola-start模块地址 + */ + @Value(value = "${cola.code.outpath.cola-start}") + private String moduleStartPath; + + + /** + * cola-feign-api模块地址 + */ + @Value(value = "${cola.code.outpath.cola-feign-api}") + private String moduleFeignApiPath; + + + /** * 应用服务的plantUML类图文件,不配置则走基于数据表的方式生成代码 */ @Value("${cola.domain.plantuml}") private String plantumlName; + /** + * 是否构建api文档 + */ + @Value("${cola.api.generator}") + private Boolean apiGenerate; + + @Value(value = "${cola.component.scan.config}") + private String componentList; + + @Value(value = "${springboot.component.dsl.read}") + private String readSenceSet; + + + @Value(value = "${springboot.component.dsl.write}") + private String writeSenceSet; + + + @Value(value = "${cola.subpackage.request}") + private Boolean request; + + @Value(value = "${cola.subpackage.response}") + private Boolean response; + + @Value(value = "${cola.component.scan.beans}") + private String componentScanBeans; + + + @Value(value = "${cola.component.decorate.beans}") + private String componentDecorateBeans; + + @Value(value = "${cola.component.init.clazz}") + private String initClazz; + + + public String getModuleStartPath() { + return moduleStartPath; + } + + public void setModuleStartPath(String moduleStartPath) { + this.moduleStartPath = moduleStartPath; + } + + public Boolean getRequest() { + return request; + } + + public void setRequest(Boolean request) { + this.request = request; + } + + public Boolean getResponse() { + return response; + } + + public void setResponse(Boolean response) { + this.response = response; + } + + public String getReadSenceSet() { + return readSenceSet; + } + + public void setReadSenceSet(String readSenceSet) { + this.readSenceSet = readSenceSet; + } + + public String getWriteSenceSet() { + return writeSenceSet; + } + + public void setWriteSenceSet(String writeSenceSet) { + this.writeSenceSet = writeSenceSet; + } + + public String getComponentList() { + return componentList; + } + + public void setComponentList(String componentList) { + this.componentList = componentList; + } + + public Boolean getApiGenerate() { + return apiGenerate; + } + + public void setApiGenerate(Boolean apiGenerate) { + this.apiGenerate = apiGenerate; + } + public String getPlantumlName() { return plantumlName; } @@ -129,4 +235,46 @@ public class ProjectTemplateColaConfig { public void setModuleDomainPath(String moduleDomainPath) { this.moduleDomainPath = moduleDomainPath; } + + /** + * 获取api doc文件存储路径 + * @return + */ + public String getApiDocPath(){ + int index = this.getModuleDomainPath().lastIndexOf("/"); + return this.getModuleDomainPath().substring(0,index)+"/"+ GlobalConstant.API_DOC; + } + + public String getComponentScanBeans() { + return componentScanBeans; + } + + public void setComponentScanBeans(String componentScanBeans) { + this.componentScanBeans = componentScanBeans; + } + + public String getComponentDecorateBeans() { + return componentDecorateBeans; + } + + public void setComponentDecorateBeans(String componentDecorateBeans) { + this.componentDecorateBeans = componentDecorateBeans; + } + + + public String getInitClazz() { + return initClazz; + } + + public void setInitClazz(String initClazz) { + this.initClazz = initClazz; + } + + public String getModuleFeignApiPath() { + return moduleFeignApiPath; + } + + public void setModuleFeignApiPath(String moduleFeignApiPath) { + this.moduleFeignApiPath = moduleFeignApiPath; + } } \ No newline at end of file diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/config/ProjectTemplateDubboConfig.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/config/ProjectTemplateDubboConfig.java similarity index 40% rename from codemaker-core/src/main/java/com/coderman/codemaker/config/ProjectTemplateDubboConfig.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/config/ProjectTemplateDubboConfig.java index 346edad57b543441ecd1b47c23be5be5ea1227a1..4bb16c095af16bd23a5f27b7562d006dc8bc5079 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/config/ProjectTemplateDubboConfig.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/config/ProjectTemplateDubboConfig.java @@ -1,10 +1,15 @@ package com.coderman.codemaker.config; +import com.coderman.codemaker.bean.GlobalConstant; +import org.apache.commons.lang3.StringUtils; +import org.assertj.core.util.Lists; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; import org.springframework.stereotype.Component; +import java.util.List; + /** * Description: * 生成dubbo项目的配置文件 @@ -16,7 +21,7 @@ import org.springframework.stereotype.Component; */ @Configuration @Component -@PropertySource( "classpath:projecttemplate-dubbo.properties") +@PropertySource("classpath:projecttemplate-dubbo.properties") public class ProjectTemplateDubboConfig { /** @@ -56,6 +61,111 @@ public class ProjectTemplateDubboConfig { @Value("${dubbo.domain.plantuml}") private String plantumlName; + /** + * 是否构建api文档 + */ + @Value(("${dubbo.api.generator}")) + private Boolean apiGenerate; + + @Value(value = "${dubbo.component.scan.config}") + private String componentList; + + + @Value(value = "${springboot.component.dsl.read}") + private String readSenceSet; + + + @Value(value = "${springboot.component.dsl.write}") + private String writeSenceSet; + + @Value(value = "${dubbo.subpackage.request}") + private Boolean request; + + @Value(value = "${dubbo.subpackage.response}") + private Boolean response; + + @Value(value = "${dubbo.component.scan.beans}") + private String componentScanBeans; + + + @Value(value = "${dubbo.component.decorate.beans}") + private String componentDecorateBeans; + + + @Value(value = "${dubbo.component.init.clazz}") + private String initClazz; + + public String getInitClazz() { + return initClazz; + } + + public void setInitClazz(String initClazz) { + this.initClazz = initClazz; + } + + public String getComponentScanBeans() { + return componentScanBeans; + } + + public void setComponentScanBeans(String componentScanBeans) { + this.componentScanBeans = componentScanBeans; + } + + public String getComponentDecorateBeans() { + return componentDecorateBeans; + } + + public void setComponentDecorateBeans(String componentDecorateBeans) { + this.componentDecorateBeans = componentDecorateBeans; + } + + public Boolean getRequest() { + return request; + } + + public void setRequest(Boolean request) { + this.request = request; + } + + public Boolean getResponse() { + return response; + } + + public void setResponse(Boolean response) { + this.response = response; + } + + public String getReadSenceSet() { + return readSenceSet; + } + + public void setReadSenceSet(String readSenceSet) { + this.readSenceSet = readSenceSet; + } + + public String getWriteSenceSet() { + return writeSenceSet; + } + + public void setWriteSenceSet(String writeSenceSet) { + this.writeSenceSet = writeSenceSet; + } + + public String getComponentList() { + return componentList; + } + + public void setComponentList(String componentList) { + this.componentList = componentList; + } + + public Boolean getApiGenerate() { + return apiGenerate; + } + + public void setApiGenerate(Boolean apiGenerate) { + this.apiGenerate = apiGenerate; + } public String getPlantumlName() { return plantumlName; @@ -104,4 +214,41 @@ public class ProjectTemplateDubboConfig { public void setModuleCorePath(String moduleCorePath) { this.moduleCorePath = moduleCorePath; } + + /** + * 获取api doc文件存储路径 + * @return + */ + public String getApiDocPath(){ + int index = this.getModuleApiPath().lastIndexOf("/"); + return this.getModuleApiPath().substring(0,index)+"/"+ GlobalConstant.API_DOC; + } + + /** + * 获取配置的组件扫描bean + * @return + */ + public List getComponentScanBeanList(){ + String scanBeansStr = this.getComponentScanBeans(); + + if(StringUtils.isEmpty(scanBeansStr)){ + return null; + } + return Lists.newArrayList(scanBeansStr.split(",")); + } + + /** + * 获取配置的组件装饰bean + * @return + */ + public List getComponentDecorateBeanList(){ + String decorateBeansStr = this.getComponentDecorateBeans(); + + if(StringUtils.isEmpty(decorateBeansStr)){ + return null; + } + return Lists.newArrayList(decorateBeansStr.split(",")); + } + + } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/config/ProjectTemplateDynamicDDDConfig.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/config/ProjectTemplateDynamicDDDConfig.java similarity index 93% rename from codemaker-core/src/main/java/com/coderman/codemaker/config/ProjectTemplateDynamicDDDConfig.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/config/ProjectTemplateDynamicDDDConfig.java index 0b310059ce605535a18475f954e4f313c83e4221..f6561e374ab50fff772cefba432c8dffe6519852 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/config/ProjectTemplateDynamicDDDConfig.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/config/ProjectTemplateDynamicDDDConfig.java @@ -16,7 +16,7 @@ import org.springframework.stereotype.Component; */ @Configuration @Component -@PropertySource( "classpath:projecttemplate-dynamicddd.properties") +@PropertySource("classpath:projecttemplate-dynamicddd.properties") public class ProjectTemplateDynamicDDDConfig { diff --git a/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/config/ProjectTemplateSpringCloudConfig.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/config/ProjectTemplateSpringCloudConfig.java new file mode 100644 index 0000000000000000000000000000000000000000..8338d0844f93e65bf752e59b5ba3abd803928c7a --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/config/ProjectTemplateSpringCloudConfig.java @@ -0,0 +1,227 @@ +package com.coderman.codemaker.config; + +import com.coderman.codemaker.bean.GlobalConstant; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.PropertySource; +import org.springframework.stereotype.Component; + +/** + * description: ProjectTemplateConfig
+ * date: 2020/7/7 22:14
+ * author: coderman
+ * version: 1.0
+ */ +@Configuration +@Component +@PropertySource("classpath:projecttemplate-springcloud.properties") +public class ProjectTemplateSpringCloudConfig { + + @Value(value = "${springcloud.global.dbName}") + private String dbName; + + @Value(value = "${springcloud.global.applicationName}") + private String applicationName; + + @Value(value = "${springcloud.pom.groupId}") + private String groupId; + + @Value(value = "${springcloud.pom.artifactId}") + private String artifactId; + + @Value(value = "${springcloud.pom.version}") + private String version; + + @Value(value = "${springcloud.code.feign-api}") + private String moduleFeginApiPath; + + @Value(value = "${springcloud.code.feign-provider}") + private String moduleFeginProviderPath; + + + /** + * 应用服务的plantUML类图文件,不配置则走基于数据表的方式生成代码 + */ + @Value("${springcloud.domain.plantuml}") + private String plantumlName; + + /** + * 是否构建api文档 + */ + @Value("${springcloud.api.generator}") + private Boolean apiGenerate; + + @Value(value = "${springcloud.component.scan.config}") + private String componentList; + + + @Value(value = "${springcloud.component.dsl.read}") + private String readSenceSet; + + + @Value(value = "${springcloud.component.dsl.write}") + private String writeSenceSet; + + @Value(value = "${springcloud.subpackage.request}") + private Boolean request; + + @Value(value = "${springcloud.subpackage.response}") + private Boolean response; + + @Value(value = "${springcloud.component.scan.beans}") + private String componentScanBeans; + + + @Value(value = "${springcloud.component.decorate.beans}") + private String componentDecorateBeans; + + @Value(value = "${springcloud.component.init.clazz}") + private String initClazz; + + + public String getInitClazz() { + return initClazz; + } + + public void setInitClazz(String initClazz) { + this.initClazz = initClazz; + } + + public String getComponentScanBeans() { + return componentScanBeans; + } + + public void setComponentScanBeans(String componentScanBeans) { + this.componentScanBeans = componentScanBeans; + } + + public String getComponentDecorateBeans() { + return componentDecorateBeans; + } + + public void setComponentDecorateBeans(String componentDecorateBeans) { + this.componentDecorateBeans = componentDecorateBeans; + } + + public Boolean getRequest() { + return request; + } + + public void setRequest(Boolean request) { + this.request = request; + } + + public Boolean getResponse() { + return response; + } + + public void setResponse(Boolean response) { + this.response = response; + } + + public String getReadSenceSet() { + return readSenceSet; + } + + public void setReadSenceSet(String readSenceSet) { + this.readSenceSet = readSenceSet; + } + + public String getWriteSenceSet() { + return writeSenceSet; + } + + public void setWriteSenceSet(String writeSenceSet) { + this.writeSenceSet = writeSenceSet; + } + + public String getComponentList() { + return componentList; + } + + public void setComponentList(String componentList) { + this.componentList = componentList; + } + + public Boolean getApiGenerate() { + return apiGenerate; + } + + public void setApiGenerate(Boolean apiGenerate) { + this.apiGenerate = apiGenerate; + } + + public String getPlantumlName() { + return plantumlName; + } + + public void setPlantumlName(String plantumlName) { + this.plantumlName = plantumlName; + } + + + public String getDbName() { + return dbName; + } + + public void setDbName(String dbName) { + this.dbName = dbName; + } + + public String getApplicationName() { + return applicationName; + } + + public void setApplicationName(String applicationName) { + this.applicationName = applicationName; + } + + public String getGroupId() { + return groupId; + } + + public void setGroupId(String groupId) { + this.groupId = groupId; + } + + public String getArtifactId() { + return artifactId; + } + + public void setArtifactId(String artifactId) { + this.artifactId = artifactId; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + public String getModuleFeginApiPath() { + return moduleFeginApiPath; + } + + public void setModuleFeginApiPath(String moduleFeginApiPath) { + this.moduleFeginApiPath = moduleFeginApiPath; + } + + public String getModuleFeginProviderPath() { + return moduleFeginProviderPath; + } + + public void setModuleFeginProviderPath(String moduleFeginProviderPath) { + this.moduleFeginProviderPath = moduleFeginProviderPath; + } + + /** + * 获取api doc文件存储路径 + * @return + */ + public String getApiDocPath(){ + int index = this.getModuleFeginApiPath().lastIndexOf("/"); + return this.getModuleFeginApiPath().substring(0,index)+"/"+ GlobalConstant.API_DOC; + } +} diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/config/ProjectTemplateSpringbootConfig.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/config/ProjectTemplateSpringbootConfig.java similarity index 49% rename from codemaker-core/src/main/java/com/coderman/codemaker/config/ProjectTemplateSpringbootConfig.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/config/ProjectTemplateSpringbootConfig.java index 104d9d9823e84a073971b65ad837a359c05e7302..3847d36276363894a8a81e0312922b7ce368fcef 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/config/ProjectTemplateSpringbootConfig.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/config/ProjectTemplateSpringbootConfig.java @@ -1,5 +1,6 @@ package com.coderman.codemaker.config; +import com.coderman.codemaker.bean.GlobalConstant; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; @@ -13,11 +14,9 @@ import org.springframework.stereotype.Component; */ @Configuration @Component -@PropertySource( "classpath:projecttemplate-springboot.properties") +@PropertySource("classpath:projecttemplate-springboot.properties") public class ProjectTemplateSpringbootConfig { - - @Value(value = "${springboot.global.dbName}") private String dbName; @@ -42,6 +41,112 @@ public class ProjectTemplateSpringbootConfig { @Value("${codemaker.domain.plantuml}") private String plantumlName; + /** + * 是否构建api文档 + */ + @Value("${springboot.api.generator}") + private Boolean apiGenerate; + + @Value(value = "${springboot.component.scan.config}") + private String componentList; + + + @Value(value = "${springboot.component.dsl.read}") + private String readSenceSet; + + + @Value(value = "${springboot.component.dsl.write}") + private String writeSenceSet; + + @Value(value = "${springboot.subpackage.request}") + private Boolean request; + + @Value(value = "${springboot.subpackage.response}") + private Boolean response; + + @Value(value = "${springboot.component.scan.beans}") + private String componentScanBeans; + + + @Value(value = "${springboot.component.decorate.beans}") + private String componentDecorateBeans; + + @Value(value = "${springboot.component.init.clazz}") + private String initClazz; + + + public String getInitClazz() { + return initClazz; + } + + public void setInitClazz(String initClazz) { + this.initClazz = initClazz; + } + + public String getComponentScanBeans() { + return componentScanBeans; + } + + public void setComponentScanBeans(String componentScanBeans) { + this.componentScanBeans = componentScanBeans; + } + + public String getComponentDecorateBeans() { + return componentDecorateBeans; + } + + public void setComponentDecorateBeans(String componentDecorateBeans) { + this.componentDecorateBeans = componentDecorateBeans; + } + + public Boolean getRequest() { + return request; + } + + public void setRequest(Boolean request) { + this.request = request; + } + + public Boolean getResponse() { + return response; + } + + public void setResponse(Boolean response) { + this.response = response; + } + + public String getReadSenceSet() { + return readSenceSet; + } + + public void setReadSenceSet(String readSenceSet) { + this.readSenceSet = readSenceSet; + } + + public String getWriteSenceSet() { + return writeSenceSet; + } + + public void setWriteSenceSet(String writeSenceSet) { + this.writeSenceSet = writeSenceSet; + } + + public String getComponentList() { + return componentList; + } + + public void setComponentList(String componentList) { + this.componentList = componentList; + } + + public Boolean getApiGenerate() { + return apiGenerate; + } + + public void setApiGenerate(Boolean apiGenerate) { + this.apiGenerate = apiGenerate; + } + public String getPlantumlName() { return plantumlName; } @@ -110,4 +215,12 @@ public class ProjectTemplateSpringbootConfig { ", plantumlName='" + plantumlName + '\'' + '}'; } + + /** + * 获取api doc文件存储路径 + * @return + */ + public String getApiDocPath(){ + return this.getOutPath() + "/" + GlobalConstant.API_DOC; + } } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/controller/CodeMakerController.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/controller/CodeMakerController.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/controller/CodeMakerController.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/controller/CodeMakerController.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/controller/GeneratorController.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/controller/GeneratorController.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/controller/GeneratorController.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/controller/GeneratorController.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/controller/GeneratorFastController.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/controller/GeneratorFastController.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/controller/GeneratorFastController.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/controller/GeneratorFastController.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/dao/SqlMapper.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/dao/SqlMapper.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/dao/SqlMapper.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/dao/SqlMapper.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/exceptions/ConfigException.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/exceptions/ConfigException.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/exceptions/ConfigException.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/exceptions/ConfigException.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/listener/RefrashConfigListener.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/listener/RefrashConfigListener.java similarity index 50% rename from codemaker-core/src/main/java/com/coderman/codemaker/listener/RefrashConfigListener.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/listener/RefrashConfigListener.java index 56e41aea3db414a4b12b592f2a3a2ea8fcb6526a..47fa3bfebb88a2d8c76821b6a83128a9c330c28f 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/listener/RefrashConfigListener.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/listener/RefrashConfigListener.java @@ -1,6 +1,9 @@ package com.coderman.codemaker.listener; +import com.coderman.codemaker.api.ICompScanService; +import com.coderman.codemaker.config.AppServiceConfig; import com.coderman.codemaker.config.DefaultPackageConfig; +import com.coderman.codemaker.service.dsl.DSLService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -9,6 +12,8 @@ import org.springframework.context.ApplicationListener; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; +import javax.annotation.Resource; + /** * Description:项目启动监听器，做数据初始化使用 @@ -26,17 +31,35 @@ public class RefrashConfigListener implements ApplicationListener classBeanList, IWriteFileService writeFileService,List voBeanList) { + if(CollectionUtils.isEmpty(classBeanList)){ + return; + } + Map classVOBeanMap = voBeanList.stream().collect(Collectors.toMap(ClassBean::getClassName,o->o)); + + for (ClassBean classBean : classBeanList){ + Map varMap = new HashMap<>(); + varMap.put("moduleDesc", classBean.getClassDesc()); + + List apiDocBeanList = new ArrayList<>(); + + classBean.getMethodBeanList().forEach(methodBean -> { + apiDocBeanList.add(methodBean.buildApiDocBean(classVOBeanMap)); + }); + varMap.put("apiList", apiDocBeanList); + + String content = freemarkerService.parseTplApi(TemplateFileEnum.API_HTTP.getTempFileName(), varMap); + WriteContentBean writeContentBean = WriteContentBean.builder().content(content) + .humpClassName(classBean.getClassName()) + .templateName(TemplateFileEnum.API_HTTP.getTempFileName()).build(); + writeFileService.writeContent(writeContentBean); + } + + } + + + /** + * 写rpc协议接口文档 + * @param interfaceBeanList + * @param writeFileService + * @param dtoBeanList + */ + public void writeRpcApiDoc(List interfaceBeanList, IWriteFileService writeFileService, List dtoBeanList) { + if(CollectionUtils.isEmpty(interfaceBeanList)){ + return; + } + Map classDTOBeanMap = dtoBeanList.stream().collect(Collectors.toMap(ClassBean::getClassName,o->o)); + + for (InterfaceBean interfaceBean : interfaceBeanList){ + Map varMap = new HashMap<>(); + varMap.put("moduleDesc", interfaceBean.getClassDesc()); + varMap.put("moduleApi", interfaceBean.getPackageName()+"."+interfaceBean.getClassName()); + + List apiDocBeanList = new ArrayList<>(); + + interfaceBean.getMethodBeanList().forEach(methodBean -> { + apiDocBeanList.add(methodBean.buildApiDocBean(classDTOBeanMap)); + }); + varMap.put("apiList", apiDocBeanList); + + String content = freemarkerService.parseTplApi(TemplateFileEnum.API_RPC.getTempFileName(), varMap); + WriteContentBean writeContentBean = WriteContentBean.builder().content(content) + .humpClassName(interfaceBean.getClassName()) + .templateName(TemplateFileEnum.API_HTTP.getTempFileName()).build(); + writeFileService.writeContent(writeContentBean); + } + + } + +} diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/WriteCodeService.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/WriteCodeService.java similarity index 95% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/WriteCodeService.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/WriteCodeService.java index 628266d795f5b8f0a9f9c1ad7e9cf90f3d782bc4..115924451df5625e103afc8c40060f41fb8023b2 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/WriteCodeService.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/WriteCodeService.java @@ -2,6 +2,7 @@ package com.coderman.codemaker.service; import com.coderman.codemaker.app.IWriteFileService; import com.coderman.codemaker.bean.ColumnBean; +import com.coderman.codemaker.bean.GlobalConstant; import com.coderman.codemaker.bean.TableBean; import com.coderman.codemaker.bean.WriteContentBean; import com.coderman.codemaker.config.AppServiceConfig; @@ -9,6 +10,7 @@ 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 lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -30,6 +32,7 @@ import java.util.Map; */ @Component +@Slf4j public class WriteCodeService { @Autowired @@ -455,4 +458,29 @@ public class WriteCodeService { }); erPictureService.getErPicture(filePath, tableBeanList); } + + /** + * 写初始化工具类的统一方法 + * @param moduleName + * @param content + */ + public void writeInitClass(String moduleName, String content,String className){ + if(StringUtils.isEmpty(content)){ + return; + } + IWriteFileService writeFileService = appServiceConfig.getWriteServiceByModuleName(moduleName); + if (writeFileService == null) { + return; + } + + String classPackage = content.split(";")[0].replace("package","").trim(); + + WriteContentBean writeContentBean = WriteContentBean.builder().content(content) + .templateName(GlobalConstant.SINGLE_CLASS_COMMON) + .classPackageName(classPackage) + .humpClassName(className).build(); + writeFileService.writeContent(writeContentBean); + } + + } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/WriteDynamicCodeService.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/WriteDynamicCodeService.java similarity index 82% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/WriteDynamicCodeService.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/WriteDynamicCodeService.java index 0212af338286c26e7450743fdc3dbb47448c91f2..459cd5858925a853e6482de40e9022b47fac0940 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/WriteDynamicCodeService.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/WriteDynamicCodeService.java @@ -9,15 +9,12 @@ import com.coderman.codemaker.bean.plantuml.EnumBean; import com.coderman.codemaker.bean.plantuml.InterfaceBean; import com.coderman.codemaker.config.AppServiceConfig; +import com.coderman.codemaker.enums.ModuleEnum; 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; import org.springframework.stereotype.Component; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -39,9 +36,6 @@ public class WriteDynamicCodeService { @Autowired private AppServiceConfig appServiceConfig; - @Autowired - private DBErPictureService erPictureService; - @Autowired private FreemarkerService freemarkerService; @@ -51,6 +45,12 @@ public class WriteDynamicCodeService { @Autowired private WriteCodeService writeCodeService; + + @Autowired + private WriteApiDocService writeApiDocService; + + + /** * 写BO文件 * @param classBeanList @@ -99,6 +99,18 @@ public class WriteDynamicCodeService { writeDynamicDDDModuleService.writeGataWay(classBeanList,writeFileService,null); } + /** + * 写domainrepository文件 + * @param classBeanList + */ + public void writeDomainRepository(List classBeanList) { + IWriteFileService writeFileService = appServiceConfig.getModuleWriteService(TemplateFileEnum.GATAWAY.getTempFileName()); + if (writeFileService == null) { + return; + } + writeDynamicDDDModuleService.writeRepository(classBeanList,writeFileService,null); + } + /** * 写dynamicMapper文件 @@ -172,6 +184,19 @@ public class WriteDynamicCodeService { writeDynamicDDDModuleService.writeFactory(classBeanList,writeFileService,null); } + + /** + * 写cache文件 + * @param classBeanList + */ + public void writeCache(List classBeanList) { + IWriteFileService writeFileService = appServiceConfig.getModuleWriteService(TemplateFileEnum.CACHE.getTempFileName()); + if (writeFileService == null) { + return; + } + writeDynamicDDDModuleService.writeCache(classBeanList,writeFileService,null); + } + /** * 写applistener文件 * @param classBeanList @@ -281,6 +306,18 @@ public class WriteDynamicCodeService { writeDynamicDDDModuleService.writeDoBOConvert(doboConvertBeanList,writeFileService); } + /** + * 写dto2dtoconvert文件 + * @param doboConvertBeanList + */ + public void writeDTO2DTOConvert(List doboConvertBeanList) { + IWriteFileService writeFileService = appServiceConfig.getModuleWriteService(TemplateFileEnum.DOBO_CONVERT.getTempFileName()); + if (writeFileService == null) { + return; + } + writeDynamicDDDModuleService.writeDTO2DTOConvert(doboConvertBeanList,writeFileService); + } + /** * 写acl.param文件 @@ -368,6 +405,25 @@ public class WriteDynamicCodeService { writeDynamicDDDModuleService.writeDTO(classBeanList,writeFileService); } + /** + * 写feignDTO文件 + * @param classBeanList + */ + public void writeFeignDTO(List classBeanList) { + + IWriteFileService writeFileService = appServiceConfig.getWriteServiceByModuleName(ModuleEnum.COLA_FEIGN_API.getModuleName()); + //只有springcloud cola需要写feign dto + if (writeFileService == null + || appServiceConfig.getApplicationType().equals(ModuleEnum.DUBBO_API.getAppName()) + || appServiceConfig.getApplicationType().equals(ModuleEnum.SPRING_BOOT_WEB.getAppName())) { + return; + } + + + writeDynamicDDDModuleService.writeDTO(classBeanList,writeFileService); + } + + /** * 写VO文件 * @param classBeanList @@ -404,6 +460,18 @@ public class WriteDynamicCodeService { writeDynamicDDDModuleService.writeFacade(classBeanList,writeFileService); } + /** + * 写feign文件 + * @param classBeanList + */ + public void writeFeign(List classBeanList) { + IWriteFileService writeFileService = appServiceConfig.getModuleWriteService(TemplateFileEnum.FEIGN.getTempFileName()); + if (writeFileService == null) { + return; + } + writeDynamicDDDModuleService.writeFeign(classBeanList,writeFileService); + } + /** * 写facadeimpl文件 * @param classBeanList @@ -433,39 +501,6 @@ public class WriteDynamicCodeService { writeFileService.writeContent(writeContentBean); } - /** - * 写工具类文件 - * - * @param content - */ - 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.APP_EVENT_PUBLISHER.getTempFileName()) - .humpClassName("AppEventPublisher.java").build(); - - writeFileService.writeContent(writeContentBean); - } - - /** - * 写工具类文件 - * - * @param content - */ - 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.BASE_EVENT.getTempFileName()) - .humpClassName("BaseEvent.java").build(); - writeFileService.writeContent(writeContentBean); - } - /** * 一次性生成所有表的模块代码，同时解析plantUML的类图结合起来 * @param allMetaDataMap @@ -489,10 +524,11 @@ public class WriteDynamicCodeService { this.writeDomainEvent(eventClassBeanList); List gatawayBeanList = (List)allMetaDataMap.get("gataway"); - List repositoryBeanList = (List)allMetaDataMap.get("repository"); - gatawayBeanList.addAll(repositoryBeanList); this.writeDomainGataway(gatawayBeanList); + List repositoryBeanList = (List)allMetaDataMap.get("repository"); + this.writeDomainRepository(repositoryBeanList); + List gatawayImplBeanList = (List)allMetaDataMap.get("gatawayimpl"); this.writeGatawayImpl(gatawayImplBeanList); @@ -530,11 +566,18 @@ public class WriteDynamicCodeService { List mqHandlerBeanList = (List)allMetaDataMap.get("mqhandler"); this.writeMqHandler(mqHandlerBeanList); + List cacheBeanList = (List)allMetaDataMap.get("cache"); + this.writeCache(cacheBeanList); + List voClassBeanList = (List)allMetaDataMap.get("adaptervo"); this.writeVO(voClassBeanList); - List classBeanList = (List)allMetaDataMap.get("controller"); - this.writeController(classBeanList); + List controllerBeanList = (List)allMetaDataMap.get("controller"); + this.writeController(controllerBeanList); + + + List derivefeignInterfaceBeanList = (List)allMetaDataMap.get("derivefeign"); + this.writeFeign(derivefeignInterfaceBeanList); List derivefacadeInterfaceBeanList = (List)allMetaDataMap.get("derivefacade"); @@ -565,6 +608,11 @@ public class WriteDynamicCodeService { Map> columnBeanListMap = (Map>)allMetaDataMap.get("columns"); Map varMap = new HashMap<>(); + List dto2dtoConvertInterfaceList = (List)allMetaDataMap.get("convertdto2dto"); + + this.writeFeignDTO(dtoClassBeanList); + this.writeDTO2DTOConvert(dto2dtoConvertInterfaceList); + tableBeanMap.forEach((k,v)->{ @@ -587,6 +635,39 @@ public class WriteDynamicCodeService { //渲染e-r图 writeCodeService.writeERPicture(tableBeanMap,columnBeanListMap); + //进行文档生成 + if(appServiceConfig.getApiDocGenerator()){ + this.writeHttpApiDoc(controllerBeanList,voClassBeanList); + this.writeRpcApiDoc(derivefacadeInterfaceBeanList,dtoClassBeanList); + this.writeRpcApiDoc(derivefeignInterfaceBeanList,dtoClassBeanList); + + } + + } + + /** + * 写http接口文档 + * @param controllerBeanList + */ + private void writeHttpApiDoc(List controllerBeanList,List voBeanList){ + IWriteFileService writeFileService = appServiceConfig.getModuleWriteService(TemplateFileEnum.API_HTTP.getTempFileName()); + if (writeFileService == null) { + return; + } + writeApiDocService.writeHttpApiDoc(controllerBeanList,writeFileService,voBeanList); + } + + /** + * 写rpc接口文档 + * @param facadeBeanList + * @param dtoBeanList + */ + private void writeRpcApiDoc(List facadeBeanList,List dtoBeanList){ + IWriteFileService writeFileService = appServiceConfig.getModuleWriteService(TemplateFileEnum.API_RPC.getTempFileName()); + if (writeFileService == null) { + return; + } + writeApiDocService.writeRpcApiDoc(facadeBeanList,writeFileService,dtoBeanList); } /** @@ -596,27 +677,19 @@ public class WriteDynamicCodeService { */ public void writeCommon(Map varMap, String fast) { + Map> initClassMap = appServiceConfig.getInitClassMapList(); + if(initClassMap == null || initClassMap.isEmpty()){ + return; + } - String baseControllerContent = freemarkerService.parseTpl(fast + TemplateFileEnum.BASE_CONTROLLER.getTempFileName(), varMap); - writeCodeService.writeBaseController(baseControllerContent); - - String SpringApplicationContextContent = freemarkerService.parseTpl(fast + TemplateFileEnum.SPRING_APPLICATION_CONTEXT.getTempFileName(), varMap); - writeCodeService.writeSpringApplicationContext(SpringApplicationContextContent); - - String application = freemarkerService.parseTpl(fast + TemplateFileEnum.APPLICATION.getTempFileName(), varMap); - writeCodeService.writeApplication(application); - + for (Map.Entry> entry : initClassMap.entrySet()){ + for (String classTemplate : entry.getValue()){ + String clazzContent = freemarkerService.parseTplCommon(classTemplate, varMap); + writeCodeService.writeInitClass(entry.getKey(),clazzContent,classTemplate); + } + } String facadeAop = freemarkerService.parseTpl(fast + TemplateFileEnum.FACADE_AOP.getTempFileName(), varMap); writeCodeService.writeFacadeAop(facadeAop); - - //动态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); - } } @@ -632,4 +705,7 @@ public class WriteDynamicCodeService { } writeDynamicDDDModuleService.writeDynamicDDD(dynamicDDDMap, writeFileService); } + + + } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/WriteDynamicDDDService.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/WriteDynamicDDDService.java similarity index 90% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/WriteDynamicDDDService.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/WriteDynamicDDDService.java index e78dfc6ec250fb249d57b8a6bac596e9f8eebf6e..42e9e001f9f7f13803b2a040c19cd490c8f1e892 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/WriteDynamicDDDService.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/WriteDynamicDDDService.java @@ -5,7 +5,6 @@ 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; @@ -229,6 +228,20 @@ public class WriteDynamicDDDService { } } + /** + * 写facade + * @param classBeanList + * @param writeFileService + */ + public void writeFeign(List classBeanList, IWriteFileService writeFileService){ + for (InterfaceBean interfaceBean : classBeanList){ + Map varMap = interfaceBean.buildVarMap(); + String boContent = freemarkerService.parseTpl(TemplateFileEnum.FEIGN_DDD.getTempFileName(), varMap); + WriteContentBean writeContentBean = interfaceBean.buildWriteContentBean(boContent,TemplateFileEnum.FEIGN); + writeFileService.writeContent(writeContentBean); + } + } + /** * 写valueobject @@ -287,6 +300,20 @@ public class WriteDynamicDDDService { } } + /** + * 写gataway接口和repository接口 + * @param repositoryBeanList + * @param writeFileService + */ + public void writeRepository(List repositoryBeanList, IWriteFileService writeFileService,String dddTag) { + for (InterfaceBean interfaceBean : repositoryBeanList) { + Map varMap = interfaceBean.buildVarMap(); + String interfaceContent = freemarkerService.parseTpl(TemplateFileEnum.GATAWAY.getTempFileName(), varMap); + WriteContentBean writeContentBean = interfaceBean.buildWriteContentBean(interfaceContent,TemplateFileEnum.REPOSITORY); + writeFileService.writeContent(writeContentBean); + } + } + /** * 写dynamicmapper * @param dynamicMapperBeanList @@ -394,6 +421,25 @@ public class WriteDynamicDDDService { writeFileService.writeContent(writeContentBean); } } + /** + * 写cache + * @param domainFactoryBeanList + * @param writeFileService + */ + public void writeCache(List domainFactoryBeanList, IWriteFileService writeFileService,String dddTag){ + //写factory + for (ClassBean classBean : domainFactoryBeanList){ + Map varMap = classBean.buildVarMap(); + String boContent; + if(StringUtils.isNotEmpty(dddTag)){ + boContent = freemarkerService.parseTplDynamicDDD(TemplateFileEnum.CACHE.getTempFileName(), varMap); + }else { + boContent = freemarkerService.parseTpl(TemplateFileEnum.CACHE.getTempFileName(), varMap); + } + WriteContentBean writeContentBean = classBean.buildWriteContentBean(boContent,TemplateFileEnum.CACHE); + writeFileService.writeContent(writeContentBean); + } + } /** @@ -509,9 +555,9 @@ public class WriteDynamicDDDService { Map varMap = classBean.buildVarMap(); String interfaceImplContent; if(StringUtils.isNotEmpty(dddTag)){ - interfaceImplContent = freemarkerService.parseTplDynamicDDD(TemplateFileEnum.GATAWAY_IMPL.getTempFileName(), varMap); + interfaceImplContent = freemarkerService.parseTplDynamicDDD(TemplateFileEnum.ACL_IMPL.getTempFileName(), varMap); }else { - interfaceImplContent = freemarkerService.parseTpl(TemplateFileEnum.GATAWAY_IMPL.getTempFileName(), varMap); + interfaceImplContent = freemarkerService.parseTpl(TemplateFileEnum.ACL_IMPL.getTempFileName(), varMap); } WriteContentBean writeContentBean = classBean.buildWriteContentBean(interfaceImplContent,TemplateFileEnum.ACL_IMPL); writeFileService.writeContent(writeContentBean); @@ -526,8 +572,7 @@ public class WriteDynamicDDDService { public void writeACLParam(List classBeanList, IWriteFileService writeFileService,String dddTag){ for (ClassBean classBean : classBeanList){ - Map varMap = new HashMap<>(); - varMap.put("class",classBean); + Map varMap = classBean.buildVarMap(); //使用BO的模板 String boContent; if(StringUtils.isNotEmpty(dddTag)){ @@ -648,4 +693,18 @@ public class WriteDynamicDDDService { writeFileService.writeContent(writeContentBean); } } + + /** + * 写dto2dto-convert 接口 + * @param interfaceBeanList + * @param writeFileService + */ + public void writeDTO2DTOConvert(List interfaceBeanList, IWriteFileService writeFileService){ + for (InterfaceBean interfaceBean : interfaceBeanList){ + Map varMap = interfaceBean.buildVarMap(); + String interfaceContent = freemarkerService.parseTpl(TemplateFileEnum.CONVERT.getTempFileName(), varMap); + WriteContentBean writeContentBean = interfaceBean.buildWriteContentBean(interfaceContent,TemplateFileEnum.DTO2DTO_CONVERT); + writeFileService.writeContent(writeContentBean); + } + } } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/adapter/DefaultClazzWrapperImpl.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/adapter/DefaultClazzWrapperImpl.java similarity index 60% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/adapter/DefaultClazzWrapperImpl.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/adapter/DefaultClazzWrapperImpl.java index 3d53d9ba2b51a2b531661a398527e79b143d6e8a..45488907a3bc07bbad41812b60781cf891ff43ff 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/adapter/DefaultClazzWrapperImpl.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/adapter/DefaultClazzWrapperImpl.java @@ -12,8 +12,10 @@ import java.util.Map; * @author fanchunshuai * @version 1.0.0 * @since JDK 1.8 + * 该组件已过期，整体逻辑已通过组件化升级完成 */ @Service(value = "defaultClazzWrapperImpl") +@Deprecated public class DefaultClazzWrapperImpl implements IClazzAdapter{ @Override @@ -23,10 +25,10 @@ public class DefaultClazzWrapperImpl implements IClazzAdapter{ 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"); + //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-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/adapter/IClazzAdapter.java similarity index 97% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/adapter/IClazzAdapter.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/adapter/IClazzAdapter.java index 73e6460cefcb21b5012fb1691658a4e03f138a9e..39056372dea0cd6570ca5af6cc1c6ae90d506615 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/adapter/IClazzAdapter.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/adapter/IClazzAdapter.java @@ -11,6 +11,7 @@ import java.util.Map; * @version 1.0.0 * @since JDK 1.8 */ +@Deprecated public interface IClazzAdapter { /** * 提供对facade,controller的方法内容返回包装类的相关信息 diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/adapter/PackgeConstants.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/adapter/PackgeConstants.java similarity index 99% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/adapter/PackgeConstants.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/adapter/PackgeConstants.java index 3e8432486529abcab16d0371537967697356c381..6d4efeadbc0d732afc3b827a7178b6e9da2552d6 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/adapter/PackgeConstants.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/adapter/PackgeConstants.java @@ -31,4 +31,5 @@ public class PackgeConstants { public static Map getDefaultPackageMap(){ return defaultPackageMap; } + } diff --git a/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/component/ComponentDecorateService.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/component/ComponentDecorateService.java new file mode 100644 index 0000000000000000000000000000000000000000..c91f1dbd419041c0999318b730623a055f93784e --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/component/ComponentDecorateService.java @@ -0,0 +1,68 @@ +package com.coderman.codemaker.service.component; + +import com.alibaba.fastjson.JSON; +import com.coderman.codemaker.api.ICompScanService; +import com.coderman.codemaker.api.ICompDecorateService; +import com.coderman.codemaker.bean.component.ComponentContextBean; +import com.coderman.codemaker.bean.plantuml.PlantUmlContextBean; +import com.coderman.codemaker.config.AppServiceConfig; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Description: + * date: 2021/11/23 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +@Service +@Slf4j +public class ComponentDecorateService { + + @Autowired + private AppServiceConfig appServiceConfig; + + + /** + * 装饰支持的框架注解类等信息 + * 包括框架级中间件依赖和应用级组件依赖 + * @param plantUmlContextBean + */ + public void decorateComponent(PlantUmlContextBean plantUmlContextBean){ + + //框架级全局组件扫描装饰 + Map defaultComponentContextBeanMap = appServiceConfig.getDefaultCompScanService().scanComponent(appServiceConfig.getDefaultComponentList()); + if (defaultComponentContextBeanMap == null || defaultComponentContextBeanMap.isEmpty()){ + return; + } + for (Map.Entry entry : defaultComponentContextBeanMap.entrySet()){ + appServiceConfig.getDefaultCompDecorateService().decorateComp(entry.getValue(),plantUmlContextBean); + } + + + + //应用组件级扫描装饰 + List customCompScanServiceList = appServiceConfig.getCustomICompScanServiceList(); + Map customCompContextBeanMap = new HashMap<>(); + for (ICompScanService compScanService : customCompScanServiceList){ + customCompContextBeanMap.putAll(compScanService.scanComponent(appServiceConfig.getCustomComponentList())); + } + List customCompDecorateServiceList = appServiceConfig.getCustomICompDecorateServiceList(); + for (ICompDecorateService compDecorateService : customCompDecorateServiceList){ + for (Map.Entry entry : customCompContextBeanMap.entrySet()){ + compDecorateService.decorateComp(entry.getValue(), plantUmlContextBean); + } + } + + //这里只注册应用级组件，框架级组件等有需求再注册 + plantUmlContextBean.setCompContextBeanMap(customCompContextBeanMap); + log.info("===========comp.size = "+customCompContextBeanMap.size()); + } +} diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/dberpicture/DBErPictureService.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/dberpicture/DBErPictureService.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/dberpicture/DBErPictureService.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/dberpicture/DBErPictureService.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/dberpicture/DBErPictureServiceImpl.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/dberpicture/DBErPictureServiceImpl.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/dberpicture/DBErPictureServiceImpl.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/dberpicture/DBErPictureServiceImpl.java diff --git a/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/dsl/DSLService.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/dsl/DSLService.java new file mode 100644 index 0000000000000000000000000000000000000000..5ea9e5178e6c8f4cf9bae48bf7daa92b35939d77 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/dsl/DSLService.java @@ -0,0 +1,29 @@ +package com.coderman.codemaker.service.dsl; + +import com.coderman.codemaker.config.AppServiceConfig; +import com.coderman.codemaker.enums.dynamic.ReadWriteTypeEnum; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * Description:扩展出的DSL 统一语言 + * 归类读写场景 + * date: 2021/11/24 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +@Service +public class DSLService { + @Autowired + private AppServiceConfig appServiceConfig; + + /** + * 注册自定义的读写操作统一语言 + */ + public void registCustomDsl(){ + ReadWriteTypeEnum.putReadDSL(appServiceConfig.getReadDslSet()); + ReadWriteTypeEnum.putWriteDSL(appServiceConfig.getWriteDslSet()); + } +} diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/ConvertInvokeService.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/ConvertInvokeService.java similarity index 78% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/ConvertInvokeService.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/ConvertInvokeService.java index df36e86278438c6c08a1be66ed279cb1edd39e16..afadf4cad6935713375ebf63bcebcdd21f27c46e 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/ConvertInvokeService.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/ConvertInvokeService.java @@ -6,15 +6,13 @@ 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 com.coderman.codemaker.utils.StringHandleUtils; 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之间的转换调用处理器 @@ -201,7 +199,7 @@ public class ConvertInvokeService { continue; } ClassBean boClassBeanElement = invokeBean.getPlantUmlContextBean().getClassBeanMap().get(arr[0]); - if(StringUtils.isEmpty(boClassBeanElement.getBodoConvertInterface())){ + if(boClassBeanElement == null || StringUtils.isEmpty(boClassBeanElement.getBodoConvertInterface())){ continue; } interfaceBean = invokeBean.getPlantUmlContextBean().getDerivedPlantUmlContextBean().getInterfaceBeanMap().get(boClassBeanElement.getBodoConvertInterface()); @@ -224,6 +222,11 @@ public class ConvertInvokeService { * @return */ public String buildReturnVar(String returnClassName){ + if(returnClassName.contains(".")){ + String [] arr = returnClassName.split("\\."); + String returnClass = arr[arr.length - 1].replace(">",""); + return returnClass.substring(0,1).toLowerCase() + returnClass.substring(1); + } if(returnClassName.contains("<")){ if(returnClassName.toLowerCase().contains("list")){ //List> @@ -244,6 +247,9 @@ public class ConvertInvokeService { String returnVar = modelClass+"List"; return returnVar.substring(0,1).toLowerCase() + returnVar.substring(1); } + if(returnClassName.endsWith("<")){ + return returnClassName.replace("<",""); + } } return returnClassName.substring(0,1).toLowerCase() + returnClassName.substring(1); } @@ -326,4 +332,76 @@ public class ConvertInvokeService { } return null; } + + /** + * 构建一个dto到dto的转换类-->调用下游的参数转换--参数请求转换 + * @param invokeBean + * @return + */ + public MethodBean getDTO2DTOConvertMethodParamRequest(InvokeContextBean invokeBean){ + if(invokeBean.getInvokerMethodBean().getReturnClass().equals("void")){ + return null; + } + + String[] params = invokeBean.getInvokerMethodBean().getParamArr(); + String params1 = params[0]; + + String paramType = params1.split(" ")[0]; + if(StringHandleUtils.isBasicType(paramType)){ + return null; + } + + String [] returnClassTypeArr = invokeBean.getProviderClassMethod().getGenericParamList().get(0).split("\\."); + String returnClassType = returnClassTypeArr[returnClassTypeArr.length - 1].replace(">",""); + String paramName = paramType.replace("DTO","").replace("Dto","") + .replace("Request","") + .replace("Query",""); + paramName = paramName.substring(0,1).toLowerCase()+paramName.substring(1); + MethodBean convertMethod = new MethodBean(); + if(returnClassType.equals(paramType)){ + convertMethod.setReturnClass(invokeBean.getProviderClassMethod().getGenericParamList().get(0)); + ClassBean paramBean = invokeBean.getPlantUmlContextBean().getDerivedPlantUmlContextBean().getClassBeanMap().get(paramType+"acl"); + + convertMethod.setMethodName(paramName+"ReqConvert"+"("+paramBean.getPackageName()+"."+params1+")"); + }else { + String [] arr = returnClassType.split("\\."); + convertMethod.setReturnClass(arr[arr.length - 1].replace(">","")); + convertMethod.setMethodName(paramName+"ReqConvert"+"("+params1+")"); + } + + + convertMethod.buildParamArr(); + return convertMethod; + } + + /** + * 构建一个dto到dto的转换类-->调用下游的参数转换--参数请求转换 + * @param invokeBean + * @return + */ + public MethodBean getDTO2DTOConvertMethodParamResponse(InvokeContextBean invokeBean){ + if(invokeBean.getInvokerMethodBean().getReturnClass().equals("void")){ + return null; + } + + String invokeMethodReturnClass = invokeBean.getInvokerMethodBean().getReturnClass(); + + + MethodBean convertMethod = new MethodBean(); + + String provideMethodReturnClass = invokeBean.getProviderClassMethod().getReturnClass(); + provideMethodReturnClass = StringHandleUtils.getParamTypeNoWrapper(provideMethodReturnClass); + convertMethod.setReturnClass(invokeMethodReturnClass); + String paramName = invokeBean.getInvokerMethodBean().getSimplMethodName() + .replace("query","") + .replace("get","") + .replace("List","") + .replace("find",""); + + + convertMethod.setMethodName(paramName+"ResConvert"+"("+provideMethodReturnClass+" "+StringHandleUtils.getParamVar(provideMethodReturnClass)+")"); + + convertMethod.buildParamArr(); + return convertMethod; + } } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/InvokeElementRegistService.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/InvokeElementRegistService.java similarity index 68% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/InvokeElementRegistService.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/InvokeElementRegistService.java index 462b81d8ee659a727373b8b3265f898a6c600082..d9399a7a265dac624ff9369cbf955137b8a628dc 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/InvokeElementRegistService.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/InvokeElementRegistService.java @@ -1,5 +1,7 @@ package com.coderman.codemaker.service.invoker; +import com.coderman.codemaker.api.ICompRegistService; +import com.coderman.codemaker.bean.component.ComponentContextBean; import com.coderman.codemaker.bean.plantuml.ClassBean; import com.coderman.codemaker.bean.plantuml.MethodBean; import com.coderman.codemaker.bean.plantuml.PlantUmlContextBean; @@ -8,8 +10,6 @@ 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类等 @@ -25,36 +25,27 @@ public class InvokeElementRegistService { @Autowired private AppServiceConfig appServiceConfig; + @Autowired + private ICompRegistService iCompRegistService; + /** - * 注册内置的工具类对象或者辅助对象 + * 注册独立类和工具 * @param plantUmlContextBean */ public void registDefaultClass(PlantUmlContextBean plantUmlContextBean){ - registBaseEvent(plantUmlContextBean); - registAppEventPublisher(plantUmlContextBean); - registPageBO(plantUmlContextBean); - } + ComponentContextBean componentContextBean = iCompRegistService.registSingleClass(); + + + plantUmlContextBean.getCompContextBeanMap().put("singleClass",componentContextBean); + - /** - * 注册事件基类 - * @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){ + /*private void registAppEventPublisher(PlantUmlContextBean plantUmlContextBean){ ClassBean classBean = new ClassBean(); classBean.setClassDesc("事件发布器"); classBean.setClassName("AppEventPublisher"); @@ -69,29 +60,22 @@ public class InvokeElementRegistService { methodBean.setDesc("发布事件入口"); methodBean.setClassName("AppEventPublisher"); classBean.setMethodBeanList(Lists.newArrayList(methodBean)); - plantUmlContextBean.addClassBean(classBean); - } - +*/ /** * 注册bo类对象 * @param plantUmlContextBean */ - public void registPageBO(PlantUmlContextBean 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/service/invoker/InvokeHandler.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/InvokeHandler.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/InvokeHandler.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/InvokeHandler.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/InvokeSequenceService.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/InvokeSequenceService.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/InvokeSequenceService.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/InvokeSequenceService.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/MethodFactoryService.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/MethodFactoryService.java similarity index 97% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/MethodFactoryService.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/MethodFactoryService.java index cad4c2cb05c9942518c22c284f88bf4d67b8d17a..a54a378e9b9398a3f6239661c7f450130cfaa47a 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/MethodFactoryService.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/MethodFactoryService.java @@ -3,13 +3,13 @@ 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 com.coderman.codemaker.utils.StringHandleUtils; 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; /** @@ -36,6 +36,12 @@ public class MethodFactoryService { methodBeanOptional.get().initInvokeRowContentList(); return methodBeanOptional.get(); } + //如果是引用的组件则不进行智能推导 + if(StringUtils.isNotEmpty(abstractClassBean.getCompName())){ + return null; + } + + MethodBean methodBean = new MethodBean(); methodBean.setDesc(""); @@ -272,7 +278,7 @@ public class MethodFactoryService { String [] paramArr = paramBody.split(","); for (String param : paramArr){ if(!param.trim().contains(" ")){ - String paramVar = methodBean.getParamVar(param); + String paramVar = StringHandleUtils.getParamVar(param); paramList.add(param +" "+ paramVar); }else { paramList.add(param); diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/MethodInvokeService.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/MethodInvokeService.java similarity index 83% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/MethodInvokeService.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/MethodInvokeService.java index c3f9524dcf15e6cab0f9752e124b875b3b9c5a77..d051a9dd8790fbea167e52a489523e97eecfc294 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/MethodInvokeService.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/MethodInvokeService.java @@ -1,12 +1,16 @@ package com.coderman.codemaker.service.invoker; +import com.coderman.codemaker.bean.GlobalConstant; import com.coderman.codemaker.bean.invoke.InvokeContextBean; import com.coderman.codemaker.bean.invoke.InvokeRowBean; import com.coderman.codemaker.bean.plantuml.*; +import com.coderman.codemaker.config.AppServiceConfig; 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 com.coderman.codemaker.utils.StringHandleUtils; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.assertj.core.util.Lists; import org.springframework.beans.factory.annotation.Autowired; @@ -26,8 +30,12 @@ import java.util.Optional; * @since JDK 1.8 */ @Service +@Slf4j public class MethodInvokeService { + @Autowired + private AppServiceConfig appServiceConfig; + @Resource(name = "appRpcInvokeHandler") private InvokeHandler appRpcInvokeHandler; @@ -66,8 +74,12 @@ public class MethodInvokeService { if (StringUtils.isNotEmpty(invokeRowReturn)) { invokeRowReturn = invokeRowReturn + " = "; } - - String providerClassVar = invokeBean.getProviderClassName().substring(0,1).toLowerCase()+invokeBean.getProviderClassName().substring(1); + String providerClassVar = ""; + if(invokeBean.getProviderClassMethod().isStatic()){ + providerClassVar = invokeBean.getProviderClassName(); + }else { + providerClassVar = invokeBean.getProviderClassName().substring(0,1).toLowerCase()+invokeBean.getProviderClassName().substring(1); + } String invokeRowContent = invokeRowReturn + providerClassVar +"."+providerClassMethod; invokeBean.buildCurrentInvokeRow(invokeRowContent); //注册调用层,根据调用层间关系判断是否需要增加do,bo,vo之间的转换接口 @@ -114,12 +126,12 @@ public class MethodInvokeService { for (int i = 0;i < providerMethodParamArr.length;i++){ String providerParamType = ""; String providerParamVar = ""; - if(providerMethodParamArr[i].contains(" ")){ + if(providerMethodParamArr[i].trim().contains(" ")){ providerParamType = providerMethodParamArr[i].trim().split(" ")[0]; providerParamVar = providerMethodParamArr[i].trim().split(" ")[1]; }else { providerParamType = providerMethodParamArr[i]; - providerParamVar = invokeMethod.getParamVar(providerParamType); + providerParamVar = StringHandleUtils.getParamVar(providerParamType); } @@ -135,7 +147,20 @@ public class MethodInvokeService { if(find){ paramBuilder.append(providerParamVar+", "); }else { - paramBuilder.append("null, "); + boolean basicType = StringHandleUtils.isBasicType(providerParamType); + if(basicType && providerParamType.equals("boolean")){ + paramBuilder.append("false, "); + } + else if(basicType && providerParamType.equals("long")){ + paramBuilder.append("0L, "); + } + else if(basicType && providerParamType.equals("int")){ + paramBuilder.append("0, "); + } + else { + paramBuilder.append("null, "); + } + } } if(paramBuilder.length() == 0 || StringUtils.isEmpty(paramBuilder.toString())){ @@ -228,6 +253,9 @@ public class MethodInvokeService { } else if(returnStr.trim().toLowerCase().contains("<")){ + if(returnStr.endsWith("<")){ + returnStr = returnStr.replace("<",""); + } invokeRowReturn = returnStr + " " +convertInvokeService.buildReturnVar(returnStr); } @@ -243,8 +271,9 @@ public class MethodInvokeService { * 注册被调用方作为调用方的属性 * @param invokerClassBean * @param providerClassBean + * @param annotation */ - public void registField(AbstractClassBean invokerClassBean,AbstractClassBean providerClassBean){ + public void registField(AbstractClassBean invokerClassBean,AbstractClassBean providerClassBean,String annotation){ String targetClassName = providerClassBean.getClassName(); //注册被调用方的field if(CollectionUtils.isEmpty(invokerClassBean.getFieldBeanList())){ @@ -253,11 +282,17 @@ public class MethodInvokeService { FieldBean fieldBean = new FieldBean(); fieldBean.setVisibility(VisibilityEnum.PRIVATE.getVisibility()); fieldBean.setFieldName(targetClassName+ " " +targetClassName.substring(0,1).toLowerCase() + targetClassName.substring(1)); + if(!StringUtils.isEmpty(annotation)){ + fieldBean.setAnnotation(annotation); + } Optional fieldBeanOptional = invokerClassBean.getFieldBeanList().stream().filter(fieldBean1 -> fieldBean1.getFieldName().toLowerCase().contains(targetClassName.toLowerCase())).findFirst(); if(fieldBeanOptional.isPresent()){ return; } - invokerClassBean.getFieldBeanList().add(fieldBean); + invokerClassBean.addField(fieldBean); + if(providerClassBean.getPackageName().contains(GlobalConstant.PACKAGE_$)){ + providerClassBean.setPackageName(providerClassBean.getPackageName().replace(GlobalConstant.PACKAGE_$,appServiceConfig.getPackage())); + } invokerClassBean.getDynamicImportPackageList().add(providerClassBean.getPackageName()+"."+targetClassName); } @@ -300,6 +335,11 @@ public class MethodInvokeService { */ private void registConvertLayer(InvokeContextBean invokeBean){ String invokeSceneType = invokeBean.getInvokeSceneType(); + if(StringUtils.isEmpty(invokeSceneType)){ + log.warn("找不到对应的转换场景,providerClassName = "+invokeBean.getProviderClassName() + +",invokerClassName = "+invokeBean.getInvokerClassBean().getClassName()+",providerMethod = "+invokeBean.getProviderClassMethod().getMethodName()+",invokeMethod = "+invokeBean.getInvokerMethodBean().getMethodName()); + return; + } //是应用层app_rpc作为调用方 if(invokeSceneType.startsWith(InvokeLayerTypeEnum.APP_RPC.getCode()) ||invokeSceneType.equals(InvokeSceneTypeEnum.APP_RPC_TO_SELF.getCode())){ diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/ProviderInvokeHandler.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/ProviderInvokeHandler.java similarity index 79% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/ProviderInvokeHandler.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/ProviderInvokeHandler.java index 1bce56966232121112746c68f7eea48f6eed32e5..90f80cd406b21e7d56d7a5f36f7313ee2db99084 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/ProviderInvokeHandler.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/ProviderInvokeHandler.java @@ -1,6 +1,5 @@ package com.coderman.codemaker.service.invoker; -import com.coderman.codemaker.bean.plantuml.PlantUmlContextBean; import org.springframework.stereotype.Service; /** diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/ReturnBodyFactoryService.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/ReturnBodyFactoryService.java similarity index 86% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/ReturnBodyFactoryService.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/ReturnBodyFactoryService.java index 1ce5d1ddfb1171912ac09db290f6ce519e970c31..d6c4abfab40877a9ed69a3a7e2e4ac36f2db8b21 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/ReturnBodyFactoryService.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/ReturnBodyFactoryService.java @@ -41,12 +41,13 @@ public class ReturnBodyFactoryService { return; } - if(invokeBean.getInvokerMethodBean().wrapperResultDataDto()){ - returnClassValue = "return ResultDataDto.success("+returnClassValue+");"; + if(!invokeBean.getInvokerMethodBean().wrapperResultDataDto()){ + returnClassValue = "return "+ returnClassValue+";"; } else if(invokeBean.getInvokerMethodBean().wrapperResultDto()){ - returnClassValue = "return ResultDto.success();"; + String returnClassName = invokeBean.getInvokerMethodBean().getReturnClass().split("<")[0]; + returnClassValue = "return " + returnClassName + ".success("+returnClassValue+");"; }else { returnClassValue = "return "+returnClassValue+";"; } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/AppHttpInvokeHandler.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/AppHttpInvokeHandler.java similarity index 99% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/AppHttpInvokeHandler.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/AppHttpInvokeHandler.java index 72d24acd3f6b81c95b8f6f9b0680c331916ceb82..0e57132b165477e3bee5730ab4cdeae23284a394 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/AppHttpInvokeHandler.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/AppHttpInvokeHandler.java @@ -8,7 +8,6 @@ import com.coderman.codemaker.bean.plantuml.MethodBean; 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; diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/AppRpcInvokeHandler.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/AppRpcInvokeHandler.java similarity index 96% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/AppRpcInvokeHandler.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/AppRpcInvokeHandler.java index 07b1d592688bd2fe4f701736bc8b39b25a2023cf..6a54cbacb646c0dcd1abd03e7f0fc8c3ac2ac6ec 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/AppRpcInvokeHandler.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/AppRpcInvokeHandler.java @@ -9,9 +9,7 @@ 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.Optional; /** @@ -84,13 +82,8 @@ public class AppRpcInvokeHandler implements InvokeHandler { invokeBean.getInvokerClassBean().getDynamicImportPackageList().add(bodtoConvertInterfaceBean.getPackageName()+"."+bodtoConvertInterfaceBean.getClassName()); } else { - invokeBean.getInvokerMethodBean().getInvokeMethodList().add(invokeBean.getCurrentInvokeRowContent()); + invokeBean.getInvokerMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(),invokeBean.getCurrentInvokeRowBean()); } - - - - - } } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/DomainInvokeHandler.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/DomainInvokeHandler.java similarity index 96% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/DomainInvokeHandler.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/DomainInvokeHandler.java index 32879f90c0a2717b8ee4ef7d86fbfdd61c8477f5..123d28c981a14d2f6e97011cb6cd5c31f8af5561 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/DomainInvokeHandler.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/DomainInvokeHandler.java @@ -12,9 +12,7 @@ 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; -import java.util.ArrayList; import java.util.Optional; /** @@ -112,7 +110,8 @@ public class DomainInvokeHandler implements InvokeHandler { } } else { - invokeBean.getInvokerMethodBean().getInvokeMethodList().add(invokeBean.getCurrentInvokeRowContent()); + invokeBean.getInvokerMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(),invokeBean.getCurrentInvokeRowBean()); + //invokeBean.getInvokerMethodBean().getInvokeMethodList().add(invokeBean.getCurrentInvokeRowContent()); } //对当前调用行背后的相关变量做潜在的对象类型转换，进一步降低书写对象转换的频率 diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/DynamicConvertHandler.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/DynamicConvertHandler.java similarity index 97% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/DynamicConvertHandler.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/DynamicConvertHandler.java index 36a9b66add991893ae83ce6e377e1f4034905cef..47e872598b48610699c0a8e8665c012a97dc7ebd 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/DynamicConvertHandler.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/DynamicConvertHandler.java @@ -12,6 +12,7 @@ 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.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -41,6 +42,9 @@ public class DynamicConvertHandler implements InvokeHandler { @Override public void dealInvoke(InvokeContextBean invokeBean) { List invokeRowBeanList = invokeBean.getInvokerMethodBean().getInvokeRowBeanList(); + if(CollectionUtils.isEmpty(invokeRowBeanList)){ + return; + } InvokeRowBean invokeRowBean = invokeRowBeanList.get(invokeRowBeanList.size()-1); if(!providerIsReadMapper(invokeBean) || invokeRowBean.getProviderClassName().toLowerCase().endsWith(TemplateFileEnum.CONVERT.getTempFileName())){ diff --git a/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/InfrastInvokeHandler.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/InfrastInvokeHandler.java new file mode 100644 index 0000000000000000000000000000000000000000..49d8ab2aaee1c0be943977ace07f5c9e5964ce1c --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/invoker/handler/InfrastInvokeHandler.java @@ -0,0 +1,185 @@ +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.AbstractClassBean; +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.service.invoker.ConvertInvokeService; +import com.coderman.codemaker.service.invoker.InvokeHandler; +import com.coderman.codemaker.service.invoker.MethodInvokeService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.support.AbstractApplicationContext; +import org.springframework.stereotype.Service; + +import java.lang.reflect.Method; +import java.util.ArrayList; + +/** + * Description:基础设施层infrast调用方 方法绘制处理器 + * date: 2021/10/21 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +@Service(value = "infrastInvokeHandler") +@Slf4j +public class InfrastInvokeHandler implements InvokeHandler { + @Autowired + private MethodInvokeService methodInvokeService; + + @Autowired + private ConvertInvokeService convertInvokeService; + + @Override + public void dealInvoke(InvokeContextBean invokeBean) { + if (invokeBean.getInvokeSceneType().equals(InvokeSceneTypeEnum.INFRAST_TO_SELF.getCode())) { + invokeBean.getInvokerMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(), invokeBean.getCurrentInvokeRowBean()); + } else if (invokeBean.getInvokeSceneType().equals(InvokeSceneTypeEnum.INFRAST_TO_API.getCode())) { + + //手动构建转换类 + buildConvertInterface(invokeBean); + //注册被调用方的field + methodInvokeService.registField(invokeBean.getInvokerClassBean(), invokeBean.getProviderClassBean(), "Reference"); + //注册被调用方的方法返回值引用包 + methodInvokeService.registImportPackageByClass(invokeBean.getInvokerClassBean(), invokeBean.getPlantUmlContextBean(), invokeBean.getProviderClassMethod().getReturnClass()); + + + } + } + + + /** + * 构建infrast层的converter + * + * @param invokeBean + */ + private void buildConvertInterface(InvokeContextBean invokeBean) { + //引入注解包-这里先写死，后续再优化 + invokeBean.getInvokerClassBean().addImportClass("org.apache.dubbo.config.annotation.Reference"); + String interfaceName = invokeBean.getProviderClassBean().getClassName() + .replace("Facade", "") + .replace("Operation", "") + .replace("Api", "") + .replace("Service", "") + .replace("SPI", "") + .replace("Query", "") + "ConvertorDTO"; + InterfaceBean convertInterface = invokeBean.getPlantUmlContextBean().getDerivedPlantUmlContextBean().getInterfaceBeanMap().get(interfaceName); + if (convertInterface == null) { + convertInterface = new InterfaceBean(); + convertInterface.setPlantUMLPackage("infrast.acl"); + convertInterface.setPackageName(invokeBean.getInvokerClassBean().getPackageName() + ".convert"); + convertInterface.setClassName(interfaceName); + convertInterface.setMethodBeanList(new ArrayList<>()); + invokeBean.getPlantUmlContextBean().getDerivedPlantUmlContextBean().getInterfaceBeanMap().put(interfaceName, convertInterface); + } + //处理请求参数转换 + dealRequestParamConvert(invokeBean, convertInterface); + + //处理响应参数转换 + dealResponseParamConvert(invokeBean, convertInterface); + } + + /** + * 构建需要引入的包 + * + * @param genericReturnType + * @return + */ + private String getSimpleReturnClass(String genericReturnType) { + String[] arr = genericReturnType.split("<"); + return arr[arr.length - 1].replace(">", ""); + } + + + /** + * 处理防腐层调用外部组件需要的请求参数转换 + * + * @param invokeBean + * @param convertInterface + */ + private void dealRequestParamConvert(InvokeContextBean invokeBean, InterfaceBean convertInterface) { + MethodBean requestConvertMethod = convertInvokeService.getDTO2DTOConvertMethodParamRequest(invokeBean); + if (requestConvertMethod != null) { + convertInterface.getMethodBeanList().add(requestConvertMethod); + convertInterface.addImportClass(invokeBean.getProviderClassMethod().getGenericParamList().get(0)); + //引入convert接口 + invokeBean.getInvokerClassBean().addImportClass(convertInterface.getPackageName() + "." + convertInterface.getClassName().replace("DTO", "")); + + //引入下游接口的参数类和返回类型 + invokeBean.getInvokerClassBean().addImportClass(getSimpleReturnClass(invokeBean.getProviderClassMethod().getGenericReturnType())); + //这里将转换方法的入参与调用方的参数融合一起 + InvokeRowBean requestConvertRowBean = convertInvokeService.buildInvokeConvertRow(invokeBean, requestConvertMethod, convertInterface.getClassName().replace("DTO", "")); + String paramTypeStr = requestConvertRowBean.getProviderMethodParamTypeArr()[0]; + String paramType = paramTypeStr.split(" ")[0]; + if (paramType.contains(".")) { + String[] arr = paramType.split("\\."); + String paramTypex = arr[arr.length - 1]; + ClassBean classBean = invokeBean.getPlantUmlContextBean().getDerivedPlantUmlContextBean().getClassBeanMap().get(paramTypex); + if (classBean == null) { + classBean = invokeBean.getPlantUmlContextBean().getDerivedPlantUmlContextBean().getClassBeanMap().get(paramTypex + "acl"); + } + if ((classBean.getPackageName() + "." + classBean.getClassName().replace("acl", "")).equals(paramType)) { + requestConvertRowBean.getProviderMethodParamValueArr()[0] = invokeBean.getInvokerMethodBean().getParamArr()[0].split(" ")[1]; + } + } else { + + } + + String convertRow = requestConvertRowBean.buildInvokeContent(); + + //1.增加转换代码行 + invokeBean.getInvokerMethodBean().addInvokeRowContent(convertRow, requestConvertRowBean); + //2.增加当前被调用的代码行 + //invokeBean.getInvokerMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(),invokeBean.getCurrentInvokeRowBean()); + //3.刷新转换的代码行 + String currentInvokeRowContent = invokeBean.getCurrentInvokeRowBean().refreshInvokeContent(requestConvertRowBean, invokeBean.getPlantUmlContextBean()); + + //4.重新增加 + invokeBean.getInvokerMethodBean().addInvokeRowContent(currentInvokeRowContent, invokeBean.getCurrentInvokeRowBean()); + } + else { + invokeBean.getInvokerMethodBean().addInvokeRowContent(invokeBean.getCurrentInvokeRowContent(), invokeBean.getCurrentInvokeRowBean()); + } + } + + /** + * 处理防腐层调用外部组件需要的响应参数转换 + * + * @param invokeBean + * @param convertInterface + */ + private void dealResponseParamConvert(InvokeContextBean invokeBean, InterfaceBean convertInterface) { + //对调用返回值构建mp转换方法 + MethodBean responseConvertMethod = convertInvokeService.getDTO2DTOConvertMethodParamResponse(invokeBean); + if (responseConvertMethod == null) { + return; + } + //引入convert接口 + invokeBean.getInvokerClassBean().addImportClass(convertInterface.getPackageName() + "." + convertInterface.getClassName().replace("DTO", "")); + + convertInterface.getMethodBeanList().add(responseConvertMethod); + + String invokeMethodReturnClass = invokeBean.getInvokerMethodBean().getReturnClass(); + if (invokeMethodReturnClass.contains("<")) { + String[] invokeMethodReturnClassArr = invokeMethodReturnClass.split("<"); + invokeMethodReturnClass = invokeMethodReturnClassArr[invokeMethodReturnClassArr.length - 1].replace(">", ""); + } + ClassBean classBean = invokeBean.getPlantUmlContextBean().getDerivedPlantUmlContextBean().getClassBeanMap().get(invokeMethodReturnClass); + if (classBean == null) { + classBean = invokeBean.getPlantUmlContextBean().getDerivedPlantUmlContextBean().getClassBeanMap().get(invokeMethodReturnClass + "acl"); + } + + convertInterface.addImportClass(classBean.getPackageName() + "." + invokeMethodReturnClass); + + InvokeRowBean responseConvertRowBean = convertInvokeService.buildInvokeConvertRow(invokeBean, responseConvertMethod, convertInterface.getClassName().replace("DTO", "")); + String responseConvertRow = responseConvertRowBean.buildInvokeContent(); + //1.增加转换代码行 + invokeBean.getInvokerMethodBean().addInvokeRowContent(responseConvertRow, responseConvertRowBean); + + } +} diff --git a/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/packageimport/PackageImportService.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/packageimport/PackageImportService.java new file mode 100644 index 0000000000000000000000000000000000000000..9393aa35b9a845e054aa8a7bf68b515fb072d65e --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/packageimport/PackageImportService.java @@ -0,0 +1,53 @@ +package com.coderman.codemaker.service.packageimport; + +import com.coderman.codemaker.bean.GlobalConstant; +import com.coderman.codemaker.component.CompPropReadService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; + +/** + * Description: + * date: 2021/11/24 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +@Service +@Slf4j +public class PackageImportService { + + @Autowired + private CompPropReadService compPropReadService; + + /** + * 读取class-dependency.properties配置的包依赖 + * @return + */ + public Map getSystemImportPackageConfig(){ + Map importPackage = new HashMap<>(); + + try { + Properties properties = compPropReadService.readPropertiesFile(GlobalConstant.CLASS_IMPORT_FILE); + if(properties == null){ + return importPackage; + } + if(properties.isEmpty()){ + return importPackage; + } + for (Map.Entry entry : properties.entrySet()) { + importPackage.put(entry.getKey().toString(),entry.getValue().toString()); + } + } catch (IOException e) { + log.error("读取自定义类导入包失败",e); + } + return importPackage; + } + +} diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/plantuml/ReadDomainPlantDocService.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/plantuml/ReadDomainPlantDocService.java similarity index 91% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/plantuml/ReadDomainPlantDocService.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/plantuml/ReadDomainPlantDocService.java index 9749bb33b5cec4cd9840dddcb34f1d672fcae87e..6038dd969ca5a8ed2b86923dc38c6a1d97c7856d 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/plantuml/ReadDomainPlantDocService.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/plantuml/ReadDomainPlantDocService.java @@ -1,24 +1,18 @@ package com.coderman.codemaker.service.plantuml; -import com.alibaba.fastjson.JSON; import com.coderman.codemaker.bean.GlobalConstant; import com.coderman.codemaker.bean.plantuml.*; import com.coderman.codemaker.config.AppServiceConfig; import com.coderman.codemaker.enums.ClassEnum; import com.coderman.codemaker.enums.ClassRelationEnum; import com.coderman.codemaker.enums.VisibilityEnum; -import com.coderman.codemaker.service.plantuml.ReadPlantUMLDocService; -import com.coderman.codemaker.utils.StringCheckUtils; +import com.coderman.codemaker.utils.StringHandleUtils; import lombok.extern.slf4j.Slf4j; 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.*; /** @@ -115,10 +109,11 @@ public class ReadDomainPlantDocService { Set fieldSimpleNameSet = new HashSet<>(); fieldBeanList.forEach(fieldBean -> { fieldBean.buildFieldDetail(); - if(fieldNameSet.contains(fieldBean.getFieldName()) || fieldSimpleNameSet.contains(fieldBean.getFieldSimpleName())){ - log.error("属性重复,类名{},属性信息:{}",className, fieldBean.toString()); + if(fieldBean.isSimpleField()){ + if(fieldNameSet.contains(fieldBean.getFieldName()) || fieldSimpleNameSet.contains(fieldBean.getFieldSimpleName())){ + log.error("属性重复,类名{},属性信息:{}",className, fieldBean.toString()); + } } - fieldSimpleNameSet.add(fieldBean.getFieldSimpleName()); fieldNameSet.add(fieldBean.getFieldName()); }); @@ -197,7 +192,7 @@ public class ReadDomainPlantDocService { classBean.setClassName(classMetaInfoArr.split("-")[1].replace("\"","")); classBean.setClassDesc(classMetaInfoArr.split("-")[0].replace("\"","")); - if(StringCheckUtils.isContainChinese(classBean.getClassName())){ + if(StringHandleUtils.isContainChinese(classBean.getClassName())){ String className = classBean.getClassDesc(); classBean.setClassDesc(classBean.getClassName()); classBean.setClassName(className); @@ -224,7 +219,7 @@ public class ReadDomainPlantDocService { interfaceBean.setClassName(classMetaInfoArr.split("-")[1].replace("\"","")); interfaceBean.setClassDesc(classMetaInfoArr.split("-")[0].replace("\"","")); - if(StringCheckUtils.isContainChinese(interfaceBean.getClassName())){ + if(StringHandleUtils.isContainChinese(interfaceBean.getClassName())){ String className = interfaceBean.getClassDesc(); interfaceBean.setClassDesc(interfaceBean.getClassName()); interfaceBean.setClassName(className); @@ -251,7 +246,7 @@ public class ReadDomainPlantDocService { enumBean.setAuthor(appServiceConfig.getAuthor()); enumBean.setClassName(classMetaInfoArr.split("-")[1].replace("\"","")); enumBean.setClassDesc(classMetaInfoArr.split("-")[0].replace("\"","")); - if(StringCheckUtils.isContainChinese(enumBean.getClassName())){ + if(StringHandleUtils.isContainChinese(enumBean.getClassName())){ String className = enumBean.getClassDesc(); enumBean.setClassDesc(enumBean.getClassName()); enumBean.setClassName(className); @@ -280,6 +275,7 @@ public class ReadDomainPlantDocService { fieldBean.buildDesc(fieldArr[0]); fieldBean.setVisibility(VisibilityEnum.getVisibilityStr(fieldArr[0])); fieldBean.setFieldName(fieldArr[1]); + fieldBean.setOriginFieldStr(fieldStr); fieldBeanList.add(fieldBean); } return fieldBeanList; @@ -292,11 +288,22 @@ public class ReadDomainPlantDocService { */ private List getMethodBeanList(List elementList){ List methodBeanList = new ArrayList<>(); - for (String fieldStr : elementList){ + int extendIndex = 0; + + for (int i = 0;i < elementList.size();i ++){ + String fieldStr = elementList.get(i); + if(isExtendLine(fieldStr)){ + extendIndex = i; + } if(!fieldStr.contains("()") && !fieldStr.contains("(") && !fieldStr.contains(")")){ continue; } + MethodBean methodBean = new MethodBean(); + if(i > extendIndex && extendIndex > 0){ + methodBean.setModelExtendMethod(true); + } + if(fieldStr.contains(":")){ String[] fieldArr = fieldStr.trim().split(":"); methodBean.setVisibility(VisibilityEnum.getVisibilityStr(fieldArr[0])); @@ -322,8 +329,8 @@ public class ReadDomainPlantDocService { methodBean.setVisibility(VisibilityEnum.getVisibilityStr(fieldStr.trim())); methodBean.setReturnClass(fieldArr[1]); StringBuilder builder = new StringBuilder(); - for (int i = 2;i")[1].trim(); + AbstractClassBean invokerClassBean = getTargetClass(invokeArr[0], plantUmlContextBean,compName); + AbstractClassBean providerClassBean = getTargetClass(invokeArr[1], plantUmlContextBean,compName); if (invokerClassBean == null || providerClassBean == null) { log.error("获取调用者类名 或者提供者类名为空,绘制动态调用失败,invokeContent = {}", invokeContent); @@ -81,8 +88,11 @@ public class ReadInvokeSequencePlantDocService { String providerMethodStr = invokeArr[1].split(providerClassBean.getClassName() + ".")[1].trim(); - //如果被调用方的方法不在plantuml领域文档中，则根据方法名智能推导出一个方法走下面的流程 MethodBean providerMethodBean = methodFactoryService.buildDynamicMethod(plantUmlContextBean,providerClassBean,providerMethodStr); + if(providerMethodBean == null){ + log.error("获取调用者方法名失败,绘制动态调用失败,invokeContent = {}", invokeContent); + return; + } MethodBean invokerMethodBean = invokerClassBean.getOrAddMethodBean(invokerMethodStr); InvokeContextBean invokeBean = new InvokeContextBean(); invokeBean.setInvokerMethodBean(invokerMethodBean); @@ -90,8 +100,9 @@ public class ReadInvokeSequencePlantDocService { invokeBean.setInvokerMethod(invokerMethodStr); invokeBean.setProviderClassName(providerClassBean.getClassName()); invokeBean.setProviderClassMethod(providerMethodBean); - invokeBean.buildInvokeScene(invokerClassBean.getClassName(), providerClassBean.getClassName()); + invokeBean.buildInvokeSceneV2(invokeContent); invokeBean.setInvokerClassBean(invokerClassBean); + invokeBean.setProviderClassBean(providerClassBean); boolean result = plantUmlContextBean.addInvokeMethod(invokeBean); if (!result) { @@ -100,25 +111,37 @@ public class ReadInvokeSequencePlantDocService { //处理动态调用内容 methodInvokeHandler.dealInvokeContent(invokeBean); + //非静态方法注册为spring bean field + if(!providerMethodBean.isStatic()){ + //注册被调用方的field + methodInvokeHandler.registField(invokeBean.getInvokerClassBean(), providerClassBean,"Autowired"); + }else { + if(providerClassBean.getPackageName().contains(GlobalConstant.PACKAGE_$)){ + providerClassBean.setPackageName(providerClassBean.getPackageName().replace(GlobalConstant.PACKAGE_$,appServiceConfig.getPackage())); + } + if(providerClassBean.getPackageName().contains(providerClassBean.getClassName())){ + invokerClassBean.getDynamicImportPackageList().add(providerClassBean.getPackageName()); + }else { + invokerClassBean.getDynamicImportPackageList().add(providerClassBean.getPackageName()+"."+providerClassBean.getClassName()); + } + } - //注册被调用方的field - methodInvokeHandler.registField(invokerClassBean, providerClassBean); //注册被调用方的方法返回值引用包 - methodInvokeHandler.registImportPackageByClass(invokerClassBean, plantUmlContextBean, providerMethodBean.getReturnClass()); + methodInvokeHandler.registImportPackageByClass(invokeBean.getInvokerClassBean(), plantUmlContextBean, providerMethodBean.getReturnClass()); //更新plantumlcontext上下文 - refreshPlantUmlContext(invokerClassBean, plantUmlContextBean); + refreshPlantUmlContext(invokeBean.getInvokerClassBean(), plantUmlContextBean); } /** * 从调用描述中获取调用类或者被调用类 - * * @param invokerClassContent * @param plantUmlContextBean + * @param compName * @return */ - private AbstractClassBean getTargetClass(String invokerClassContent, PlantUmlContextBean plantUmlContextBean) { + private AbstractClassBean getTargetClass(String invokerClassContent, PlantUmlContextBean plantUmlContextBean,String compName) { AtomicReference abstractClassBean = new AtomicReference<>(); AtomicInteger size = new AtomicInteger(0); @@ -162,11 +185,73 @@ public class ReadInvokeSequencePlantDocService { return abstractClassBean.get(); } - return null; + //当前plantUMLcontext上下文中没有目标类名则从组件上下文中查找--->这里一般是infrast层调用其他外部服务 + ComponentContextBean componentContextBean = plantUmlContextBean.getCompContextBeanMap().get(compName); + if(componentContextBean != null){ + if (abstractClassBean.get() == null) { + List classBeanList = componentContextBean.getClassBeanList(); + search(abstractClassBean,classBeanList,contentArr,size); + } + + if (abstractClassBean.get() == null) { + List interfaceBeanList = componentContextBean.getInterfaceBeanList(); + search(abstractClassBean,interfaceBeanList,contentArr,size); + } + + if (abstractClassBean.get() != null) { + return abstractClassBean.get(); + } + } + + //如果指定组件名没有的话，则进行全组件map循环匹配 + for (Map.Entry entry : plantUmlContextBean.getCompContextBeanMap().entrySet()){ + if (abstractClassBean.get() != null) { + break; + } + if (abstractClassBean.get() == null) { + List classBeanList = entry.getValue().getClassBeanList(); + search(abstractClassBean,classBeanList,contentArr,size); + } + if (abstractClassBean.get() == null) { + List interfaceBeanList = entry.getValue().getInterfaceBeanList(); + search(abstractClassBean,interfaceBeanList,contentArr,size); + } + + if (abstractClassBean.get() == null) { + List enumBeanList = entry.getValue().getEnumBeanList(); + search(abstractClassBean,enumBeanList,contentArr,size); + } + } + + if (abstractClassBean.get() != null) { + return abstractClassBean.get(); + } + return null; } + /** + * 抽象公共类扫描方法 + * @param classBeanAtomicReference + * @param abstractClassBeans + * @param contentArr + * @param size + * @return + */ + private AtomicReference search(AtomicReference classBeanAtomicReference,List abstractClassBeans,String [] contentArr,AtomicInteger size){ + if(CollectionUtils.isEmpty(abstractClassBeans)){ + return classBeanAtomicReference; + } + for (AbstractClassBean abstractClassBean : abstractClassBeans){ + if(abstractClassBean.checkMatchClass(contentArr) && abstractClassBean.getClassName().length() > size.get()){ + classBeanAtomicReference.set(abstractClassBean); + size.set(abstractClassBean.getClassName().length()); + } + } + return classBeanAtomicReference; + } + /** diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/plantuml/ReadPlantUMLDocService.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/plantuml/ReadPlantUMLDocService.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/plantuml/ReadPlantUMLDocService.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/plantuml/ReadPlantUMLDocService.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/AbstractVarRegistry.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/AbstractVarRegistry.java similarity index 87% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/registry/AbstractVarRegistry.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/AbstractVarRegistry.java index 283b8aa091d40ca2dfc8a263e6e9de9119b754cb..a1c1759f1a53d2452e3c07d86b8428135f9990c8 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/AbstractVarRegistry.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/AbstractVarRegistry.java @@ -2,7 +2,7 @@ package com.coderman.codemaker.service.registry; import com.coderman.codemaker.app.dynamicddd.DomainElementHandler; import com.coderman.codemaker.bean.ColumnBean; -import com.coderman.codemaker.enums.TemplateFileEnum; +import com.coderman.codemaker.service.component.ComponentDecorateService; import com.coderman.codemaker.service.invoker.InvokeElementRegistService; import com.coderman.codemaker.service.invoker.InvokeSequenceService; import com.coderman.codemaker.app.dynamicddd.derivedhandler.*; @@ -25,7 +25,7 @@ import java.util.Map; /** * description: AbstractVarRegistry
- * date: 2020/7/7 9:56
+ * date: 2020/7/7
* author: coderman
* version: 1.0
*/ @@ -81,6 +81,10 @@ public abstract class AbstractVarRegistry { @Resource(name = "dynamicMapperElementHandler") private DomainElementHandler dynamicMapperElementHandler; + + @Resource(name = "cacheElementHandler") + private DomainElementHandler cacheElementHandler; + //------------------以下为领域元素派生类对象处理器 @Resource(name = "derivedDTOElementHandler") @@ -120,6 +124,14 @@ public abstract class AbstractVarRegistry { private DerivedInfrastAclImplElementHandler derivedInfrastAclImplElementHandler; + @Resource(name = "derivedFeignElementHandler") + private DerivedFeignElementHandler derivedFeignElementHandler; + + + @Resource(name = "derivedDTO2DTOConvertElementHandler") + private DerivedDTO2DTOConvertElementHandler derivedDTO2DTOConvertElementHandler; + + //------------------以下为动态调用处理服务 @Autowired private InvokeSequenceService invokeSequenceService; @@ -127,6 +139,12 @@ public abstract class AbstractVarRegistry { @Autowired private InvokeElementRegistService invokeElementRegistService; + //------------------以下为组件装饰处理服务 + @Autowired + private ComponentDecorateService componentDecorateService; + + + /** * 合并全局配置 * @return @@ -154,7 +172,9 @@ public abstract class AbstractVarRegistry { Map> columnBeanListMap = (Map>)varMap.get("columns"); - //varMap.put("package",appServiceConfig.getPackage()+".infrast"); + plantUmlContextBean.setAppName(appServiceConfig.getApplicationName()); + plantUmlContextBean.setApplicationType(appServiceConfig.getApplicationType()); + tableBeanMap.forEach((k,v)->{ ClassBean classBean = v.convertToClassBean(appServiceConfig.getPackage()+".infrast.dao.dataobject",columnBeanListMap.get(k)); @@ -164,8 +184,9 @@ public abstract class AbstractVarRegistry { }); - //注册内置工具类和方法 - invokeElementRegistService.registDefaultClass(plantUmlContextBean); + //这里统一注册派生类对象上下文，后续各种handler内部逻辑则不需要再判断是否为空了 + plantUmlContextBean.setDerivedPlantUmlContextBean(new PlantUmlContextBean()); + //打标 varMap.put("dynamicddd","dynamicddd"); @@ -184,6 +205,7 @@ public abstract class AbstractVarRegistry { MqConsumerElementBean mqConsumerElementBean = (MqConsumerElementBean)mqConsumerElementHandler.getElementBeanList(plantUmlContextBean); MqProducerElementBean mqProducerElementBean = (MqProducerElementBean)mqProducerElementHandler.getElementBeanList(plantUmlContextBean); MqHandlerElementBean mqHandlerElementBean = (MqHandlerElementBean)mqHandlerElementHandler.getElementBeanList(plantUmlContextBean); + CacheElementBean cacheElementBean = (CacheElementBean)cacheElementHandler.getElementBeanList(plantUmlContextBean); //处理派生类 @@ -199,12 +221,24 @@ public abstract class AbstractVarRegistry { GatawayImplElementBean gatawayImplElementBean = derivedGatawayImplElementHandler.getElementBeanList(plantUmlContextBean); RepositoryImplElementBean repositoryImplElementBean = derivedRepositoryImplElementHandler.getElementBeanList(plantUmlContextBean); InfrastAclImplElementBean infrastAclImplElementBean = derivedInfrastAclImplElementHandler.getElementBeanList(plantUmlContextBean); + FeignElementBean feignElementBean = derivedFeignElementHandler.getElementBeanList(plantUmlContextBean); + + + + //进行框架中间件和组件的包装和注册 + componentDecorateService.decorateComponent(plantUmlContextBean); + + //注册独立类和工具 + invokeElementRegistService.registDefaultClass(plantUmlContextBean); //最后进行动态调用绘制 invokeSequenceService.exeDynamicInvoke(plantUmlContextBean); //这里增加动态mapper的代码生成，补足调用时序图中缺失的方法 DynamicMapperElementBean dynamicMapperElementBean = (DynamicMapperElementBean)dynamicMapperElementHandler.getElementBeanList(plantUmlContextBean); + //在动态调用绘制之后进行处理，比较特殊 + Dto2DtoConvertElementBean dto2DtoConvertElementBean = derivedDTO2DTOConvertElementHandler.getElementBeanList(plantUmlContextBean); + varMap.put("domainevent",domainEventElementBean.getClassBeanList()); @@ -224,10 +258,12 @@ public abstract class AbstractVarRegistry { varMap.put("mqproducer",mqProducerElementBean.getClassBeanList()); varMap.put("mqconsumer",mqConsumerElementBean.getClassBeanList()); varMap.put("mqhandler",mqHandlerElementBean.getClassBeanList()); + varMap.put("cache",cacheElementBean.getClassBeanList()); //处理派生类 varMap.put("derivedto",dtoElementBean.getClassBeanList()); varMap.put("derivefacade",facadeElementBean.refreshInterface(plantUmlContextBean,DomainDerivedElementEnum.FACADE.getElement()).getInterfaceBeanList()); + varMap.put("derivefeign",feignElementBean.refreshInterface(plantUmlContextBean,DomainDerivedElementEnum.FEIGN.getElement()).getInterfaceBeanList()); varMap.put("derivefacadeimpl",facadeImplElementBean.refreshClass(plantUmlContextBean, DomainDerivedElementEnum.FACADE_IMPL.getElement()).getClassBeanList()); varMap.put("dtoboconvert",dtoBoConvertElementBean.getInterfaceBeanList()); varMap.put("doboconvert",doBoConvertElementBean.getInterfaceBeanList()); @@ -240,6 +276,7 @@ public abstract class AbstractVarRegistry { varMap.put("infrastaclimpl",infrastAclImplElementBean.refreshClass(plantUmlContextBean, DomainElementEnum.ADAPTER_ACL_IMPL.getElement()).getClassBeanList()); varMap.put("dynamicmapper",dynamicMapperElementBean.getInterfaceBeanList()); varMap.put("dynamicmapperxml",dynamicMapperElementBean.getClassBeanList()); + varMap.put("convertdto2dto",dto2DtoConvertElementBean.getInterfaceBeanList()); return varMap; } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/ApplicationPropertiesVarRegistry.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/ApplicationPropertiesVarRegistry.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/ApplicationPropertiesVarRegistry.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/ApplicationPropertiesVarRegistry.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/BaseControllerVarRegistry.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/BaseControllerVarRegistry.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/BaseControllerVarRegistry.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/BaseControllerVarRegistry.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/ControllerVarRegistry.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/ControllerVarRegistry.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/ControllerVarRegistry.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/ControllerVarRegistry.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/DynamicDDDVarRegistry.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/DynamicDDDVarRegistry.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/DynamicDDDVarRegistry.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/DynamicDDDVarRegistry.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/EntityVarRegistry.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/EntityVarRegistry.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/EntityVarRegistry.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/EntityVarRegistry.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/MapperVarRegistry.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/MapperVarRegistry.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/MapperVarRegistry.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/MapperVarRegistry.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/MapperXmlVarRegistry.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/MapperXmlVarRegistry.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/MapperXmlVarRegistry.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/MapperXmlVarRegistry.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/PomVarRegsitry.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/PomVarRegsitry.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/PomVarRegsitry.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/PomVarRegsitry.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/ServiceImplVarRegistry.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/ServiceImplVarRegistry.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/ServiceImplVarRegistry.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/ServiceImplVarRegistry.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/ServiceVarRegistry.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/ServiceVarRegistry.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/ServiceVarRegistry.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/ServiceVarRegistry.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/SpringApplicationContextVarRegistry.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/SpringApplicationContextVarRegistry.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/SpringApplicationContextVarRegistry.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/SpringApplicationContextVarRegistry.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/TestVarRegistry.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/TestVarRegistry.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/TestVarRegistry.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/TestVarRegistry.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/VoVarRegistry.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/VoVarRegistry.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/VoVarRegistry.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/registry/element/VoVarRegistry.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/template/FreemarkerService.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/template/FreemarkerService.java similarity index 73% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/template/FreemarkerService.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/template/FreemarkerService.java index 981cd240316e241b7eec3dd828991c1599f2ae4e..d301fc87a5ddbe8380e958fbd9596a8d80a69e0c 100644 --- a/codemaker-core/src/main/java/com/coderman/codemaker/service/template/FreemarkerService.java +++ b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/template/FreemarkerService.java @@ -1,5 +1,6 @@ package com.coderman.codemaker.service.template; +import com.coderman.codemaker.bean.GlobalConstant; import com.coderman.codemaker.config.AppServiceConfig; import com.coderman.codemaker.utils.FreemarkerUtils; import org.apache.commons.lang3.StringUtils; @@ -64,4 +65,26 @@ public class FreemarkerService { return FreemarkerUtils.parseTpl(dynamicDDDPath+viewName, params); } + + /** + * 根据不同应用类型获取不同应用代码的模板生成代码类 + * + * @param viewName + * @param params + * @return + */ + public String parseTplApi(String viewName, Map params) { + return FreemarkerUtils.parseTpl("api/"+viewName, params); + } + + /** + * + * 生成初始化的独立工具类如aop,baseevent,applicaton等 + * @param viewName + * @param params + * @return + */ + public String parseTplCommon(String viewName, Map params) { + return FreemarkerUtils.parseTpl(GlobalConstant.SINGLE_CLASS_COMMON+"/"+viewName, params); + } } diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/template/TemlateVarService.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/template/TemlateVarService.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/template/TemlateVarService.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/template/TemlateVarService.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/service/write/WriteSpringbootService.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/write/WriteSpringbootService.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/service/write/WriteSpringbootService.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/service/write/WriteSpringbootService.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/utils/Constant.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/utils/Constant.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/utils/Constant.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/utils/Constant.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/utils/FreeMarkerUtil.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/utils/FreeMarkerUtil.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/utils/FreeMarkerUtil.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/utils/FreeMarkerUtil.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/utils/FreemarkerUtils.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/utils/FreemarkerUtils.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/utils/FreemarkerUtils.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/utils/FreemarkerUtils.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/utils/ResultDto.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/utils/ResultDto.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/utils/ResultDto.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/utils/ResultDto.java diff --git a/codemaker-core/src/main/java/com/coderman/codemaker/utils/SpringContextHolder.java b/codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/utils/SpringContextHolder.java similarity index 100% rename from codemaker-core/src/main/java/com/coderman/codemaker/utils/SpringContextHolder.java rename to codemaker-parent/codemaker-core/src/main/java/com/coderman/codemaker/utils/SpringContextHolder.java diff --git a/codemaker-core/src/main/resources/template-ext/data-factory/model.txt b/codemaker-parent/codemaker-core/src/main/resources/api-json/readme similarity index 100% rename from codemaker-core/src/main/resources/template-ext/data-factory/model.txt rename to codemaker-parent/codemaker-core/src/main/resources/api-json/readme diff --git a/codemaker-core/src/main/resources/application.properties b/codemaker-parent/codemaker-core/src/main/resources/application.properties similarity index 62% rename from codemaker-core/src/main/resources/application.properties rename to codemaker-parent/codemaker-core/src/main/resources/application.properties index ae7b980599e75b21964baa289586e651900f935c..b68ab2288df4a45c06bf6503f1a8460ac264e23b 100644 --- a/codemaker-core/src/main/resources/application.properties +++ b/codemaker-parent/codemaker-core/src/main/resources/application.properties @@ -32,12 +32,23 @@ mybatis.mapper-locations=classpath:mapper/*.xml #配置模型路径 mybatis.type-aliases-package=com.coderman.codemaker.bean spring.application.name=codemaker -#生成的应用类型，支持springboot,dubbo,cola +#生成的应用类型，支持springboot,dubbo,cola,springcloud application.type=cola + #目标应用根包名称 application.global.package=com.coderman.infosys.auth #作者 application.global.author=shenshuai -#接口方法返回声明需要依赖的包信息，适配实现 -application.global.package.adapterbean=defaultClazzWrapperImpl \ No newline at end of file + +#组件化需要的maven repository本地路径,用来扫描依赖的组件jar包 +application.maven.repo.path=jar:file:///Users/shenshuia/.m2/repository + +#代码生成需要的全局组件，框架中间件可以放到全局组件依赖配置里,类似于脚手架,或者自己封装的业务组件框架 +application.component.scan.config=dubbo,spring-web,openfeign + +#自定义的组件扫描bean,defaultCompScanService为codeMaker默认实现支持全局组件的配置，开发者可以参考进行自定义扫描组件实现替代掉默认的 +application.component.scan.bean=defaultCompScanService + +#自定义的组件装饰bean,defaultCompDecorateService默认实现支持全局组件的装饰，开发者可以参考进行自定义扫描组件实现替代掉默认的 +application.component.decorate.bean=defaultCompDecorateService diff --git a/codemaker-parent/codemaker-core/src/main/resources/class-import.properties b/codemaker-parent/codemaker-core/src/main/resources/class-import.properties new file mode 100644 index 0000000000000000000000000000000000000000..6d0f1f80dc66674e0486e86dc3b2be0aced416e9 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/class-import.properties @@ -0,0 +1,4 @@ +ResultDataDto=com.coderman.utils.response.ResultDataDto +ResultDto=com.coderman.utils.response.ResultDto +PageDTO=com.coderman.utils.response.PageDTO +PageVO=com.coderman.utils.response.PageVO \ No newline at end of file diff --git a/codemaker-parent/codemaker-core/src/main/resources/component/apiresult/apiresult.properties b/codemaker-parent/codemaker-core/src/main/resources/component/apiresult/apiresult.properties new file mode 100644 index 0000000000000000000000000000000000000000..67182949726e9cfdfbb09c8cd0870b707a141bbe --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/component/apiresult/apiresult.properties @@ -0,0 +1,9 @@ +#Generated by Maven +#Fri Sep 20 00:50:48 CST 2019 +version=1.0.4 +groupId=com.coderman.utils +artifactId=coderman-utils +class1=com.coderman.utils.response.ResultDataDto +class2=com.coderman.utils.response.ResultDto +class5=com.coderman.utils.response.PageDTO +class4=com.coderman.utils.response.PageVO \ No newline at end of file diff --git a/codemaker-parent/codemaker-core/src/main/resources/component/dubbo/dubbo.properties b/codemaker-parent/codemaker-core/src/main/resources/component/dubbo/dubbo.properties new file mode 100644 index 0000000000000000000000000000000000000000..e2089578210eb1c97a85a15c601aaf5127ac47e3 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/component/dubbo/dubbo.properties @@ -0,0 +1,13 @@ +#Generated by Maven +#Fri Sep 20 00:50:48 CST 2019 +version=2.7.3 +groupId=org.apache.dubbo +artifactId=dubbo +packageName=org.apache.dubbo.config.annotation +compSite=https://dubbo.apache.org/zh/ +compDesc=Apache Dubbo ????????????????? +annotation1=Service +annotation2=Reference + + + diff --git a/codemaker-parent/codemaker-core/src/main/resources/component/hutool-core/hutool-core.properties b/codemaker-parent/codemaker-core/src/main/resources/component/hutool-core/hutool-core.properties new file mode 100644 index 0000000000000000000000000000000000000000..3819e9e3a847eb91093ac775ea0647db3f5364e9 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/component/hutool-core/hutool-core.properties @@ -0,0 +1,11 @@ +#Generated by Maven +#Fri Sep 20 00:50:48 CST 2019 +version=5.3.10 +groupId=cn.hutool +artifactId=hutool-core +serviceName=hutool +packageName=cn.hutool.core.map +compType=tool +compSite=https://www.hutool.cn/ +compDesc=Hutool???Java??????????????????????????XML?JDK???????????Util???. + diff --git a/codemaker-parent/codemaker-core/src/main/resources/component/infosysuser/infosysuser.properties b/codemaker-parent/codemaker-core/src/main/resources/component/infosysuser/infosysuser.properties new file mode 100644 index 0000000000000000000000000000000000000000..9241195a93ec5c6c0072d75b03e7a0f706970493 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/component/infosysuser/infosysuser.properties @@ -0,0 +1,9 @@ +#Generated by Maven +#Fri Sep 20 00:50:48 CST 2019 +groupId=com.coderman.infosys.plat.user +artifactId=user-client +version=1.1-SNAPSHOT +serviceName=infosysuser +compType=dubbo-api +packageName=com.coderman.infosys.user.api.facade +interface1=DepartmentQueryFacade diff --git a/codemaker-parent/codemaker-core/src/main/resources/component/openfeign/openfeign.properties b/codemaker-parent/codemaker-core/src/main/resources/component/openfeign/openfeign.properties new file mode 100644 index 0000000000000000000000000000000000000000..42df8b70f0615058add96bc60119ff28456b97c7 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/component/openfeign/openfeign.properties @@ -0,0 +1,7 @@ +#Generated by Maven +#Fri Sep 20 00:50:48 CST 2019 +version=2.2.1.RELEASE +groupId=org.springframework.cloud +artifactId=spring-cloud-openfeign-core +packageName=org.springframework.cloud.openfeign +annotation1=FeignClient \ No newline at end of file diff --git a/codemaker-core/src/main/resources/template-ext/readme.txt b/codemaker-parent/codemaker-core/src/main/resources/component/readme similarity index 100% rename from codemaker-core/src/main/resources/template-ext/readme.txt rename to codemaker-parent/codemaker-core/src/main/resources/component/readme diff --git a/codemaker-parent/codemaker-core/src/main/resources/component/singleClass/AppEventPublisher.properties b/codemaker-parent/codemaker-core/src/main/resources/component/singleClass/AppEventPublisher.properties new file mode 100644 index 0000000000000000000000000000000000000000..5da6b847b8245e3b88926cd1e9f03241ba7d7d6e --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/component/singleClass/AppEventPublisher.properties @@ -0,0 +1,3 @@ +packageName=${package}.domain.support.utils +classType=class +method1=void publish(T t) \ No newline at end of file diff --git a/codemaker-parent/codemaker-core/src/main/resources/component/singleClass/SpringApplicationContext.properties b/codemaker-parent/codemaker-core/src/main/resources/component/singleClass/SpringApplicationContext.properties new file mode 100644 index 0000000000000000000000000000000000000000..851fed9c14e58826a896709cd8319d51e0e8d204 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/component/singleClass/SpringApplicationContext.properties @@ -0,0 +1,4 @@ +packageName=${package}.domain.support.utils +classType=class +method1=static Object getBean(String beanName) +method2=void setBeanFactory(BeanFactory beanFactory) \ No newline at end of file diff --git a/codemaker-parent/codemaker-core/src/main/resources/component/spring-web/spring-web.properties b/codemaker-parent/codemaker-core/src/main/resources/component/spring-web/spring-web.properties new file mode 100644 index 0000000000000000000000000000000000000000..5914934c44149dbba8af513406f9e9b125581298 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/component/spring-web/spring-web.properties @@ -0,0 +1,13 @@ +#Generated by Maven +#Fri Sep 20 00:50:48 CST 2019 +version=5.2.7 +groupId=org.springframework +artifactId=spring-web +packageName=org.springframework.web.bind.annotation +annotation1=RestController +annotation2=GetMapping +annotation3=PostMapping +annotation4=RequestBody +annotation5=RequestMapping +annotation6=RequestParam + diff --git a/codemaker-parent/codemaker-core/src/main/resources/component/springboot/springboot.properties b/codemaker-parent/codemaker-core/src/main/resources/component/springboot/springboot.properties new file mode 100644 index 0000000000000000000000000000000000000000..7efe2bc036fa4d0d1f9159a3e64252c4cf6fcaff --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/component/springboot/springboot.properties @@ -0,0 +1,11 @@ +#Generated by Maven +#Fri Sep 20 00:50:48 CST 2019 +version=1.2.61 +groupId=com.alibaba +artifactId=fastjson +packageName=com.alibaba.fastjson +class1=JSON +class2=com.alibaba.fastjson.spi.Module + + + diff --git a/codemaker-core/src/main/resources/ddd-plantuml/infosys-auth/CommonAuth.puml b/codemaker-parent/codemaker-core/src/main/resources/ddd-plantuml/infosys-auth/CommonAuth.puml similarity index 100% rename from codemaker-core/src/main/resources/ddd-plantuml/infosys-auth/CommonAuth.puml rename to codemaker-parent/codemaker-core/src/main/resources/ddd-plantuml/infosys-auth/CommonAuth.puml diff --git a/codemaker-core/src/main/resources/ddd-plantuml/infosys-auth/CommonAuthWithPackage.puml b/codemaker-parent/codemaker-core/src/main/resources/ddd-plantuml/infosys-auth/CommonAuthWithPackage.puml similarity index 100% rename from codemaker-core/src/main/resources/ddd-plantuml/infosys-auth/CommonAuthWithPackage.puml rename to codemaker-parent/codemaker-core/src/main/resources/ddd-plantuml/infosys-auth/CommonAuthWithPackage.puml diff --git a/codemaker-core/src/main/resources/ddd-plantuml/infosys-auth/auth-domain.puml b/codemaker-parent/codemaker-core/src/main/resources/ddd-plantuml/infosys-auth/auth-domain.puml similarity index 100% rename from codemaker-core/src/main/resources/ddd-plantuml/infosys-auth/auth-domain.puml rename to codemaker-parent/codemaker-core/src/main/resources/ddd-plantuml/infosys-auth/auth-domain.puml diff --git a/codemaker-parent/codemaker-core/src/main/resources/ddd-plantuml/infosys-auth/auth-domainV2.puml b/codemaker-parent/codemaker-core/src/main/resources/ddd-plantuml/infosys-auth/auth-domainV2.puml new file mode 100644 index 0000000000000000000000000000000000000000..979a649e31d4aad5b172393ef27b081c0930f6b2 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/ddd-plantuml/infosys-auth/auth-domainV2.puml @@ -0,0 +1,241 @@ +@startuml + + +package domain.bo { + class "操作人信息-OperatorBO" as OperatorBO{ + +创建时间:Date dateCreate + +创建人:Long createUserId + } + + class "操作时间信息-OperateDateBO" as OperateDateBO{ + +修改时间:Date dateUpdate + +修改人:Long updateUserId + } + + class "数据操作信息-BasicOperateBO" as BasicOperateBO{ + +修改时间:Date dateUpdate + +创建时间:Date dateCreate + +修改人:Long updateUserId + +创建人:Long createUserId + } + + class "系统-SystemBO" as SystemBO{ + 系统名称:String systemName + 系统标示:String systemCode + 系统域名:String systemUrl + 系统图标:String systemPicUrl + 系统技术负责人:Long tecAdminUserId + 系统业务负责人:Long busAdminUserId + 系统当前所在部门:Long departmentId + 系统模块列表:List moduleBOList + .. extend info .. + tableKey:String system + facadeKey:String SystemFacade + dtoKeyList:String SystemDTO,CreateSystemRequestDTO,UpdateSystemRequestDTO + voKeyList:String CreateSystemRequestVO,UpdateSystemRequestVO,SystemVO + controllerKey:String SystemController + contextKey:String system + queryDtoKey:SystemQueryDTO String systemName,String systemCode,Long departmentId, Date startDate,Date endDate + queryVoKey:SystemQueryVO String systemName,String systemCode,Long departmentId, Date startDate,Date endDate + 注册系统: SystemDTO registSystem(SystemDTO systemDTO) + 分页获取系统: PageDTO getPageList(PageDTO pageDto) + 获取单条系统: SystemDTO getBySystemCode(String systemCode) + 修改系统: Boolean updateSystem(UpdateSystemRequestDTO dto) + 搜索获取系统: List getSearchList(String search) + + 分页获取系统/system/pagelist: PageVO getPageList(SystemVO systemVO) + 搜索获取系统/system/search: List getSearchList(String search) + 新建系统/system/save: SystemVO saveSystem(CreateSystemRequestVO systemVO) + 修改系统/system/update: Boolean updateSystem(UpdateSystemRequestVO systemVO) + 通过系统编号获取系统/system/getbycode: SystemVO getByCode(String systemCode) + } + + class "菜单/模块-ModuleBO" as ModuleBO{ + 菜单名称:String moduleName + 菜单编码:String moduleCode + 菜单链接:String moduleUrl + 系统标示:String systemCode + 按钮列表:List menuBOList + .. extend info .. + tableKey:String module + facadeKey:String ModuleFacade + controllerKey:String ModcreateMenuuleController + dtoKeyList:String UpdateModuleRequestDTO,ModuleResponseDTO,CreateModuleRequestDTO + voKeyList:String ModuleVO,UpdateModuleRequestVO,CreateModuleRequestVO + contextKey:String system + 创建菜单/module/createmodule: List createModule(CreateModuleRequestVO createRequest) + 创建菜单/module/updatemodule: List updateModule(UpdateModuleRequestVO updateRequest) + 获取系统菜单列表/module/getbysystemcode: List getBySystemCode(String systemCode) + 获取菜单/module/getbycode: ModuleVO getByModuleCode(String moduleCode) + 分页获取菜单/module/pagelist: PageVO getPageList() + 导入菜单/module/import: Boolean importModuleList(List createRequest) + 导出菜单/module/export: Boolean exportModuleList(String systemCode) + } + + class "按钮-MenuBO" as MenuBO{ + 按钮名称:String menuName + 按钮编码:String menuCode + 按钮链接:String menuUrl + 系统编码:String systemCode + 菜单编码:String moduleCode + .. extend info .. + tableKey:String menu + facadeKey:String MenuFacade + feignKey:String MenuFeign + controllerKey:String MenuController + dtoKeyList:String UpdateMenuRequestDTO,MenuResponseDTO,CreateMenuRequestDTO + voKeyList:String MenuVO,UpdateMenuRequestVO,CreateMenuRequestVO + contextKey:String system + 修改按钮/menu/updatemenu: Boolean updateMenu(UpdateMenuRequestVO updateMenuRequestVO) + 创建按钮/menu/createmenu: MenuVO createMenu(CreateMenuRequestVO createMenuRequestVO) + 获取按钮详情/menu/getbycode: MenuVO getByCode(String menuCode) + 获取按钮列表/menu/pagelist: List getPageList(String moduleCode ) + } + + class "数据字段-DataColumnBO" as DataColumnBO{ + 主键ID:Long id + 数据库业务系统名称:String busDataBase + 数据库表名称:String tableName + 数据库表描述:String tableDesc + 数据库字段名称:String columnName + 数据库字段描述:String columnDesc + 业务字段名称:String fieldName + .. extend info .. + tableKey:String data_column_config + controllerKey:String DataColumnController + voKeyList:String DataColumnResponseVO,DataColumnVO,CreateDataColumnRequestVO + contextKey:String datacolumn + queryVoKey:DataColumnQueryVO String busDataBase,String table,String column + 获取数据字段信息/datacolumn/getbycode: List getListByBusDataBase(String busDataBase) + 分页获取数据字段信息/datacolumn/pagelist: PageVO getPageList(PageVO pageVO) + 导入数据字段列表/datacolumn/import: Boolean importDataColumnList(List updateMenuRequestDTO) + } + +} + + +package domain.msgbody { + class "UserStatusChangeMsgBody-接收用户状态变更消息" as UserChangeMsgBody{ + 用户ID:Long userId + 状态类型:Integer statusType + } +} + +package domain.event{ + class "MenuChangeEvent-按钮信息变更事件" as MenuChangeEvent{ + 按钮code:String menuCode + 变更事件类型:Integer changeEventType + 按钮内容:MenuBO menuBO + } +} + + + +package domain.gataway { + interface "系统菜单按钮仓库服务-SystemModuleRepository" as SystemModuleRepository{ + 创建系统信息:Long saveSystem(SystemBO systemBO) + 更新系统信息:Integer updateSystem(SystemBO systemBO) + 创建菜单信息:Long saveModule(ModuleBO moduleBO) + 更新菜单信息:Integer updateModule(ModuleBO moduleBO) + 创建按钮信息:Long saveMenu(MenuBO moduleBO) + 更新按钮信息:Integer updateMenu(MenuBO moduleBO) + + } + + interface "系统菜单按钮查询服务-SystemModuleQueryGataWay" as SystemModuleQueryGataWay{ + 分页查询系统列表:List querySystemPage(PageBO pageBO) + 分页查询菜单列表:List queryModulePage() + 基于系统code查询菜单和按钮:SystemBO queryBySystemCode(String systemCode) + 根据条件查询系统:List queryByCondition(String search) + 查询所有系统菜单和按钮:List queryWithAll(String search) + 根据code查询系统详情:SystemBO getSystemByCode(String systemCode) + 根据code查询菜单详情:ModuleBO getModuleByCode(String moduleCode) + 根据code查询按钮详情:MenuBO getMenu(String menuCode) + } +} + + +package "防腐层包-infrast.acl" as infrast.acl { + interface "部门查询服务适配器-DepartmentServiceAdapter" as DepartmentServiceAdapter{ + 查询所有有效的部门: List queryAllDepartment(DepartmentQueryDTO queryDto) + 查询子部门: List queryDepartmentsList(Long pId) + } + + interface "省份城市查询服务适配器-AreaServiceAdapter" as AreaServiceAdapter{ + 查询所有的省份: List queryAllProvince() + 查询省份下所有城市: List queryCityByProvinceid(Long provinceId) + } + +} + +package "缓存包-infrast.cache" as infrast.cache { + class "系统上下文缓存服务包括系统，菜单，按钮-SystemCache" as SystemCache{ + +创建/更新系统缓存:void putSystem(SystemBO systeBO) + +创建/更新模块缓存:void putModule(ModuleBO moduleBO) + +获取系统缓存:SystemBO getSystem(String systemCode) + } +} + + + +package app.exe { + + interface "命令执行接口-CmdExeService" as CmdExeService{ + 命令执行入口:String exe(AbstractCmd abstractCmd) + } + + class "用户组cmd处理类-UserGroupCmdExe" as UserGroupCmdExe{ + + } + + class "用户cmd处理类-UserCmdExe" as UserCmdExe{ + + } + + class "用户权限cmd处理类-UserAuthCmdExe" as UserAuthCmdExe{ + + } + + + class "角色权限cmd处理类-RoleAuthCmdExe" as RoleAuthCmdExe{ + + } + + UserGroupCmdExe ..|> CmdExeService + UserCmdExe ..|> CmdExeService + UserAuthCmdExe ..|> CmdExeService + RoleAuthCmdExe ..|> CmdExeService + +} + + + + +package "基础设施层消息生产者-mq.producer" as mq.producer { + class "权限上下文消息生产者-AuthorityMqProducer" as AuthorityMqProducer{ + +权限创建:void authorityCreate(String authCode) + +权限更新:void authorityUpdate(String authCode) + } + + class "系统上下文消息生产者-SystemMqProducer" as SystemMqProducer{ + +事务提交后权限变更监听:void systemChange(MenuChangeEvent event) + } +} + +package "基础设施层消息消费者-mq.consumer" as mq.consumer { + class "用户上下文消息消费者或者监听-UserMqConsumer" as UserMqConsumer{ + +监听用户状态变更:void consumeUserStatusChange(String mqBody) + } + class "组织上下文消息消费者或者监听-DepartmentMqConsumer" as DepartmentMqConsumer{ + +监听组织状态变更:void consumeDepartmentStatusChange(String mqBody) + } +} + + +package "基础设施层消息消费处理器或者直接在基础设施层处理消息代码方案一-mq.handler" as mq.handler { + class "用户上下文消息处理器-UserMqHandler" as UserMqHandler{ + +处理用户状态变更的权限信息:void handleUserStatusChange(String mqBody) + } +} + +@enduml \ No newline at end of file diff --git a/codemaker-parent/codemaker-core/src/main/resources/ddd-plantuml/infosys-auth/auth-domainV3.puml b/codemaker-parent/codemaker-core/src/main/resources/ddd-plantuml/infosys-auth/auth-domainV3.puml new file mode 100644 index 0000000000000000000000000000000000000000..0e043a5111d614a099107c3f3df4fa58d8f10a33 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/ddd-plantuml/infosys-auth/auth-domainV3.puml @@ -0,0 +1,520 @@ +@startuml + +package domain.enum{ + enum "权限类型-AuthorityTypeEnum" as AuthTypeEnum{ + DATA(1,"数据字段权限"), + FUNCATION(2,"菜单功能权限"), + ADMINISTRATION(3,"行政权限"), + CUSTOMIZE(4,"自定义权限"); + 权限类型code:Integer code + 权限类型描述:String desc + static AuthorityTypeEnum getByCode(Integer code) + .. extend info .. + toRpcClient:String yes + } + +} + +package domain.bo { + class "操作人信息-OperatorBO" as OperatorBO{ + +创建时间:Date dateCreate + +创建人:Long createUserId + } + + class "操作时间信息-OperateDateBO" as OperateDateBO{ + +修改时间:Date dateUpdate + +修改人:Long updateUserId + } + + class "数据操作信息-BasicOperateBO" as BasicOperateBO{ + +修改时间:Date dateUpdate + +创建时间:Date dateCreate + +修改人:Long updateUserId + +创建人:Long createUserId + } + class "用户组-UserGroupBO" as UserBO{ + 组名:String groupName + 组编码:String groupCode + 组内用户列表:List userList + 角色状态:Integer status + .. extend info .. + tableKey:String role + facadeKey:String RoleFacade + controllerKey:String RoleController,RoleQueryController + dtoKeyList:String UpdateRoleRequestDTO,RoleResponseDTO,CreateRoleRequestDTO + voKeyList:String RoleVO,CreateRoleRequestVO + 创建角色/role/createrule: RoleVO RoleController.createRole(CreateRoleRequestVO createRoleRequestVO) + 根据编码获取角色详情/role/getbyrolecode: RoleVO RoleController.getByRoleCode(String roleCode) + 获取角色详情: RoleResponseDTO getByRoleCode(String roleCode) + 禁用角色/role/disable: Boolean RoleController.disable(String roleCode) + 启用角色/role/enable: Boolean RoleController.enable(String roleCode) + 分页获取用户组信息/role/pagelist: PageVO roleList + 角色状态:Integer status + .. extend info .. + tableKey:String role_group + facadeKey:String RoleGroupFacade + controllerKey:String RoleGroupController + dtoKeyList:String UpdateRoleGroupRequestDTO,RoleGroupResponseDTO + voKeyList:String RoleGroupVO + 获取学生信息: RoleGroupResponseDTO getByNumber(String number) + 分页获取用户组信息/role/pagelist: PageVO getPageList() + + } + + class "行政权限-AdminAuthorityBO" as AdminAuthorityBO { + 权限编码标示:String authCode + 组织部门:Long departmentId + 城市:Long cityId + 职位:Long jobId + + } + + class "系统设置-SystemConfig" as SystemConfig{ + 变量名:String varName + 变量描述:String varDesc + 变量值:String value + } + + class "系统管理-SystemBO" as SystemBO{ + 系统名称:String systemName + 系统标示:String systemCode + 系统域名:String systemUrl + 系统图标:String systemPicUrl + 系统技术负责人:Long tecAdminUserId + 系统业务负责人:Long busAdminUserId + 系统当前所在部门:Long departmentId + 系统模块列表:List getPageList(PageDTO pageDto) + 获取单条系统信息: SystemDTO getBySystemCode(String systemCode) + 修改系统信息: Boolean> updateSystem(UpdateSystemRequestDTO dto) + 搜索获取系统信息: List getSearchList(String search) + + 分页获取系统信息/system/pagelist: PageVO getPageList(SystemVO systemVO) + 搜索获取系统信息/system/search: List getSearchList(String search) + 新建系统信息/system/save: SystemVO saveSystem(CreateSystemRequestVO systemVO) + 修改系统信息/system/update: Boolean> updateSystem(UpdateSystemRequestVO systemVO) + 通过系统编号获取系统信息/system/getbycode: SystemVO getByCode(String systemCode) + + } + class "菜单/模块管理-ModuleBO" as ModuleBO{ + 菜单名称:String moduleName + 菜单编码:String moduleCode + 菜单链接:String moduleUrl + 系统标示:String systemCode + 按钮列表:List menuBOList + .. extend info .. + tableKey:String module + facadeKey:String ModuleFacade + controllerKey:String ModuleController + dtoKeyList:String UpdateModuleRequestDTO,ModuleResponseDTO,CreateModuleRequestDTO + voKeyList:String ModuleVO,UpdateModuleRequestVO,CreateModuleRequestVO + 创建菜单信息/module/createmodule: List createModule(CreateModuleRequestVO createRequest) + 创建菜单信息/module/updatemodule: List updateModule(UpdateModuleRequestVO updateRequest) + 获取系统菜单列表信息/module/getbysystemcode: List getBySystemCode(String systemCode) + 获取菜单信息/module/getbycode: ModuleVO getByModuleCode(String moduleCode) + 分页获取菜单信息/module/pagelist: PageVO getPageList() + 导入菜单信息/module/import: Boolean> importModuleList(List exportModuleList(String systemCode) + } + + class "按钮管理-MenuBO" as MenuBO{ + 按钮名称:String menuName + 按钮编码:String menuCode + 按钮链接:String menuUrl + 系统编码:String systemCode + 菜单编码:String moduleCode + .. extend info .. + tableKey:String menu + facadeKey:String MenuFacade + controllerKey:String MenuController + dtoKeyList:String UpdateMenuRequestDTO,MenuResponseDTO,CreateMenuRequestDTO + voKeyList:String MenuVO,UpdateMenuRequestVO,CreateMenuRequestVO + 修改按钮信息/menu/updatemenu: Boolean> updateMenu(UpdateMenuRequestVO updateMenuRequestVO) + 创建按钮信息/menu/createmenu: MenuVO createMenu(CreateMenuRequestVO createMenuRequestVO) + 获取按钮详情信息/menu/getbycode: MenuVO getByCode(String menuCode) + 获取按钮列表信息/menu/pagelist: List getPageList(String moduleCode ) + } + + class "数据字段实体-DataColumnBO" as DataColumnBO{ + 主键ID:Long id + 数据库业务系统名称:String busDataBase + 数据库表名称:String tableName + 数据库表描述:String tableDesc + 数据库字段名称:String columnName + 数据库字段描述:String columnDesc + 业务字段名称:String fieldName + .. extend info .. + tableKey:String data_column_config + controllerKey:String DataColumnController + voKeyList:String DataColumnResponseVO,DataColumnVO + !invokeFileKey:String datacolumncontextseq.puml + 获取数据字段信息/datacolumn/getbycode: List getListByBusDataBase(String busDataBase) + 分页获取数据字段信息/datacolumn/pagelist: PageVO getPageList(PageVO pageVO) + 导入数据字段列表/datacolumn/import: Boolean importDataColumnList(List cityIdList + +部门权限:List departmentIdList + +数据字段权限:List AuthorityBO + SystemAuthorityBO --|> AuthorityBO + UserAuthAggregateBO --|> AuthAggregateBO + RoleAuthAggregateBO --|> AuthAggregateBO + +} + + +package domain.msgbody { + class "UserStatusChangeMsgBody-接收用户状态变更消息" as UserChangeMsgBody{ + 用户ID:Long userId + 状态类型:Integer statusType + } +} + +package domain.event{ + class "MenuChangeEvent-按钮信息变更事件" as MenuChangeEvent{ + 按钮code:String menuCode + 变更事件类型:Integer changeEventType + 按钮内容:MenuBO menuBO + } + class "RoleChangeEvent-角色变更事件" as RoleChangeEvent{ + 角色code:String roleCode + 变更事件类型:Integer changeEventType + 角色内容:RoleBO roleBO + } + class "RoleAuthChangeEvent-角色授权变更事件" as RoleAuthChangeEvent{ + 角色code:String roleCode + 权限code:String authCode + 变更事件类型:Integer changeEventType + 角色内容:RoleBO roleBO + } +} + + + +package domain.gataway { + interface "系统菜单按钮仓库服务-SystemModuleRepository" as SystemModuleRepository{ + 创建系统信息:Long saveSystem(SystemBO systemBO) + 更新系统信息:Integer updateSystem(SystemBO systemBO) + 创建菜单信息:Long saveModule(ModuleBO moduleBO) + 更新菜单信息:Integer updateModule(ModuleBO moduleBO) + 创建按钮信息:Long saveMenu(MenuBO moduleBO) + 更新按钮信息:Integer updateMenu(MenuBO moduleBO) + + } + + interface "系统菜单按钮查询服务-SystemModuleQueryGataWay" as SystemModuleQueryGataWay{ + 分页查询系统列表:List querySystemPage(PageBO pageBO) + 分页查询菜单列表:List queryModulePage() + 基于系统code查询菜单和按钮:SystemBO> queryBySystemCode(String systemCode) + 根据条件查询系统:List queryByCondition(String search) + 查询所有系统菜单和按钮:List queryWithAll(String search) + 根据code查询系统详情:SystemBO getSystemByCode(String systemCode) + 根据code查询菜单详情:ModuleBO getModuleByCode(String moduleCode) + 根据code查询按钮详情:MenuBO getMenu(String menuCode) + } + + + interface "权限管理仓库-AuthorityRepository" as AuthorityRepository{ + 给角色构建权限:Boolean buildAuthority(AuthorityBO authorityBO) + 给角色更新权限:Boolean updateAuthority(AuthorityUpdateRequestBO authorityUpdateRequestBO) + 根据权限code禁用权限资源:Boolean disableAuthority(String authorityCode) + 根据权限code查询权限资源:AuthorityBO getByCode(String authorityCode) + 根据角色code查询权限资源:AuthorityBO getByRoleCode(String roleCode) + } + + interface "数据字段管理网关-DataColumnGataWay" as DataColumnGataWay{ + 保存数据字段:Long saveDataColumn(DataColumnBO dataColumnBO) + 批量保存保存数据字段:Boolean saveBatchDataColumn(List getByDBCode(String busDataBase) + 分页查询数据字段内容:List getPageList(PageBO pageBO) + } + + interface "用户和角色管理仓库-UserRoleRepository" as UserRoleRepository{ + 保存用户组并尝试关联用户:Long saveUserGroup(UserGroupBO userGroupBO) + 更新用户组:Integer updateUserGroup(UserGroupBO userGroupBO) + 保存角色组并尝试关联角色:Long saveRoleGroup(RoleGroupBO roleGroupBO) + 更新角色组:Integer updateRoleGroup(RoleGroupBO roleGroupBO) + 保存角色: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) + } + +} + + +package "领域工厂服务包-domain.factory" { + class "权限工厂服务-AuthorityFactory" as AuthorityFactory{ + +基于权限本身的维度-权限编码构建权限模型:AuthorityBO buildAuthorityByCode(String authorityCode) + +基于用户的维度构建权限模型:UserAuthAggregateBO buildAuthorityWithRoleCode(String roleCode) + } + +} + +package "防腐层包-infrast.acl" as infrast.acl { + interface "部门查询服务适配器-DepartmentServiceAdapter" as DepartmentServiceAdapter{ + 查询所有有效的部门: List queryAllDepartment(DepartmentQueryDTO queryDto) + 查询子部门: List queryDepartmentsList(Long pId) + } + + interface "省份城市查询服务适配器-AreaServiceAdapter" as AreaServiceAdapter{ + 查询所有的省份: List queryAllProvince() + 查询省份下所有城市: List queryCityByProvinceid(Long provinceId) + } + +} + + +package app.command { + + class "抽象命令类-AbstractCmd" as AbstractCmd{ + +操作时间: Date operateTime + +操作人ID: Long userId + +命令类: Class commandClass + +命令数据: String payLoad; + + } + + class "增加用户组命令-AddUserGroupCmd" as AddUserGroupCmd{ + 组名:String groupName + 用户ID:Long userId + } + + class "增加用户命令-AddUserCmd" as AddUserCmd{ + 用户名:String userName + 用户ID:Long userId + 所属组织:Long departmentId + } + + class "增加用户权限-AddUserAuthCmd" as AddUserAuthCmd{ + 用户ID:Long userId + 角色ID:Long roleId + 权限类型:int authorityType + 权限数据内容:String json + } + + class "更新用户权限-UpdateUserAuthCmd" as UpdateUserAuthCmd{ + 用户ID:Long userId + 角色ID:Long roleId + 权限数据内容:String json + } + + class "更新角色权限-UpdateRoleAuthCmd" as UpdateRoleAuthCmd{ + 角色ID:Long roleId + 权限数据内容:String json + } + + class "对角色权限-AddRoleAuthCmd" as AddRoleAuthCmd{ + 角色ID:Long roleId + 权限数据内容:String json + } + + AddUserRoleCmd --|> AbstractCmd + AddUserGroupCmd --|> AbstractCmd + AddUserCmd --|> AbstractCmd + AddUserAuthCmd --|> AbstractCmd + UpdateUserAuthCmd --|> AbstractCmd + AddRoleAuthCmd --|> AbstractCmd + UpdateRoleAuthCmd --|> AbstractCmd + +} + + +package app.exe { + + interface "命令执行接口-CmdExeService" as CmdExeService{ + 命令执行入口:String exe(AbstractCmd abstractCmd) + } + + class "用户组cmd处理类-UserGroupCmdExe" as UserGroupCmdExe{ + + } + + class "用户cmd处理类-UserCmdExe" as UserCmdExe{ + + } + + class "用户权限cmd处理类-UserAuthCmdExe" as UserAuthCmdExe{ + + } + + + class "角色权限cmd处理类-RoleAuthCmdExe" as RoleAuthCmdExe{ + + } + + UserGroupCmdExe ..|> CmdExeService + UserCmdExe ..|> CmdExeService + UserAuthCmdExe ..|> CmdExeService + RoleAuthCmdExe ..|> CmdExeService + +} + + + +package "应用层事件监听器包支持域内消息和域外消息，在应用层处理消息-app.listener" as app.listener{ + class "权限变更监听器-AuthorityChangeListener" as AuthorityChangeListener{ + +事务提交后权限变更监听:void authorityCreate(String authCode) + +用户状态信息变更监听消费:void userStatusChange(Long userId) + } + + class "系统菜单按钮变更监听器-SystemChangeListener" as SystemChangeListener{ + +事务提交后权限变更监听:void systemChange(MenuChangeEvent event) + } +} + + + +package "基础设施层消息生产者-mq.producer" as mq.producer { + class "权限上下文消息生产者-AuthorityMqProducer" as AuthorityMqProducer{ + +权限创建:void authorityCreate(String authCode) + +权限更新:void authorityUpdate(String authCode) + } + + class "系统上下文消息生产者-SystemMqProducer" as SystemMqProducer{ + +事务提交后权限变更监听:void systemChange(MenuChangeEvent event) + } +} + +package "基础设施层消息消费者-mq.consumer" as mq.consumer { + class "用户上下文消息消费者或者监听-UserMqConsumer" as UserMqConsumer{ + +监听用户状态变更:void consumeUserStatusChange(String mqBody) + } + class "组织上下文消息消费者或者监听-DepartmentMqConsumer" as DepartmentMqConsumer{ + +监听组织状态变更:void consumeDepartmentStatusChange(String mqBody) + } +} + + +package "基础设施层消息消费处理器或者直接在基础设施层处理消息代码方案一-mq.handler" as mq.handler { + class "用户上下文消息处理器-UserMqHandler" as UserMqHandler{ + +处理用户状态变更的权限信息:void handleUserStatusChange(String mqBody) + } +} + +@enduml \ No newline at end of file diff --git a/codemaker-parent/codemaker-core/src/main/resources/ddd-plantuml/infosys-auth/auth-domainV4-feign.puml b/codemaker-parent/codemaker-core/src/main/resources/ddd-plantuml/infosys-auth/auth-domainV4-feign.puml new file mode 100644 index 0000000000000000000000000000000000000000..df99a83cd5234b19421228a4465776e02dc42a60 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/ddd-plantuml/infosys-auth/auth-domainV4-feign.puml @@ -0,0 +1,509 @@ +@startuml + +package domain.enum{ + enum "权限类型-AuthorityTypeEnum" as AuthTypeEnum{ + DATA(1,"数据字段权限"), + FUNCATION(2,"菜单功能权限"), + ADMINISTRATION(3,"行政权限"), + CUSTOMIZE(4,"自定义权限"); + 权限类型code:Integer code + 权限类型描述:String desc + static AuthorityTypeEnum getByCode(Integer code) + .. extend info .. + toRpcClient:String yes + } + +} + +package domain.bo { + class "操作人信息-OperatorBO" as OperatorBO{ + +创建时间:Date dateCreate + +创建人:Long createUserId + } + + class "操作时间信息-OperateDateBO" as OperateDateBO{ + +修改时间:Date dateUpdate + +修改人:Long updateUserId + } + + class "数据操作信息-BasicOperateBO" as BasicOperateBO{ + +修改时间:Date dateUpdate + +创建时间:Date dateCreate + +修改人:Long updateUserId + +创建人:Long createUserId + } + class "用户组-UserGroupBO" as UserBO{ + 组名:String groupName + 组编码:String groupCode + 组内用户列表:List userList + 用户组状态:Integer status + 用户组对应的角色列表:List roleList + 用户组对应角色组列表:List roleGroupList + .. extend info .. + tableKey:String user_group + controllerKey:String UserGroupController,UserGroupQueryController + dtoKeyList:String UpdateUserGroupRequestDTO,UserGroupDTO,CreateUserGroupRequestDTO + 分页获取用户组信息/usergroup/pagelist: PageDTO userGroupQueryController.getPageList() + 创建用户组/usergroup/creategroup: UserGroupDTO userGroupController.createUserGroup(CreateUserGroupRequestDTO createUserGroupRequestDTO) + + } + + class "用户信息-UserBO" as UserBO{ + 用户名:String userName + 用户ID:Long userId + 用户对应角色列表:List userList + 用户对应角色组列表:List userList + + } + + class "角色-RoleBO" as RoleBO{ + 角色名称:String roleName + 角色编码:String roleCode + 角色对应用户列表:List userList + 角色状态:Integer status + .. extend info .. + tableKey:String role + controllerKey:String RoleController,RoleQueryController + dtoKeyList:String UpdateRoleRequestDTO,RoleDTO,CreateRoleRequestDTO + 创建角色/role/createrule: RoleDTO RoleController.createRole(CreateRoleRequestDTO createRoleRequestDTO) + 根据编码获取角色详情/role/getbyrolecode: RoleDTO RoleController.getByRoleCode(String roleCode) + 获取角色详情: RoleDTO getByRoleCode(String roleCode) + 禁用角色/role/disable: Boolean RoleController.disable(String roleCode) + 启用角色/role/enable: Boolean RoleController.enable(String roleCode) + 分页获取用户组信息/role/pagelist: PageDTO RoleQueryController.getPageList(PageDTO pageDTO) + } + + class "角色组-RoleGroupBO" as RoleGroupBO{ + 角色组名称:String roleName + 角色组编码:String roleCode + 组内角色列表:List roleList + 角色状态:Integer status + .. extend info .. + exportaclkey:String DepartmentQueryDTO(roleList->list) + tableKey:String role_group + controllerKey:String RoleGroupController + dtoKeyList:String UpdateRoleGroupRequestDTO,RoleGroupDTO + 获取学生信息: RoleGroupDTO getByNumber(String number) + 分页获取用户组信息/role/pagelist: PageDTO getPageList(PageDTO pageDTO) + } + + class "权限-AuthorityBO" as AuthorityBO{ + 权限编码标示:String authCode + 权限类型:Integer authorityType + 关联角色:String roleCode + 关联角色组:String roleGroupCode + 数据字段权限列表:List dataAuthorityBOList + 系统菜单权限列表:List systemAuthorityBOList + 行政权限列表:List adminAuthorityBOList + 权限状态:Integer status + .. extend info .. + tableKey:String authority + facadeKey:String AuthorityFacade + controllerKey:String AuthorityOperationController,AuthorityQueryController + dtoKeyList:String UpdateAuthorityRequestDTO,AuthorityDTO,CreateAuthorityRequestDTO + invokeFileKey:String queryauthoritydatav5.puml + 判断用户有没有访问某系统的权限: AuthorityDTO checkUserSystemAuth(Long userId,String systemCode) + 根据用户和系统获取系统权限信息: AuthorityDTO getUserSystemAuth(Long userId,String systemCode) + 根据权限code获取权限信息: AuthorityDTO getByCode(String authCode) + 分页获取权限信息/authority/pagelist: PageDTO AuthorityQueryController.getPageList() + 获取权限信息/authority/getbycode: AuthorityDTO AuthorityQueryController.getByCode(String authCode) + 给角色授权/authority/savetorole: AuthorityDTO AuthorityOperationController.saveAuthority(CreateAuthorityRequestDTO createAuthorityRequestDTO) + + } + + class "权限更新请求实体-AuthorityUpdateRequestBO" as AuthorityUpdateRequestBO{ + 权限编码标示:String authCode + } + + + class "数据字段权限-DataAuthorityBO" as DataAuthorityBO { + 权限编码标示:String authCode + 数据字段ID:Long dataColumnId + .. extend info .. + tableKey:String data_authority + controllerKey:String DataAuthorityController + dtoKeyList:String UpdateDataAuthorityRequestDTO,DataAuthorityDTO,CreateDataAuthorityRequestDTO + 获取权限信息/dataauthority/getbycode: DataAuthorityDTO getByCode(String authCode) + } + + class "系统菜单权限-SystemAuthorityBO" as SystemAuthorityBO{ + 权限编码标示:String authCode + 业务数据系统标示:String systemName + 功能:String funcName + 菜单:String categoryName + 按钮:String menuName + .. extend info .. + exportaclkey:String DepartmentQueryDTO(categoryName->deptName) + tableKey:String system_authority + facadeKey:String SystemAuthorityFacade + controllerKey:String SystemAuthorityController + dtoKeyList:String UpdateSystemAuthorityRequestDTO,SystemAuthorityDTO,CreateSystemAuthorityRequestDTO + dtoKeyList:String SystemAuthorityDTO + 获取权限信息: SystemAuthorityDTO getByCode(String authCode) + 获取权限信息/systemauthority/getbycode: SystemAuthorityDTO getByCode(String authCode) + 分页获取权限信息/systemauthority/pagelist: PageDTO getPageList() + + } + + class "行政权限-AdminAuthorityBO" as AdminAuthorityBO { + 权限编码标示:String authCode + 组织部门:Long departmentId + 城市:Long cityId + 职位:Long jobId + .. extend info .. + exportaclkey:String DepartmentQueryDTO(departmentId->deptId) + + } + + class "系统设置-SystemConfig" as SystemConfig{ + 变量名:String varName + 变量描述:String varDesc + 变量值:String value + } + + class "系统管理-SystemBO" as SystemBO{ + 系统名称:String systemName + 系统标示:String systemCode + 系统域名:String systemUrl + 系统图标:String systemPicUrl + 系统技术负责人:Long tecAdminUserId + 系统业务负责人:Long busAdminUserId + 系统当前所在部门:Long departmentId + 系统模块列表:List moduleBOList + .. extend info .. + tableKey:String system + dtoKeyList:String SystemDTO,CreateSystemRequestDTO,UpdateSystemRequestDTO + dtoKeyList:String CreateSystemRequestDTO,UpdateSystemRequestDTO,SystemDTO + controllerKey:String SystemController + !invokekeyFileKey:String systemcontextseq.puml + 注册系统: SystemDTO registSystem(SystemDTO systemDTO) + 分页获取系统信息: PageDTO getPageList(PageDTO pageDto) + 获取单条系统信息: SystemDTO getBySystemCode(String systemCode) + 修改系统信息: Boolean updateSystem(UpdateSystemRequestDTO dto) + 搜索获取系统信息: List getSearchList(String search) + + 分页获取系统信息/system/pagelist: PageDTO getPageList(SystemDTO systemDTO) + 搜索获取系统信息/system/search: List getSearchList(String search) + 新建系统信息/system/save: SystemDTO saveSystem(CreateSystemRequestDTO systemDTO) + 修改系统信息/system/update: Boolean updateSystem(UpdateSystemRequestDTO systemDTO) + 通过系统编号获取系统信息/system/getbycode: SystemDTO getByCode(String systemCode) + + } + class "菜单/模块管理-ModuleBO" as ModuleBO{ + 菜单名称:String moduleName + 菜单编码:String moduleCode + 菜单链接:String moduleUrl + 系统标示:String systemCode + 按钮列表:List menuBOList + .. extend info .. + tableKey:String module + facadeKey:String ModuleFacade + controllerKey:String ModuleController + dtoKeyList:String UpdateModuleRequestDTO,ModuleDTO,CreateModuleRequestDTO + dtoKeyList:String ModuleDTO,UpdateModuleRequestDTO,CreateModuleRequestDTO + 创建菜单信息/module/createmodule: List createModule(CreateModuleRequestDTO createRequest) + 创建菜单信息/module/updatemodule: List updateModule(UpdateModuleRequestDTO updateRequest) + 获取系统菜单列表信息/module/getbysystemcode: List getBySystemCode(String systemCode) + 获取菜单信息/module/getbycode: ModuleDTO getByModuleCode(String moduleCode) + 分页获取菜单信息/module/pagelist: PageDTO getPageList() + 导入菜单信息/module/import: Boolean importModuleList(List createRequest) + 导出菜单信息/module/export: Boolean exportModuleList(String systemCode) + } + + class "按钮管理-MenuBO" as MenuBO{ + 按钮名称:String menuName + 按钮编码:String menuCode + 按钮链接:String menuUrl + 系统编码:String systemCode + 菜单编码:String moduleCode + .. extend info .. + tableKey:String menu + facadeKey:String MenuFacade + controllerKey:String MenuController + dtoKeyList:String UpdateMenuRequestDTO,MenuDTO,CreateMenuRequestDTO + dtoKeyList:String MenuDTO,UpdateMenuRequestDTO,CreateMenuRequestDTO + 修改按钮信息/menu/updatemenu: Boolean updateMenu(UpdateMenuRequestDTO updateMenuRequestDTO) + 创建按钮信息/menu/createmenu: MenuDTO createMenu(CreateMenuRequestDTO createMenuRequestDTO) + 获取按钮详情信息/menu/getbycode: MenuDTO getByCode(String menuCode) + 获取按钮列表信息/menu/pagelist: List getPageList(String moduleCode ) + } + + class "数据字段实体-DataColumnBO" as DataColumnBO{ + 主键ID:Long id + 数据库业务系统名称:String busDataBase + 数据库表名称:String tableName + 数据库表描述:String tableDesc + 数据库字段名称:String columnName + 数据库字段描述:String columnDesc + 业务字段名称:String fieldName + .. extend info .. + tableKey:String data_column_config + controllerKey:String DataColumnController + dtoKeyList:String DataColumnResponseDTO,DataColumnDTO + !indtokeyFileKey:String datacolumncontextseq.puml + 获取数据字段信息/datacolumn/getbycode: List getListByBusDataBase(String busDataBase) + 分页获取数据字段信息/datacolumn/pagelist: PageDTO getPageList(PageDTO PageDTO) + 导入数据字段列表/datacolumn/import: Boolean importDataColumnList(List updateMenuRequestDTO) + } + + + class "AuthAggregateBO-权限聚合根" as AuthAggregateBO{ + +系统权限:List cityIdList + +部门权限:List departmentIdList + +数据字段权限:List dataColumnBOList + } + + class "UserAuthAggregateBO-用户权限聚合根" as UserAuthAggregateBO{ + 用户ID:Long userId + } + + class "RoleAuthAggregateBO-角色权限聚合根" as RoleAuthAggregateBO{ + 角色ID:Long roleId + } + + AuthorityBO <|-- DataAuthorityBO + AdminAuthorityBO --|> AuthorityBO + SystemAuthorityBO --|> AuthorityBO + UserAuthAggregateBO --|> AuthAggregateBO + RoleAuthAggregateBO --|> AuthAggregateBO + +} + + +package domain.msgbody { + class "UserStatusChangeMsgBody-接收用户状态变更消息" as UserChangeMsgBody{ + 用户ID:Long userId + 状态类型:Integer statusType + } +} + +package domain.event{ + class "MenuChangeEvent-按钮信息变更事件" as MenuChangeEvent{ + 按钮code:String menuCode + 变更事件类型:Integer changeEventType + 按钮内容:MenuBO menuBO + } + class "RoleChangeEvent-角色变更事件" as RoleChangeEvent{ + 角色code:String roleCode + 变更事件类型:Integer changeEventType + 角色内容:RoleBO roleBO + } + class "RoleAuthChangeEvent-角色授权变更事件" as RoleAuthChangeEvent{ + 角色code:String roleCode + 权限code:String authCode + 变更事件类型:Integer changeEventType + 角色内容:RoleBO roleBO + } +} + + + +package domain.gataway { + interface "系统菜单按钮仓库服务-SystemModuleRepository" as SystemModuleRepository{ + 创建系统信息:Long saveSystem(SystemBO systemBO) + 更新系统信息:Integer updateSystem(SystemBO systemBO) + 创建菜单信息:Long saveModule(ModuleBO moduleBO) + 更新菜单信息:Integer updateModule(ModuleBO moduleBO) + 创建按钮信息:Long saveMenu(MenuBO moduleBO) + 更新按钮信息:Integer updateMenu(MenuBO moduleBO) + + } + + interface "系统菜单按钮查询服务-SystemModuleQueryGataWay" as SystemModuleQueryGataWay{ + 分页查询系统列表:List querySystemPage(PageBO pageBO) + 分页查询菜单列表:List queryModulePage() + 基于系统code查询菜单和按钮:SystemBO> queryBySystemCode(String systemCode) + 根据条件查询系统:List queryByCondition(String search) + 查询所有系统菜单和按钮:List queryWithAll(String search) + 根据code查询系统详情:SystemBO getSystemByCode(String systemCode) + 根据code查询菜单详情:ModuleBO getModuleByCode(String moduleCode) + 根据code查询按钮详情:MenuBO getMenu(String menuCode) + } + + + interface "权限管理仓库-AuthorityRepository" as AuthorityRepository{ + 给角色构建权限:Boolean buildAuthority(AuthorityBO authorityBO) + 给角色更新权限:Boolean updateAuthority(AuthorityUpdateRequestBO authorityUpdateRequestBO) + 根据权限code禁用权限资源:Boolean disableAuthority(String authorityCode) + 根据权限code查询权限资源:AuthorityBO getByCode(String authorityCode) + 根据角色code查询权限资源:AuthorityBO getByRoleCode(String roleCode) + } + + interface "数据字段管理网关-DataColumnGataWay" as DataColumnGataWay{ + 保存数据字段:Long saveDataColumn(DataColumnBO dataColumnBO) + 批量保存保存数据字段:Boolean saveBatchDataColumn(List getByDBCode(String busDataBase) + 分页查询数据字段内容:List getPageList(PageBO pageBO) + } + + interface "用户和角色管理仓库-UserRoleRepository" as UserRoleRepository{ + 保存用户组并尝试关联用户:Long saveUserGroup(UserGroupBO userGroupBO) + 更新用户组:Integer updateUserGroup(UserGroupBO userGroupBO) + 保存角色组并尝试关联角色:Long saveRoleGroup(RoleGroupBO roleGroupBO) + 更新角色组:Integer updateRoleGroup(RoleGroupBO roleGroupBO) + 保存角色: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) + } + +} + + +package "领域工厂服务包-domain.factory" { + class "权限工厂服务-AuthorityFactory" as AuthorityFactory{ + +基于权限本身的维度-权限编码构建权限模型:AuthorityBO buildAuthorityByCode(String authorityCode) + +基于用户的维度构建权限模型:UserAuthAggregateBO buildAuthorityWithRoleCode(String roleCode) + } + +} + +package "防腐层包-infrast.acl" as infrast.acl { + interface "部门查询服务适配器-DepartmentServiceAdapter" as DepartmentServiceAdapter{ + 查询所有有效的部门: List queryAllDepartment(DepartmentQueryDTO queryDto) + 查询子部门: List queryDepartmentsList(Long pId) + } + + interface "省份城市查询服务适配器-AreaServiceAdapter" as AreaServiceAdapter{ + 查询所有的省份: List queryAllProvince() + 查询省份下所有城市: List queryCityByProvinceid(Long provinceId) + } + +} + + +package app.command { + + class "抽象命令类-AbstractCmd" as AbstractCmd{ + +操作时间: Date operateTime + +操作人ID: Long userId + +命令类: Class commandClass + +命令数据: String payLoad; + + } + + class "增加用户组命令-AddUserGroupCmd" as AddUserGroupCmd{ + 组名:String groupName + 用户ID:Long userId + } + + class "增加用户命令-AddUserCmd" as AddUserCmd{ + 用户名:String userName + 用户ID:Long userId + 所属组织:Long departmentId + } + + class "增加用户权限-AddUserAuthCmd" as AddUserAuthCmd{ + 用户ID:Long userId + 角色ID:Long roleId + 权限类型:int authorityType + 权限数据内容:String json + } + + class "更新用户权限-UpdateUserAuthCmd" as UpdateUserAuthCmd{ + 用户ID:Long userId + 角色ID:Long roleId + 权限数据内容:String json + } + + class "更新角色权限-UpdateRoleAuthCmd" as UpdateRoleAuthCmd{ + 角色ID:Long roleId + 权限数据内容:String json + } + + class "对角色权限-AddRoleAuthCmd" as AddRoleAuthCmd{ + 角色ID:Long roleId + 权限数据内容:String json + } + + AddUserRoleCmd --|> AbstractCmd + AddUserGroupCmd --|> AbstractCmd + AddUserCmd --|> AbstractCmd + AddUserAuthCmd --|> AbstractCmd + UpdateUserAuthCmd --|> AbstractCmd + AddRoleAuthCmd --|> AbstractCmd + UpdateRoleAuthCmd --|> AbstractCmd + +} + + +package app.exe { + + interface "命令执行接口-CmdExeService" as CmdExeService{ + 命令执行入口:String exe(AbstractCmd abstractCmd) + } + + class "用户组cmd处理类-UserGroupCmdExe" as UserGroupCmdExe{ + + } + + class "用户cmd处理类-UserCmdExe" as UserCmdExe{ + + } + + class "用户权限cmd处理类-UserAuthCmdExe" as UserAuthCmdExe{ + + } + + + class "角色权限cmd处理类-RoleAuthCmdExe" as RoleAuthCmdExe{ + + } + + UserGroupCmdExe ..|> CmdExeService + UserCmdExe ..|> CmdExeService + UserAuthCmdExe ..|> CmdExeService + RoleAuthCmdExe ..|> CmdExeService + +} + + + +package "应用层事件监听器包支持域内消息和域外消息，在应用层处理消息-app.listener" as app.listener{ + class "权限变更监听器-AuthorityChangeListener" as AuthorityChangeListener{ + +事务提交后权限变更监听:DTOid authorityCreate(String authCode) + +用户状态信息变更监听消费:DTOid userStatusChange(Long userId) + } + + class "系统菜单按钮变更监听器-SystemChangeListener" as SystemChangeListener{ + +事务提交后权限变更监听:DTOid systemChange(MenuChangeEvent event) + } +} + + + +package "基础设施层消息生产者-mq.producer" as mq.producer { + class "权限上下文消息生产者-AuthorityMqProducer" as AuthorityMqProducer{ + +权限创建:DTOid authorityCreate(String authCode) + +权限更新:DTOid authorityUpdate(String authCode) + } + + class "系统上下文消息生产者-SystemMqProducer" as SystemMqProducer{ + +事务提交后权限变更监听:DTOid systemChange(MenuChangeEvent event) + } +} + +package "基础设施层消息消费者-mq.consumer" as mq.consumer { + class "用户上下文消息消费者或者监听-UserMqConsumer" as UserMqConsumer{ + +监听用户状态变更:DTOid consumeUserStatusChange(String mqBody) + } + class "组织上下文消息消费者或者监听-DepartmentMqConsumer" as DepartmentMqConsumer{ + +监听组织状态变更:DTOid consumeDepartmentStatusChange(String mqBody) + } +} + + +package "基础设施层消息消费处理器或者直接在基础设施层处理消息代码方案一-mq.handler" as mq.handler { + class "用户上下文消息处理器-UserMqHandler" as UserMqHandler{ + +处理用户状态变更的权限信息:DTOid handleUserStatusChange(String mqBody) + } +} + +@enduml \ No newline at end of file diff --git a/codemaker-parent/codemaker-core/src/main/resources/ddd-plantuml/infosys-auth/auth-domainV5.puml b/codemaker-parent/codemaker-core/src/main/resources/ddd-plantuml/infosys-auth/auth-domainV5.puml new file mode 100644 index 0000000000000000000000000000000000000000..d586594a5ba588f9655bcc61685390002741c87f --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/ddd-plantuml/infosys-auth/auth-domainV5.puml @@ -0,0 +1,755 @@ +@startuml + +package domain.enum{ + enum "权限类型-AuthorityTypeEnum" as AuthTypeEnum{ + DATA(1,"数据字段权限"), + FUNCATION(2,"菜单功能权限"), + ADMINISTRATION(3,"行政权限"), + CUSTOMIZE(4,"自定义权限"); + 权限类型code:Integer code + 权限类型描述:String desc + static AuthorityTypeEnum getByCode(Integer code) + .. extend info .. + toRpcClient:String yes + } + +} + +package domain.bo { + class "操作人信息-OperatorBO" as OperatorBO{ + +创建时间:Date dateCreate + +创建人:Long createUserId + } + + class "操作时间信息-OperateDateBO" as OperateDateBO{ + +修改时间:Date dateUpdate + +修改人:Long updateUserId + } + + class "数据操作信息-BasicOperateBO" as BasicOperateBO{ + +修改时间:Date dateUpdate + +创建时间:Date dateCreate + +修改人:Long updateUserId + +创建人:Long createUserId + } + class "用户组-UserGroupBO" as UserGroupBO{ + 组名:String groupName + 组编码:String groupCode + 组内用户列表:List userList + 用户组状态:Integer status + 用户组对应的角色列表:List roleList + 用户组对应角色组列表:List roleGroupList + +判断角色是否在该用户组中:boolean containsRole(String roleCode) + +判断用户是否在该用户组中:boolean containsUser(Long userId) + +将用户从用户组中删除:boolean deleteUser(Long userId) + + .. extend info .. + tableKey:String user_group + + facadeKey:String UserGroupFacade,UserGroupQueryFacade + controllerKey:String UserGroupController,UserGroupQueryController + + dtoKeyList:String UpdateUserGroupRequestDTO,UserGroupDTO,CreateUserGroupRequestDTO + voKeyList:String UpdateUserGroupRequestVO,UserGroupVO,CreateUserGroupRequestVO + + queryDtoKey:UserGroupQueryDTO String groupName,String groupCode,Integer status + queryVoKey:UserGroupQueryVO String groupName,String groupCode,Integer status + + contextKey:String user + + + 分页获取用户组信息: PageDTO UserGroupQueryFacade.getPageList() + 创建用户组: UserGroupDTO UserGroupFacade.createUserGroup(CreateUserGroupRequestDTO createUserGroupRequestDTO) + 修改用户组信息: Boolean UserGroupFacade.updateUserGroup(UpdateUserGroupRequestDTO updateUserGroupRequestDTO) + 设置用户组状态: Boolean UserGroupFacade.updateUserGroupStatus(String groupCode,Integer status) + 根据code获取用户组详情: UserGroupDTO UserGroupQueryFacade.getByGroupCode(String groupCode) + 根据code或者名称搜索用户组信息: List UserGroupQueryFacade.search(String search) + + + 分页获取用户组信息/usergroup/pagelist: PageVO userGroupQueryController.getPageList(PageVO pageVO ) + 创建用户组/usergroup/create: UserGroupVO UserGroupController.createUserGroup(CreateUserGroupRequestVO createUserGroupRequestVO) + 修改用户组信息/usergroup/upate: Boolean UserGroupController.updateUserGroup(UpdateUserGroupRequestVO updateUserGroupRequestVO) + 设置用户组状态/usergroup/changestatus: Boolean UserGroupController.updateUserGroupStatus(String groupCode,Integer status) + 根据code获取用户组详情/usergroup/detail: UserGroupDTO UserGroupQueryController.getByGroupCode(String groupCode) + 根据code或者名称搜索用户组信息/usergroup/search: List UserGroupQueryController.search(String search) + + + } + + class "用户信息-UserBO" as UserBO{ + 用户名:String userName + 用户ID:Long userIdpList + 用户对应角色列表:List roleList + 用户对应角色组列表:List roleGrou + +判断用户是否存在指定角色:boolean containsRole(String roleCode) + .. extend info .. + contextKey:String user + } + + class "角色-RoleBO" as RoleBO{ + 角色名称:String roleName + 角色编码:String roleCode + 角色对应用户列表:List userList + 角色状态:Integer status + .. extend info .. + tableKey:String role + +将用户从角色中删除:boolean deleteUser(Long userId) + + controllerKey:String RoleController,RoleQueryController + facadeKey:String RoleFacade,RoleQueryFacade + + voKeyList:String UpdateRoleRequestVO,RoleVO,CreateRoleRequestVO + dtoKeyList:String UpdateRoleRequestDTO,RoleDTO,CreateRoleRequestDTO + + queryDtoKey:RoleQueryDTO String roleName,String roleCode,Integer status + queryVoKey:RoleQueryVO String roleCode,String roleCode,Integer status + + contextKey:String role + + !invokeFileKey:String rolecontextseq.puml + 创建角色/role/create: RoleVO RoleController.createRole(CreateRoleRequestVO createRoleRequestVO) + 根据编码获取角色详情/role/getbyrolecode: RoleVO RoleQueryController.getByRoleCode(String roleCode) + 禁用角色/role/disable: Boolean RoleController.disable(String roleCode) + 启用角色/role/enable: Boolean RoleController.enable(String roleCode) + 分页获取角色信息/role/pagelist: PageVO RoleQueryController.getPageList(PageVO pageVO) + 角色关联用户/role/relatetouser: Boolean RoleController.relateToUser(String userIds) + + + 分页获取角色信息: PageDTO RoleQueryFacade.getPageList(PageDTO pageDTO) + 创建角色: RoleDTO RoleFacade.createRole(CreateRoleRequestDTO createRoleRequestDTO) + 修改角色信息: Boolean RoleFacade.updateRole(UpdateRoleRequestDTO updateRoleRequestDTO) + 设置角色状态: Boolean RoleFacade.updateRoleStatus(String groupCode,Integer status) + 根据code获取角色详情: RoleDTO RoleQueryFacade.getByRoleCode(String groupCode) + 根据code或者名称搜索角色信息: List RoleQueryFacade.search(String search) + 角色关联用户: Boolean RoleFacade.relateToUser(List userIdList) + } + + class "角色组-RoleGroupBO" as RoleGroupBO{ + 角色组名称:String roleName + 角色组编码:String roleCode + 组内角色列表:List roleList + 角色状态:Integer status + .. extend info .. + exportaclkey:String DepartmentQueryDTO(roleList->list) + + tableKey:String role_group + + controllerKey:String RoleGroupController,RoleGroupQueryController + facadeKey:String RoleFacade,RoleQueryFacade + + voKeyList:String UpdateRoleGroupRequestVO,RoleVO,CreateRoleGroupRequestVO + dtoKeyList:String UpdateRoleGroupRequestDTO,RoleDTO,CreateRoleGroupRequestDTO + + queryDtoKey:RoleGroupQueryDTO String roleName,String roleCode,Integer status + queryVoKey:RoleGroupQueryVO String roleName,String roleCode,Integer status + + + contextKey:String role + + + 创建角色组/rolegroup/create: RoleVO RoleGroupController.createRole(CreateRoleGroupRequestVO createRoleRequestVO) + 根据编码获取角色详情/rolegroup/getbyrolecode: RoleVO RoleQueryController.getByRoleCode(String roleCode) + 禁用角色组/rolegroup/disable: Boolean RoleGroupController.disable(String roleCode) + 启用角色组/rolegroup/enable: Boolean RoleGroupController.enable(String roleCode) + 分页获取角色组信息/rolegroup/pagelist: PageVO RoleGroupQueryController.getPageList(PageVO pageVO) + 根据code或者名称搜索角色组信息/rolegroup/search: List RoleGroupQueryController.search(String search) + + + 分页获取角色组信息: PageDTO RoleGroupQueryFacade.getPageList() + 创建角色组: RoleGroupDTO RoleGroupFacade.createRole(CreateRoleRequestDTO createRoleRequestDTO) + 修改角色组信息: Boolean RoleGroupFacade.updateRole(UpdateRoleRequestDTO updateRoleRequestDTO) + 设置角色组状态: Boolean RoleGroupFacade.updateRoleStatus(String groupCode,Integer status) + 根据code获取角色组详情: RoleGroupDTO RoleGroupQueryFacade.getByRoleCode(String groupCode) + 根据code或者名称搜索角色组信息: List RoleGroupQueryFacade.search(String search) + + + } + + class "权限-AuthorityBO" as AuthorityBO{ + 权限编码标示:String authCode + 权限类型:Integer authorityType + 关联角色:String roleCode + 关联角色组:String roleGroupCode + 数据字段权限列表:List dataAuthorityBOList + 系统菜单权限列表:List systemAuthorityBOList + 行政权限列表:List adminAuthorityBOList + 权限状态:Integer status + .. extend info .. + tableKey:String authority + + facadeKey:String AuthorityFacade,AuthorityQueryFacade + controllerKey:String AuthorityController,AuthorityQueryController + + dtoKeyList:String UpdateAuthorityRequestDTO,AuthorityDTO,CreateAuthorityRequestDTO + voKeyList:String UpdateAuthorityRequestVO,AuthorityVO,CreateAuthorityRequestVO + + queryDtoKey:AuthorityQueryDTO String authCode,Integer authorityType,String roleCode,String roleGroupCode + queryVoKey:AuthorityQueryVO String authCode,Integer authorityType,String roleCode,String roleGroupCode + + contextKey:String authority + + + !invokeFileKey:String createauthoritydata.puml,queryauthoritydata.puml,queryauthoritydatahttp.puml + 判断用户有没有访问某系统的权限: AuthorityDTO AuthorityQueryFacade.checkUserSystemAuth(Long userId,String systemCode) + 根据用户和系统获取系统权限信息: AuthorityDTO AuthorityQueryFacade.getUserSystemAuth(Long userId,String systemCode) + 根据权限code获取权限信息: AuthorityDTO AuthorityQueryFacade.getByCode(String authCode) + 分页获取权限信息: PageDTO AuthorityQueryFacade.getPageList(String authCode) + 给角色授权: AuthorityDTO AuthorityFacade.saveAuthority(CreateAuthorityRequestDTO createAuthorityRequestDTO) + 修改授权信息: Boolean AuthorityFacade.updateAuthority(UpdateAuthorityRequestDTO updateAuthorityRequestDTO) + + + 分页获取权限信息/authority/pagelist: PageVO AuthorityQueryController.getPageList() + 获取权限信息/authority/getbycode: AuthorityVO AuthorityQueryController.getByCode(String authCode) + 给角色授权/authority/savetorole: AuthorityVO AuthorityController.saveAuthority(CreateAuthorityRequestVO createAuthorityRequestDTO) + 判断用户有没有访问某系统的权限/authority/check/userauth: AuthorityVO AuthorityQueryController.checkUserSystemAuth(Long userId,String systemCode) + + + } + + + class "数据字段权限-DataAuthorityBO" as DataAuthorityBO { + 权限编码标示:String authCode + 数据字段ID:List dataColumnIdList; + .. extend info .. + tableKey:String data_authority + + facadeKey:String DataAuthorityFacade,DataAuthorityQueryFacade + controllerKey:String DataAuthorityController,DataAuthorityQueryController + + dtoKeyList:String UpdateDataAuthorityRequestDTO,DataAuthorityDTO,CreateDataAuthorityRequestDTO + voKeyList:String UpdateDataAuthorityRequestVO,DataAuthorityVO,CreateDataAuthorityRequestVO + + queryDtoKey:DataAuthorityQueryDTO String authCode,List dataColumnIdList + queryVoKey:DataAuthorityQueryVO String authCode,List dataColumnIdList + + contextKey:String authority + + + 根据权限code获取数据权限信息: DataAuthorityDTO DataAuthorityQueryFacade.getByCode(String authCode) + 分页获取数据权限信息: PageDTO DataAuthorityQueryFacade.getPageList(PageDTO pageDTO) + 给角色授权数据权限: DataAuthorityDTO DataAuthorityFacade.saveDataAuthority(CreateDataAuthorityRequestDTO createAuthorityRequestDTO) + 修改角色授权数据权限: DataAuthorityDTO DataAuthorityFacade.saveDataAuthority(UpdateDataAuthorityRequestDTO createAuthorityRequestDTO) + + 分页获取权限信息/dataauthority/pagelist: PageVO DataAuthorityQueryController.getPageList(PageVO pageVO) + + 获取数据权限信息/dataauthority/getbycode: DataAuthorityVO DataAuthorityQueryController.getByCode(String authCode) + 判断用户有没有访问某数据的权限/dataauthority/check: DataAuthorityVO DataAuthorityQueryController.checkUserSystemAuth(Long userId,String systemCode) + 给角色授权数据权限: DataAuthorityVO DataAuthorityController.saveDataAuthority(CreateDataAuthorityRequestVO createAuthorityRequestVO) + + } + + class "系统菜单权限-SystemAuthorityBO" as SystemAuthorityBO{ + 权限编码标示:String authCode + 业务数据系统标示:String systemCode + 功能:String funcCode + 菜单:String categoryCode + 按钮:String menuCode + .. extend info .. + exportaclkey:String DepartmentQueryDTO(categoryName->deptName) + tableKey:String system_authority + facadeKey:String SystemAuthorityFacade,SystemAuthorityQueryFacade + controllerKey:String SystemAuthorityController,SystemAuthorityQueryController + + dtoKeyList:String UpdateSystemAuthorityRequestDTO,SystemAuthorityDTO,CreateSystemAuthorityRequestDTO + voKeyList:String UpdateSystemAuthorityRequestVO,SystemAuthorityVO,CreateSystemAuthorityRequestVO + + queryDtoKey:SystemAuthorityQueryDTO String authCode,String systemCode,String funcCode + queryVoKey:SystemAuthorityQueryVO String authCode,String systemCode,String funcCode + + contextKey:String authority + + + 获取系统菜单权限信息: SystemAuthorityDTO SystemAuthorityQueryFacade.getByCode(String authCode) + 给角色授权系统菜单权限: DataAuthorityDTO SystemAuthorityFacade.saveSystemAuthority(CreateSystemAuthorityRequestDTO createAuthorityRequestDTO) + 修改角色授权系统菜单权限: Boolean SystemAuthorityFacade.saveSystemAuthority(UpdateSystemAuthorityRequestDTO createAuthorityRequestDTO) + + 获取系统菜单权限信息/systemauthority/getbycode: SystemAuthorityDTO SystemAuthorityQueryController.getByCode(String authCode) + 分页获取系统菜单权限信息/systemauthority/pagelist: PageVO getPageList(PageVO pageVO) + + } + + class "行政权限-AdminAuthorityBO" as AdminAuthorityBO { + 权限编码标示:String authCode + 组织部门:Long departmentId + 城市:Long cityId + 职位:Long jobId + .. extend info .. + exportaclkey:String DepartmentQueryDTO(departmentId->deptId) + + tableKey:String admin_authority + facadeKey:String AdminAuthorityFacade,AdminAuthorityQueryFacade + controllerKey:String AdminAuthorityController,AdminAuthorityQueryController + + dtoKeyList:String UpdateAdminAuthorityRequestDTO,AdminAuthorityDTO,CreateAdminAuthorityRequestDTO + voKeyList:String UpdateAdminAuthorityRequestVO,AdminAuthorityVO,CreateAdminAuthorityRequestVO + + queryDtoKey:SystemAuthorityQueryDTO String authCode,String systemCode,String funcCode + queryVoKey:SystemAuthorityQueryVO String authCode,String systemCode,String funcCode + + contextKey:String authority + + + 获取系统菜单权限信息: AdminAuthorityDTO AdminAuthorityQueryFacade.getByCode(String authCode) + 给角色授权系统菜单权限: AdminAuthorityDTO AdminAuthorityFacade.saveAdminAuthority(CreateSystemAuthorityRequestDTO createAuthorityRequestDTO) + 修改角色授权系统菜单权限: Boolean AdminAuthorityFacade.updateAdminAuthority(UpdateSystemAuthorityRequestDTO createAuthorityRequestDTO) + + 获取系统菜单权限信息/systemauthority/getbycode: AdminAuthorityVO AdminAuthorityQueryController.getByCode(String authCode) + 分页获取系统菜单权限信息/systemauthority/pagelist: PageVO AdminAuthorityQueryController.getPageList(PageVO pageVO) + + + } + + class "系统设置-SystemConfig" as SystemConfig{ + 变量名:String varName + 变量描述:String varDesc + 变量值:String value + } + + class "系统管理-SystemBO" as SystemBO{ + 系统名称:String systemName + 系统标示:String systemCode + 系统域名:String systemUrl + 系统图标:String systemPicUrl + 系统技术负责人:Long tecAdminUserId + 系统业务负责人:Long busAdminUserId + 系统当前所在部门:Long departmentId + 系统模块列表:List moduleBOList + .. extend info .. + tableKey:String system + controllerKey:String SystemController + + facadeKey:String SystemFacade,SystemQueryFacade + controllerKey:String SystemController,SystemQueryController + + dtoKeyList:String UpdateSystemRequestDTO,SystemDTO,CreateSystemRequestDTO + voKeyList:String UpdateSystemRequestVO,SystemVO,CreateSystemRequestVO + + queryDtoKey:SystemQueryDTO String systemName,String systemCode,Long tecAdminUserId,Long departmentId + queryVoKey:SystemQueryVO String systemName,String systemCode,Long tecAdminUserId,Long departmentId + + contextKey:String system + + + invokeFileKey:String systemcontextseq.puml + 注册系统: SystemDTO SystemFacade.registSystem(SystemDTO systemDTO) + 分页获取系统信息: PageDTO SystemFacade.getPageList(PageDTO pageDto) + 获取单条系统信息: SystemDTO SystemQueryFacade.getBySystemCode(String systemCode) + 修改系统信息: Boolean SystemFacade.updateSystem(UpdateSystemRequestDTO dto) + 搜索获取系统信息: List SystemQueryFacade.getSearchList(String search) + + + 分页获取系统信息/system/pagelist: PageVO SystemQueryController.getPageList(SystemVO systemVO) + 搜索获取系统信息/system/search: List SystemQueryController.getSearchList(String search) + 新建系统信息/system/save: SystemVO SystemController.saveSystem(CreateSystemRequestVO systemVO) + 修改系统信息/system/update: Boolean SystemController.updateSystem(UpdateSystemRequestVO systemVO) + 通过系统编号获取系统信息/system/getbycode: SystemVO SystemQueryController.getByCode(String systemCode) + + } + class "菜单/模块管理-ModuleBO" as ModuleBO{ + 菜单名称:String moduleName + 菜单编码:String moduleCode + 菜单链接:String moduleUrl + 系统标示:String systemCode + 按钮列表:List menuBOList + .. extend info .. + tableKey:String module + facadeKey:String ModuleFacade + controllerKey:String ModuleController + dtoKeyList:String UpdateModuleRequestDTO,ModuleDTO,CreateModuleRequestDTO + voKeyList:String UpdateModuleRequestVO,ModuleVO,CreateModuleRequestVO + + contextKey:String system + + + 创建菜单信息/module/createmodule: List createModule(CreateModuleRequestVO createModuleRequestVO) + 创建菜单信息/module/updatemodule: List updateModule(UpdateModuleRequestVO updateModuleRequestVO) + 获取系统菜单列表信息/module/getbysystemcode: List getBySystemCode(String systemCode) + 获取菜单信息/module/getbycode: ModuleVO getByModuleCode(String moduleCode) + 分页获取菜单信息/module/pagelist: PageDTO getPageList() + 导入菜单信息/module/import: Boolean importModuleList(List createRequest) + 导出菜单信息/module/export: Boolean exportModuleList(String systemCode) + } + + class "按钮管理-MenuBO" as MenuBO{ + 按钮名称:String menuName + 按钮编码:String menuCode + 按钮链接:String menuUrl + 系统编码:String systemCode + 菜单编码:String moduleCode + .. extend info .. + tableKey:String menu + facadeKey:String MenuFacade + controllerKey:String MenuController + dtoKeyList:String UpdateMenuRequestDTO,MenuDTO,CreateMenuRequestDTO + voKeyList:String UpdateMenuRequestVO,MenuVO,CreateMenuRequestVO + + contextKey:String system + + + 注册按钮: MenuDTO registMenu(MenuDTO menuDTO) + 分页获取按钮信息: PageDTO getPageList(PageDTO pageDto) + 获取单条按钮信息: MenuDTO getByMenuCode(String systemCode) + 修改按钮信息: Boolean updateMenu(UpdateMenuRequestDTO dto) + + + 修改按钮信息/menu/updatemenu: Boolean updateMenu(UpdateMenuRequestVO updateMenuRequestVO) + 创建按钮信息/menu/createmenu: MenuVO createMenu(CreateMenuRequestVO createMenuRequestVO) + 获取按钮详情信息/menu/getbycode: MenuVO getByCode(String menuCode) + 获取按钮列表信息/menu/pagelist: PageVO getPageList(String moduleCode ) + + + + } + + class "数据字段实体-DataColumnBO" as DataColumnBO{ + 数据库业务系统名称:String busDataBase + 数据库表名称:String tableName + 数据库表描述:String tableDesc + 数据库字段名称:String columnName + 数据库字段描述:String columnDesc + 业务字段名称:String fieldName + .. extend info .. + tableKey:String data_column_config + + controllerKey:String DataColumnController + facadeKey:String DataColumnFacade + + dtoKeyList:String DataColumnDTO + voKeyList:String DataColumnVO + + queryDtoKey:DataColumnQueryDTO String busDataBase,String tableName,String columnName + queryVoKey:DataColumnQueryVO String busDataBase,String tableName,String columnName + + contextKey:String config + + !invokeFileKey:String datacolumncontextseq.puml + 获取数据字段信息/datacolumn/getbycode: List getListByBusDataBase(String busDataBase) + 分页获取数据字段信息/datacolumn/pagelist: PageVO getPageList(PageVO pageVO) + 导入数据字段列表/datacolumn/import: Boolean importDataColumnList(List dataColumnVOList) + + + 获取数据字段信息: List getListByBusDataBase(String busDataBase) + 分页获取数据字段信息: PageDTO getPageList(PageDTO PageDTO) + 导入数据字段列表: Boolean importDataColumnList(List dataColumnDTOList) + + + + } + + + class "AuthAggregateBO-权限聚合根" as AuthAggregateBO{ + +系统权限:List systemBOList + +菜单权限:List moduleBOList + +按钮权限:List menuBOList + +城市权限:List cityIdList + +部门权限:List departmentIdList + +数据字段权限:List dataColumnBOList + .. extend info .. + contextKey:String authority + } + + class "UserAuthAggregateBO-用户权限聚合根" as UserAuthAggregateBO{ + 用户ID:Long userId + .. extend info .. + contextKey:String authority + } + + class "RoleAuthAggregateBO-角色权限聚合根" as RoleAuthAggregateBO{ + 角色ID:Long roleId + .. extend info .. + contextKey:String authority + } + + AuthorityBO <|-- DataAuthorityBO + AdminAuthorityBO --|> AuthorityBO + SystemAuthorityBO --|> AuthorityBO + UserAuthAggregateBO --|> AuthAggregateBO + RoleAuthAggregateBO --|> AuthAggregateBO + +} + + +package domain.msgbody { + class "UserStatusChangeMsgBody-接收用户状态变更消息" as UserChangeMsgBody{ + 用户ID:Long userId + 状态类型:Integer statusType + } +} + +package domain.event{ + class "MenuChangedEvent-按钮信息变更事件" as MenuChangedEvent{ + 按钮code:String menuCode + 变更事件类型:Integer changeEventType + 按钮内容:MenuBO menuBO + } + class "RoleChangedEvent-角色变更事件" as RoleChangedEvent{ + 角色code:String roleCode + 变更事件类型:Integer changeEventType + 角色内容:RoleBO roleBO + } + class "RoleAuthChangedEvent-角色授权变更事件" as RoleAuthChangedEvent{ + 角色code:String roleCode + 权限code:String authCode + 变更事件类型:Integer changeEventType + 角色内容:RoleBO roleBO + } + + BaseEvent <|-- MenuChangedEvent + BaseEvent <|-- RoleChangedEvent + BaseEvent <|-- RoleAuthChangedEvent +} + +package domain.repository { + interface "系统菜单按钮仓库服务-SystemModuleRepository" as SystemModuleRepository{ + 创建系统信息:Long saveSystem(SystemBO systemBO) + 更新系统信息:Integer updateSystem(SystemBO systemBO) + 创建菜单信息:Long saveModule(ModuleBO moduleBO) + 更新菜单信息:Integer updateModule(ModuleBO moduleBO) + 创建按钮信息:Long saveMenu(MenuBO moduleBO) + 更新按钮信息:Integer updateMenu(MenuBO moduleBO) + + } + interface "权限管理仓库-AuthorityRepository" as AuthorityRepository{ + 给角色构建权限:Boolean buildAuthority(AuthorityBO authorityBO) + 给角色更新权限:Boolean updateAuthority(AuthorityBO authorityBO) + 根据权限code禁用权限资源:Boolean disableAuthority(String authorityCode) + 根据权限code查询权限资源:AuthorityBO getByCode(String authorityCode) + 根据角色code查询权限资源:AuthorityBO getByRoleCode(String roleCode) + } + interface "用户和角色管理仓库-UserRoleRepository" as UserRoleRepository{ + 保存用户组并尝试关联用户:Long saveUserGroup(UserGroupBO userGroupBO) + 更新用户组:Integer updateUserGroup(UserGroupBO userGroupBO) + 保存角色组并尝试关联角色:Long saveRoleGroup(RoleGroupBO roleGroupBO) + 更新角色组:Integer updateRoleGroup(RoleGroupBO roleGroupBO) + 保存角色: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) + } +} +package domain.gataway { + + + interface "系统菜单按钮查询服务-SystemModuleQueryGataWay" as SystemModuleQueryGataWay{ + 分页查询系统列表:List querySystemPage(PageBO pageBO) + 分页查询菜单列表:List queryModulePage() + 基于系统code查询菜单和按钮:List queryBySystemCode(String systemCode) + 根据条件查询系统:List queryByCondition(String search) + 查询所有系统菜单和按钮:List queryWithAll(String search) + 根据code查询系统详情:SystemBO getSystemByCode(String systemCode) + 根据code查询菜单详情:ModuleBO getModuleByCode(String moduleCode) + 根据code查询按钮详情:MenuBO getMenu(String menuCode) + } + + + + + interface "数据字段管理网关-DataColumnConfigGataway" as DataColumnConfigGataway{ + 保存数据字段:Long saveDataColumn(DataColumnBO dataColumnBO) + 批量保存保存数据字段:Boolean saveBatchDataColumn(List list) + 更新数据字段:Long updateDataColumn(DataColumnBO dataColumnBO) + 根据ID查询数据字段详情:DataColumnBO getById(Long id) + 根据数据库名称获取字段元数据内容:List getByDBCode(String busDataBase) + 分页查询数据字段内容:List getPageList(PageBO pageBO) + } + +} + + +package "领域工厂服务包-domain.factory" { + class "权限工厂服务-AuthorityFactory" as AuthorityFactory{ + +基于权限本身的维度-权限编码构建权限模型:AuthorityBO buildAuthorityByCode(String authorityCode) + +基于用户的维度构建权限模型:UserAuthAggregateBO buildAuthorityWithRoleCode(String roleCode) + } + +} + +package "防腐层包-infrast.acl" as infrast.acl { + interface "部门查询服务适配器-DepartmentServiceAdapter" as DepartmentServiceAdapter{ + 查询所有有效的部门: List queryAllDepartment(DepartmentQueryDTO queryDto) + 查询子部门: List queryDepartmentsList(Long pId) + } + + interface "省份城市查询服务适配器-AreaServiceAdapter" as AreaServiceAdapter{ + 查询所有的省份: List queryAllProvince() + 查询省份下所有城市: List queryCityByProvinceid(Long provinceId) + } + +} + +package "缓存包-infrast.cache" as infrast.cache { + class "抽象业务缓存服务-AbstractCache" as AbstractCache{ + + + } + + class "系统菜单缓存服务-SystemCache" as SystemCache{ + } + + class "角色用户缓存服务-UserRoleGroupCache" as UserRoleGroupCache{ + + } + + class "数据权限缓存-DataAuthorityCache" as DataAuthorityCache{ + + } + + class "系统菜单权限缓存-SystemAuthorityCache" as SystemAuthorityCache{ + + } + + class "行政权限缓存-AdminAuthorityCache" as AdminAuthorityCache{ + + } + + class "基于用户维度的缓存-UserAuthorityCache" as UserAuthorityCache{ + + } + + class "基于角色维度的缓存-RoleAuthorityCache" as RoleAuthorityCache{ + + } + + SystemCache --|> AbstractCache + + UserRoleGroupCache --|> AbstractCache + DataAuthorityCache --|> AbstractCache + SystemAuthorityCache --|> AbstractCache + AdminAuthorityCache --|> AbstractCache + UserAuthorityCache --|> AbstractCache + RoleAuthorityCache --|> AbstractCache + +} + + + +package app.command { + + class "抽象命令类-AbstractCmd" as AbstractCmd{ + +操作时间: Date operateTime + +操作人ID: Long userId + +命令类: Class commandClass + +命令数据: String payLoad; + + } + + class "增加用户组命令-AddUserGroupCmd" as AddUserGroupCmd{ + 组名:String groupName + 用户ID:Long userId + } + + class "增加用户命令-AddUserCmd" as AddUserCmd{ + 用户名:String userName + 用户ID:Long userId + 所属组织:Long departmentId + } + + class "增加用户权限-AddUserAuthCmd" as AddUserAuthCmd{ + 用户ID:Long userId + 角色ID:Long roleId + 权限类型:int authorityType + 权限数据内容:String json + } + + class "更新用户权限-UpdateUserAuthCmd" as UpdateUserAuthCmd{ + 用户ID:Long userId + 角色ID:Long roleId + 权限数据内容:String json + } + + class "更新角色权限-UpdateRoleAuthCmd" as UpdateRoleAuthCmd{ + 角色ID:Long roleId + 权限数据内容:String json + } + + class "对角色权限-AddRoleAuthCmd" as AddRoleAuthCmd{ + 角色ID:Long roleId + 权限数据内容:String json + } + + AddUserRoleCmd --|> AbstractCmd + AddUserGroupCmd --|> AbstractCmd + AddUserCmd --|> AbstractCmd + AddUserAuthCmd --|> AbstractCmd + UpdateUserAuthCmd --|> AbstractCmd + AddRoleAuthCmd --|> AbstractCmd + UpdateRoleAuthCmd --|> AbstractCmd + +} + + +package app.exe { + + interface "命令执行接口-CmdExeService" as CmdExeService{ + 命令执行入口:String exe(AbstractCmd abstractCmd) + } + + class "用户组cmd处理类-UserGroupCmdExe" as UserGroupCmdExe{ + + } + + class "用户cmd处理类-UserCmdExe" as UserCmdExe{ + + } + + class "用户权限cmd处理类-UserAuthCmdExe" as UserAuthCmdExe{ + + } + + + class "角色权限cmd处理类-RoleAuthCmdExe" as RoleAuthCmdExe{ + + } + + UserGroupCmdExe ..|> CmdExeService + UserCmdExe ..|> CmdExeService + UserAuthCmdExe ..|> CmdExeService + RoleAuthCmdExe ..|> CmdExeService + +} + + + +package "应用层事件监听器包支持域内消息和域外消息，在应用层处理消息-app.listener" as app.listener{ + class "权限变更监听器-AuthorityChangeListener" as AuthorityChangeListener{ + +事务提交后权限变更监听:void authorityCreate(String authCode) + +用户状态信息变更监听消费:void userStatusChange(Long userId) + } + + class "系统菜单按钮变更监听器-SystemChangeListener" as SystemChangeListener{ + +事务提交后权限变更监听:void systemChange(MenuChangedEvent event) + } +} + + + +package "基础设施层消息生产者-mq.producer" as mq.producer { + class "权限上下文消息生产者-AuthorityMqProducer" as AuthorityMqProducer{ + +权限创建:void authorityCreate(String authCode) + +权限更新:void authorityUpdate(String authCode) + } + + class "系统上下文消息生产者-SystemMqProducer" as SystemMqProducer{ + +事务提交后权限变更监听:void systemChange(MenuChangedEvent event) + } +} + +package "基础设施层消息消费者-mq.consumer" as mq.consumer { + class "用户上下文消息消费者或者监听-UserMqConsumer" as UserMqConsumer{ + +监听用户状态变更:void consumeUserStatusChange(String mqBody) + } + class "组织上下文消息消费者或者监听-DepartmentMqConsumer" as DepartmentMqConsumer{ + +监听组织状态变更:void consumeDepartmentStatusChange(String mqBody) + } +} + + +package "基础设施层消息消费处理器或者直接在基础设施层处理消息代码方案一-mq.handler" as mq.handler { + class "用户上下文消息处理器-UserMqHandler" as UserMqHandler{ + +处理用户状态变更的权限信息:void handleUserStatusChange(String mqBody) + } +} + +@enduml \ No newline at end of file diff --git a/codemaker-core/src/main/resources/ddd-plantuml/schoolmanager/SchoolManager.puml b/codemaker-parent/codemaker-core/src/main/resources/ddd-plantuml/schoolmanager/SchoolManager.puml similarity index 100% rename from codemaker-core/src/main/resources/ddd-plantuml/schoolmanager/SchoolManager.puml rename to codemaker-parent/codemaker-core/src/main/resources/ddd-plantuml/schoolmanager/SchoolManager.puml diff --git a/codemaker-core/src/main/resources/ddd-plantuml/tradeservice/TradeOrderDomain.puml b/codemaker-parent/codemaker-core/src/main/resources/ddd-plantuml/tradeservice/TradeOrderDomain.puml similarity index 48% rename from codemaker-core/src/main/resources/ddd-plantuml/tradeservice/TradeOrderDomain.puml rename to codemaker-parent/codemaker-core/src/main/resources/ddd-plantuml/tradeservice/TradeOrderDomain.puml index 7aa69a25b23c8829277cf60a6e9a8c85e69a8fb7..222c45d37d08d1640259b8e8faaf614d388ce00f 100644 --- a/codemaker-core/src/main/resources/ddd-plantuml/tradeservice/TradeOrderDomain.puml +++ b/codemaker-parent/codemaker-core/src/main/resources/ddd-plantuml/tradeservice/TradeOrderDomain.puml @@ -2,53 +2,62 @@ -enum "交易单类型-OrderTypeEnum" as OrderTypeEnum{ +enum "订单类型-OrderTypeEnum" as OrderTypeEnum{ BILL_ORDER("bill_order","账单"), - TRADE_ORDER("trade_order","主交易单"), - TRADE_SUB_ORDER("trade_sub_order","子交易单"), + TRADE_ORDER("trade_order","主订单"), + TRADE_SUB_ORDER("trade_sub_order","子订单"), TRADE_PAYMENT("trade_payment_order","支付单"); - 交易单code:String code - 交易单描述:String desc + 订单code:String code + 订单描述:String desc static OrderTypeEnum getByCode(String code) } -package com.xxx.xx.bo { - class "主交易单-tradeOrderBO" as tradeOrderBO{ - -主交易单code:String tradeOrderCode - -主交易单类型:String tradeOrderType - #主交易单状态:int status +package domain.bo { + class "主订单-TradeOrderBO" as TradeOrderBO{ + -主订单code:String tradeOrderCode + -主订单类型:String tradeOrderType + #主订单状态:int status #主业务单号:String mainBizOrderCode -创建变更日志:TradeOrderLogBO buildTradeOrderLogBO() } - class "子交易单-tradeSubOrderBO" as tradeSubOrderBO{ - 子交易单code:String subOrderCode - 子交易单类型:String subOrderType - 子交易单状态: int status + class "子订单-TradeSubOrderBO" as TradeSubOrderBO{ + 子订单code:String subOrderCode + 子订单类型:String subOrderType + 子订单状态: int status 业务订单编号: String bizOrderCode - 主交易单code: String tradeOrderCode + 主订单code: String tradeOrderCode TradeOrderLogBO buildTradeOrderLogBO() } - class "交易账单-TradeBillOrderBO" as TradeBillOrderBO { + class "订账单-TradeBillOrderBO" as TradeBillOrderBO { 账单号:String billOrderCode 账单金额:Long billAmount - 关联的子交易单列表:List tradeSubOrderBOList + 创建人:String createUserId + 创建人姓名:String createUserName + 账单标题:String billOrderCode + 关联的子订单列表:List tradeSubOrderBOList TradeOrderLogBO buildTradeOrderLogBO() + .. extend info .. + exportaclkey:CreatePaymentRequestDTO(createUserId->payUserId,createUserName->payUserName) + } class "账单与支付单关系-tradeBillPaymentBO" as tradeBillPaymentBO { 账单号:String billOrderCode - 支付交易单号:String paymentOrderCode - 支付交易单金额:Long paymentAmount + 支付订单号:String paymentOrderCode + 支付订单金额:Long paymentAmount 已支付金额:Long paidAmount 签名:String sign - 支付交易单状态:int status + 支付订单状态:int status TradeOrderLogBO buildTradeOrderLogBO() + .. extend info .. + exportaclkey:CreatePaymentRequestDTO(paymentOrderCode>payOrderId,paymentAmount>payAmount,paidAmount) + } class "单据操作变更日志-tradeOrderLogBO" as tradeOrderLogBO{ @@ -64,11 +73,11 @@ package com.xxx.xx.bo { } -package com.xxx.xx.msgbody { - class "主交易单状态变更消息体-tradeOrderStatusChangeMsgBody" as TradeOrderStatusChangeMsgBody{ - -主交易单code:String tradeOrderCode - #主交易单状态:int status - #主交易单状态描述:String statusStr +package domain.msgbody { + class "主订单状态变更消息体-tradeOrderStatusChangeMsgBody" as TradeOrderStatusChangeMsgBody{ + -主订单code:String tradeOrderCode + #主订单状态:int status + #主订单状态描述:String statusStr #主业务单号:String mainBizOrderCode } @@ -80,30 +89,34 @@ package com.xxx.xx.msgbody { } } -package com.xxx.xx.gataway { - interface "交易单仓库服务-TradeOrderRepository" as TradeOrderRepository{ - 创建主交易单 String createMainOrder(TradeOrderBO tradeOrderBO) - 创建子交易单 String createSubOrder(TradeSubOrderBO tradeSubOrderBO) +package domain.gataway { + interface "订单仓库服务-TradeOrderRepository" as TradeOrderRepository{ + 创建主订单 String createMainOrder(TradeOrderBO tradeOrderBO) + 创建子订单 String createSubOrder(TradeSubOrderBO tradeSubOrderBO) 创建账单 String createBillOrder(TradeBillOrderBO tradeBillBO) 创建支付单 TradeBillPaymentBO createPaymentOrder(TradeBillPaymentBO tradeBillPaymentBO) } - interface "交易单查询服务-TradeOrderQueryGataway" as TradeOrderQueryGataway{ - 查询主交易单 TradeOrderBO queryMainOrder(String orderCode) - 查询子交易单 TradeSubOrderBO querySubOrder(String subOrderCode) + interface "订单查询服务-TradeOrderQueryGataway" as TradeOrderQueryGataway{ + 查询主订单 TradeOrderBO queryMainOrder(String orderCode) + 查询子订单 TradeSubOrderBO querySubOrder(String subOrderCode) 查询账单 TradeBillOrderBO queryBillOrder(String billOrderCode) 查询支付单 TradeBillPaymentBO queryPaymentOrder(String paymentOrderCode) } } -package com.xxx.xx.factory { +package domain.factory { class "单据操作日志工厂-TradeOrderLogFactory" as TradeOrderLogFactory{ 保存单据操作日志 String createTradeOrderLog(TradeOrderLogBO tradeOrderLogBO) 获取某一条单据的变更历史 List getOrderLogList(String orderType,String orderCode) } } - +package "防腐层包-infrast.acl" as infrast.acl { + interface "支付服务适配包-PayServiceAdapter" as PayServiceAdapter{ + 创建支付单: String createPayment(CreatePaymentRequestDTO createPaymentRequestDTO) + } +} @enduml \ No newline at end of file diff --git a/codemaker-core/src/main/resources/invoke-plantuml/Demo.puml b/codemaker-parent/codemaker-core/src/main/resources/invoke-plantuml/Demo.puml similarity index 100% rename from codemaker-core/src/main/resources/invoke-plantuml/Demo.puml rename to codemaker-parent/codemaker-core/src/main/resources/invoke-plantuml/Demo.puml diff --git a/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/createauthoritydata.puml b/codemaker-parent/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/createauthoritydata.puml similarity index 67% rename from codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/createauthoritydata.puml rename to codemaker-parent/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/createauthoritydata.puml index ccdf54c9a763683902d6ea02a558e2815b7bac01..3a452a4e512585d06c4ef1ca95ae8dab126cbd00 100644 --- a/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/createauthoritydata.puml +++ b/codemaker-parent/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/createauthoritydata.puml @@ -4,13 +4,13 @@ participant 应用api层 as app participant 领域层 as domain participant 基础设施层 as infrast group 系统上下文调用流程 -app --> app: 1.给某角色授权\n AuthorityFacade.saveAuthority invoke RoleAuthCmdExe.exe -app --> domain:2.转入命令层\n RoleAuthCmdExe.exe invoke AuthorityRepository.buildAuthority +app_rpc --> app_rpc: 1.给某角色授权\n AuthorityFacade.saveAuthority invoke RoleAuthCmdExe.exe +app_rpc --> domain:2.转入命令层\n RoleAuthCmdExe.exe invoke AuthorityRepository.buildAuthority domain --> infrast:3.准备保存角色授权数据\n AuthorityRepository.buildAuthority invoke AuthorityMapper.insert domain --> infrast:4.保存系统权限数据\n AuthorityRepository.buildAuthority invoke SystemAuthorityMapper.insert domain --> infrast:5.保存行政权限详情\n AuthorityRepository.buildAuthority invoke AdminAuthorityMapper.insert domain --> infrast:6.保存数据权限详情\n AuthorityRepository.buildAuthority invoke DataAuthorityMapper.insert -app --> infrast:7.发送授权消息\n AuthorityFacade.saveAuthority invoke AuthorityMqProducer.authorityCreate +domain --> infrast:7.发送授权事件\n AuthorityRepository.buildAuthority invoke AppEventPublisher.publish end diff --git a/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/createauthoritydatahttp.puml b/codemaker-parent/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/createauthoritydatahttp.puml similarity index 72% rename from codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/createauthoritydatahttp.puml rename to codemaker-parent/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/createauthoritydatahttp.puml index 63adc59787dfe0468c27bbee3161bf142ad62381..c61cef89af7206fd4d0dc67b482a2fa49bf94dea 100644 --- a/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/createauthoritydatahttp.puml +++ b/codemaker-parent/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/createauthoritydatahttp.puml @@ -4,12 +4,12 @@ participant 应用api层 as app participant 领域层 as domain participant 基础设施层 as infrast group 系统上下文调用流程 -app --> domain: 1.给某角色授权\nAuthorityOperationController.saveAuthority invoke AuthorityRepository.buildAuthority +app_http --> domain: 1.给某角色授权\nAuthorityOperationController.saveAuthority invoke AuthorityRepository.buildAuthority domain --> infrast:2.准备保存角色授权数据\n AuthorityRepository.buildAuthority invoke AuthorityMapper.insert domain --> infrast:3.保存系统权限数据\n AuthorityRepository.buildAuthority invoke SystemAuthorityMapper.insert domain --> infrast:4.保存行政权限详情\n AuthorityRepository.buildAuthority invoke AdminAuthorityMapper.insert domain --> infrast:5.保存数据权限详情\n AuthorityRepository.buildAuthority invoke DataAuthorityMapper.insert -app --> infrast:6.发送授权消息\n AuthorityFacade.saveAuthority invoke AuthorityMqProducer.authorityCreate +app_http --> infrast:6.发送授权消息\n AuthorityFacade.saveAuthority invoke AuthorityMqProducer.authorityCreate end diff --git a/codemaker-parent/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/datacolumncontextseq.puml b/codemaker-parent/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/datacolumncontextseq.puml new file mode 100644 index 0000000000000000000000000000000000000000..22af333b97e5d37aac04a1a255ccbe3fd9087a65 --- /dev/null +++ b/codemaker-parent/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 导入数据字段内容 +app_http --> domain: 1.导入数据\n DataColumnController.importDataColumnList invoke DataColumnConfigGataway.saveBatchDataColumn +domain --> infrast:2.持久化系统数据\n DataColumnConfigGataway.saveBatchDataColumn invoke DataColumnConfigMapper.insertBatch(List) +end + + +group 分页查询 +app_http --> domain: 3.注册系统\n DataColumnController.getPageList invoke DataColumnConfigGataway.getPageList +domain --> infrast:4.持久化系统数据\n DataColumnConfigGataway.getPageList invoke DataColumnConfigMapper.getPageList(PageBO) +end + +group +app_http --> domain: 3.注册系统\n DataColumnController.getListByBusDataBase invoke DataColumnConfigGataway.getByDBCode +domain --> infrast:4.持久化系统数据\n DataColumnConfigGataway.getByDBCode invoke DataColumnConfigMapper.getByDBCode(String busDataBase) +end + + +@enduml \ No newline at end of file diff --git a/codemaker-parent/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/queryauthoritydata.puml b/codemaker-parent/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/queryauthoritydata.puml new file mode 100644 index 0000000000000000000000000000000000000000..7474ed00731451a9ae34ae568a519abad8ba7bdf --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/queryauthoritydata.puml @@ -0,0 +1,21 @@ +@startuml + +participant 应用api层 as facade +participant 领域层 as domain +participant 基础设施层 as infrast +participant 组织服务 as infosysuser + +group 系统上下文调用流程 +app_rpc --> domain: 1.根据权限code查询权限信息\nAuthorityFacade.getByCode invoke AuthorityFactory.buildAuthorityByCode +domain --> domain:2.查询权限详情\n AuthorityFactory.buildAuthorityByCode invoke AuthorityRepository.getByCode +domain --> infrast:3.查询权限详情\n AuthorityRepository.getByCode invoke AuthorityMapper.getByCode +domain --> infrast:4.查询系统权限详情\n AuthorityRepository.getByCode invoke SystemAuthorityMapper.getByCode +domain --> infrast:5.查询行政权限详情\n AuthorityRepository.getByCode invoke AdminAuthorityMapper.getByCode +infrast --> infrast:6.查询部门信息\n AuthorityRepository.getByCode invoke DepartmentServiceAdapter.queryAllDepartment +infrast -> infosysuser:7.查询部门信息\n DepartmentServiceAdapter.queryAllDepartment invoke DepartmentQueryFacade.queryAllDepartment +infrast -> infosysuser:8.查询部门信息适配接口测试\n DepartmentServiceAdapter.queryAllDepartment invoke DepartmentQueryFacade.queryAllDepartment + + +end + +@enduml \ No newline at end of file diff --git a/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/queryauthoritydatahttp.puml b/codemaker-parent/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/queryauthoritydatahttp.puml similarity index 100% rename from codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/queryauthoritydatahttp.puml rename to codemaker-parent/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/queryauthoritydatahttp.puml diff --git a/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/queryauthoritydata.puml b/codemaker-parent/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/queryauthoritydatav2.puml similarity index 58% rename from codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/queryauthoritydata.puml rename to codemaker-parent/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/queryauthoritydatav2.puml index fba7bc2d06e92b29c9c220a327610c46859205af..6575f04246bf261eb54581f39b84e89ed574a9fd 100644 --- a/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/queryauthoritydata.puml +++ b/codemaker-parent/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/queryauthoritydatav2.puml @@ -3,12 +3,17 @@ participant 应用api层 as facade participant 领域层 as domain participant 基础设施层 as infrast +participant 组织服务 as infosysuser + group 系统上下文调用流程 -facade --> domain: 1.根据权限code查询权限信息\nAuthorityFacade.getByCode invoke AuthorityFactory.buildAuthorityByCode +app_rpc --> domain: 1.根据权限code查询权限信息\nAuthorityFacade.getByCode invoke AuthorityFactory.buildAuthorityByCode domain --> domain:2.查询权限详情\n AuthorityFactory.buildAuthorityByCode invoke AuthorityRepository.getByCode domain --> infrast:3.查询权限详情\n AuthorityRepository.getByCode invoke AuthorityMapper.getByCode domain --> infrast:4.查询系统权限详情\n AuthorityRepository.getByCode invoke SystemAuthorityMapper.getByCode domain --> infrast:5.查询行政权限详情\n AuthorityRepository.getByCode invoke AdminAuthorityMapper.getByCode +infrast --> infrast:6.查询部门信息\n AuthorityRepository.getByCode invoke DepartmentServiceAdapter.queryDepartmentsList +infrast -> infosysuser:7.查询部门信息\n DepartmentServiceAdapter.queryDepartmentsList invoke DepartmentQueryFacade.queryBySuperId + end diff --git a/codemaker-parent/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/queryauthoritydatav3.puml b/codemaker-parent/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/queryauthoritydatav3.puml new file mode 100644 index 0000000000000000000000000000000000000000..6575f04246bf261eb54581f39b84e89ed574a9fd --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/queryauthoritydatav3.puml @@ -0,0 +1,20 @@ +@startuml + +participant 应用api层 as facade +participant 领域层 as domain +participant 基础设施层 as infrast +participant 组织服务 as infosysuser + +group 系统上下文调用流程 +app_rpc --> domain: 1.根据权限code查询权限信息\nAuthorityFacade.getByCode invoke AuthorityFactory.buildAuthorityByCode +domain --> domain:2.查询权限详情\n AuthorityFactory.buildAuthorityByCode invoke AuthorityRepository.getByCode +domain --> infrast:3.查询权限详情\n AuthorityRepository.getByCode invoke AuthorityMapper.getByCode +domain --> infrast:4.查询系统权限详情\n AuthorityRepository.getByCode invoke SystemAuthorityMapper.getByCode +domain --> infrast:5.查询行政权限详情\n AuthorityRepository.getByCode invoke AdminAuthorityMapper.getByCode +infrast --> infrast:6.查询部门信息\n AuthorityRepository.getByCode invoke DepartmentServiceAdapter.queryDepartmentsList +infrast -> infosysuser:7.查询部门信息\n DepartmentServiceAdapter.queryDepartmentsList invoke DepartmentQueryFacade.queryBySuperId + + +end + +@enduml \ No newline at end of file diff --git a/codemaker-parent/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/queryauthoritydatav4.puml b/codemaker-parent/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/queryauthoritydatav4.puml new file mode 100644 index 0000000000000000000000000000000000000000..51c847d874ca4834ebcbf0d89ab963064df8d587 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/queryauthoritydatav4.puml @@ -0,0 +1,16 @@ +@startuml + +participant 应用api层 as facade +participant 领域层 as domain +participant 基础设施层 as infrast +participant 组织服务 as infosysuser + +group 系统上下文调用流程 +app_rpc --> domain: 1.根据权限code查询权限信息\nAuthorityFacade.getByCode invoke AuthorityFactory.buildAuthorityByCode +domain --> domain:2.查询权限详情\n AuthorityFactory.buildAuthorityByCode invoke AuthorityRepository.getByCode +domain --> infrast:3.这里演示调用组件hutool的工具类\n AuthorityRepository.getByCode invoke MapBuilder.create + + +end + +@enduml \ No newline at end of file diff --git a/codemaker-parent/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/queryauthoritydatav5.puml b/codemaker-parent/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/queryauthoritydatav5.puml new file mode 100644 index 0000000000000000000000000000000000000000..d4c74b6f50bd45594b8272c3a8fa5b7f078ad4f8 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/queryauthoritydatav5.puml @@ -0,0 +1,15 @@ +@startuml + +participant 应用api层 as facade +participant 领域层 as domain +participant 基础设施层 as infrast +participant 组织服务 as infosysuser + +group 系统上下文调用流程 +facade --> domain: 1.根据权限code查询权限信息\nAuthorityFacade.getByCode invoke AuthorityFactory.buildAuthorityByCode +domain --> domain:2.查询权限详情\n AuthorityFactory.buildAuthorityByCode invoke AuthorityRepository.getByCode + + +end + +@enduml \ No newline at end of file diff --git a/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/rolecontextseq.puml b/codemaker-parent/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/rolecontextseq.puml similarity index 89% rename from codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/rolecontextseq.puml rename to codemaker-parent/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/rolecontextseq.puml index 81e16fdbbbfd7d2e31eb35fad74fcc59ff1ebbaf..6c1b0e888b971f1308698dd6f33b60deab7e30d6 100644 --- a/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/rolecontextseq.puml +++ b/codemaker-parent/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/rolecontextseq.puml @@ -6,7 +6,7 @@ participant 领域层 as domain participant 基础设施层 as infrast group 创建角色 -http --> domain: 1.创建角色\n RoleController.createRole invoke UserRoleRepository.saveRole +app_http --> domain: 1.创建角色\n RoleController.createRole invoke UserRoleRepository.saveRole domain --> infrast:2.持久化角色\n UserRoleRepository.saveRole invoke RoleMapper.insert end diff --git a/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/systemcontextseq.puml b/codemaker-parent/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/systemcontextseq.puml similarity index 64% rename from codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/systemcontextseq.puml rename to codemaker-parent/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/systemcontextseq.puml index 09d7db0ca1f44862af49f8a4282b4a1e48ae85bb..f2b808c66e548313ce4b88da762bac8a5ae16b7f 100644 --- a/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/systemcontextseq.puml +++ b/codemaker-parent/codemaker-core/src/main/resources/invoke-plantuml/infosys-auth/systemcontextseq.puml @@ -5,43 +5,34 @@ participant 应用http层 as http participant 领域层 as domain participant 基础设施层 as infrast group 系统注册流程 -http --> domain: 1.查询系统信息是否已注册\nSystemController.saveSystem invoke SystemModuleQueryGataWay.getSystemByName +app_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 +app_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 +app_http --> domain: 1.分页查询系统数据\n SystemQueryController.getPageList invoke SystemModuleQueryGataWay.querySystemPage domain --> infrast:2.分页查询系统数据\n SystemModuleQueryGataWay.querySystemPage invoke SystemMapper.getPageList(PageBO pageBO) -http --> domain: 3.根据条件搜索\nSystemController.getSearchList invoke SystemModuleQueryGataWay.queryByCondition +app_http --> domain: 3.根据条件搜索\SystemQueryController.getSearchList invoke SystemModuleQueryGataWay.queryByCondition domain --> infrast:4.根据条件搜索\n SystemModuleQueryGataWay.queryByCondition invoke SystemMapper.queryByCondition end group 查询单条数据 -http --> domain: 1.查询单条系统数据\n SystemController.getByCode invoke SystemModuleQueryGataWay.queryBySystemCode +app_http --> domain: 1.查询单条系统数据\n SystemQueryController.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 +app_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 @@ -63,20 +54,20 @@ facade --> domain: 1.修改系统数据\n SystemFacade.updateSystem invoke Syste end group 添加菜单流程 -http --> domain: 1.添加菜单前先查一下菜单是否被注册过\n ModuleController.createModule invoke SystemModuleQueryGataWay.getModuleByCode -http --> domain: 2.添加菜单前先查一下菜单是否被注册过\n ModuleController.createModule invoke SystemModuleRepository.saveModule +app_http --> domain: 1.添加菜单前先查一下菜单是否被注册过\n ModuleController.createModule invoke SystemModuleQueryGataWay.getModuleByCode +app_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 +app_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 +app_http --> domain: 1.修改菜单信息\nModuleController.updateModule invoke SystemModuleRepository.updateModule domain --> infrast:2.查询历史菜单信息\n SystemModuleRepository.updateModule invoke ModuleMapper.update end @@ -86,12 +77,12 @@ end group 添加按钮流程(简化版) -http --> domain: 3.注册系统\n MenuController.createMenu invoke SystemModuleRepository.saveMenu +app_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 +app_http --> domain: 3.注册系统\n MenuController.updateMenu invoke SystemModuleRepository.updateMenu domain --> infrast:4.持久化系统数据\n SystemModuleRepository.updateMenu invoke MenuMapper.update end diff --git a/codemaker-core/src/main/resources/log4j.properties b/codemaker-parent/codemaker-core/src/main/resources/log4j.properties similarity index 100% rename from codemaker-core/src/main/resources/log4j.properties rename to codemaker-parent/codemaker-core/src/main/resources/log4j.properties diff --git a/codemaker-core/src/main/resources/mapper/sqlMapper.xml b/codemaker-parent/codemaker-core/src/main/resources/mapper/sqlMapper.xml similarity index 100% rename from codemaker-core/src/main/resources/mapper/sqlMapper.xml rename to codemaker-parent/codemaker-core/src/main/resources/mapper/sqlMapper.xml diff --git a/codemaker-core/src/main/resources/mybatis-config.xml b/codemaker-parent/codemaker-core/src/main/resources/mybatis-config.xml similarity index 100% rename from codemaker-core/src/main/resources/mybatis-config.xml rename to codemaker-parent/codemaker-core/src/main/resources/mybatis-config.xml diff --git a/codemaker-parent/codemaker-core/src/main/resources/projecttemplate-cola.properties b/codemaker-parent/codemaker-core/src/main/resources/projecttemplate-cola.properties new file mode 100644 index 0000000000000000000000000000000000000000..9ee5b3050ee4e5a5f7cd8993f73adde3e8f2ef0a --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/projecttemplate-cola.properties @@ -0,0 +1,51 @@ + +#数据库名称 +cola.global.dbName=infosys_auth + +#应用名称 +cola.global.applicationName=infosys-auth + +#目标工程输出目录，这里填写对应的工程的绝对路径 +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 +cola.code.outpath.cola-start=/Users/shenshuai/myspace/code-maker/codemaker-cola/cola-start +cola.code.outpath.cola-feign-api=/Users/shenshuai/myspace/code-maker/codemaker-cola/cola-feign-api + +#应用服务的plantUML类图文件,不配置则走基于数据表的方式生成代码 +cola.domain.plantuml=auth-domainV5.puml +#cola.domain.plantuml= + +#是否构建api 文档，否则进行构建,默认构建 +cola.api.generator=true + +#需要导入的组件列表，多个逗号分割,适用于cola模块下依赖的业务组件包或者对外api接口包，或者cola项目本身已有的代码类,或者其他偏业务的工具类组件等等。 +#如要生成的项目会依赖 infosys-user 服务的api则在这里定义即可。 +cola.component.scan.config=apiresult,infosysuser,hutool-core + +#需要在领域文档和调用时序文档中识别的读操作统一语言 +cola.component.dsl.read=check + +#需要在领域文档和调用时序文档中识别的写操作统一语言 +cola.component.dsl.write=settle,apply + +#是否需要根据该参数设置请求参数的最后一级包名为request,默认false +cola.subpackage.request=true + +#是否需要根据该参数设置相应参数的最后一级包名为response,默认false +cola.subpackage.response=true + + + +#应用级组件中间件工具包的组件扫描bean配置 +cola.component.scan.beans=appCompScanService + +#应用级组件中间件工具包的组件装饰bean配置 +cola.component.decorate.beans=appCompDecorateService + +#代码工具类注册，项目初始化时可以帮助初始化对应的工具类 +#后面生成代码的时候可以删掉工具类，只专注于生成业务代码 +#格式说明 eg:BaseEvent:core 前面是需要初始化的类，后面是这个类放到哪个模块下 +cola.component.init.clazz=BaseEvent:domain,Application:start,BaseController:adapter,PageBO:domain,SpringApplicationContext:domain,AppEventPublisher:domain diff --git a/codemaker-parent/codemaker-core/src/main/resources/projecttemplate-dubbo.properties b/codemaker-parent/codemaker-core/src/main/resources/projecttemplate-dubbo.properties new file mode 100644 index 0000000000000000000000000000000000000000..fb6c548806bcf910c077c4defbc60dae9491a22a --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/projecttemplate-dubbo.properties @@ -0,0 +1,47 @@ + +#数据库名称 +dubbo.global.dbName=infosys_auth +#dubbo应用名 +dubbo.global.applicationName=infosys-auth + +#目标工程输出目录，这里填写对应的工程的绝对路径 +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=auth-domainV5.puml + +#dubbo.domain.plantuml=SchoolManager.puml + +#是否构建api 文档，否则进行构建,默认构建 +dubbo.api.generator=true + +#是否需要根据该参数设置请求参数的最后一级包名为request,默认false +dubbo.subpackage.request=false + +#是否需要根据该参数设置相应参数的最后一级包名为response,默认false +dubbo.subpackage.response=false + + +#需要导入的组件列表，多个逗号分割 +dubbo.component.scan.config=apiresult,infosysuser,hutool-core + +#需要在领域文档和调用时序文档中识别的读操作统一语言 +dubbo.component.dsl.read=check + +#需要在领域文档和调用时序文档中识别的写操作统一语言 +dubbo.component.dsl.write=settle + + +#应用级组件中间件工具包的组件扫描bean配置 +dubbo.component.scan.beans=appCompScanService + +#应用级组件中间件工具包的组件装饰bean配置 +dubbo.component.decorate.beans=appCompDecorateService + +#应用级代码工具类注册，项目初始化时可以帮助初始化对应的工具类 +#后面生成代码的时候可以删掉工具类，只专注于生成业务代码 +#格式说明 eg:BaseEvent:core 前面是需要初始化的类，后面是这个类放到哪个模块下 +dubbo.component.init.clazz=BaseEvent:core,Application:core,SpringApplicationContext:core,AppEventPublisher:core + diff --git a/codemaker-core/src/main/resources/projecttemplate-dynamicddd.properties b/codemaker-parent/codemaker-core/src/main/resources/projecttemplate-dynamicddd.properties similarity index 64% rename from codemaker-core/src/main/resources/projecttemplate-dynamicddd.properties rename to codemaker-parent/codemaker-core/src/main/resources/projecttemplate-dynamicddd.properties index 0b020088d1d25f42947fbbf79b2c966001beb87c..155816fe17a25f82f3fa7c5a2c048fd692bf2643 100644 --- a/codemaker-core/src/main/resources/projecttemplate-dynamicddd.properties +++ b/codemaker-parent/codemaker-core/src/main/resources/projecttemplate-dynamicddd.properties @@ -1,4 +1,4 @@ #目标工程输出目录，这里填写对应的codemaker-dynamicddd工程的绝对路径 -dynamicddd.code.outpath=/Users/scworkspace/sourceSpace/code-maker/codemaker-dynamicddd +dynamicddd.code.outpath=/Users/shenshuai/myspace/code-maker/codemaker-dynamicddd #领域plantUML 类图 dynamicddd.domain.plantuml=SchoolManager.puml \ No newline at end of file diff --git a/codemaker-parent/codemaker-core/src/main/resources/projecttemplate-springboot.properties b/codemaker-parent/codemaker-core/src/main/resources/projecttemplate-springboot.properties new file mode 100644 index 0000000000000000000000000000000000000000..bbf061eba82e8732ed54767b5de19b0bf74d4a6d --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/projecttemplate-springboot.properties @@ -0,0 +1,51 @@ +#数据库名称 +springboot.global.dbName=infosys_auth + +#项目名称 +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/shenshuai/myspace/code-maker/codemaker-springboot + +#应用服务的plantUML类图文件,不配置则走基于数据表的方式生成代码 +codemaker.domain.plantuml=auth-domainV5.puml +#codemaker.domain.plantuml=SchoolManager.puml + + +#是否构建api 文档，否则进行构建,默认构建 +springboot.api.generator=true + + +springboot.component.scan.config=apiresult,infosys-user + + +#需要在领域文档和调用时序文档中识别的读操作统一语言 +springboot.component.dsl.read=check + +#需要在领域文档和调用时序文档中识别的写操作统一语言 +springboot.component.dsl.write=settle + +#是否需要根据该参数设置请求参数的最后一级包名为request,默认false +springboot.subpackage.request=false + +#是否需要根据该参数设置相应参数的最后一级包名为response,默认false +springboot.subpackage.response=false + + + +#应用级组件中间件工具包的组件扫描bean配置 +springboot.component.scan.beans=appCompScanService + + +#应用级组件中间件工具包的组件装饰bean配置 +springboot.component.decorate.beans=appCompDecorateService + + +#应用级代码工具类注册，项目初始化时可以帮助初始化对应的工具类 +#后面生成代码的时候可以删掉工具类，只专注于生成业务代码 +#格式说明 eg:BaseEvent:core 前面是需要初始化的类，后面是这个类放到哪个模块下 +springboot.component.init.clazz=BaseEvent:springboot,Application:springboot,SpringApplicationContext:springboot,AppEventPublisher:springboot \ No newline at end of file diff --git a/codemaker-parent/codemaker-core/src/main/resources/projecttemplate-springcloud.properties b/codemaker-parent/codemaker-core/src/main/resources/projecttemplate-springcloud.properties new file mode 100644 index 0000000000000000000000000000000000000000..0383715fc2a8d5b663b1fa41b93a74ec774fb015 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/projecttemplate-springcloud.properties @@ -0,0 +1,53 @@ +#数据库名称 +springcloud.global.dbName=infosys_auth + +#项目名称 +springcloud.global.applicationName=infosys-auth + +#maven坐标-GAV +springcloud.pom.groupId=com.snail.school.manager +springcloud.pom.artifactId=schoolmanager-web +springcloud.pom.version=1.0.0.SNAPSHOT +#目标工程输出目录，这里填写对应的codemaker-web工程的绝对路径 +springcloud.code.feign-api=/Users/shenshuai/myspace/code-maker/codemaker-springcloud/springcloud-api +springcloud.code.feign-provider=/Users/shenshuai/myspace/code-maker/codemaker-springcloud/springcloud-provider + +#应用服务的plantUML类图文件,不配置则走基于数据表的方式生成代码 +springcloud.domain.plantuml=auth-domainV5.puml +#springcloud.domain.plantuml=SchoolManager.puml + + +#是否构建api 文档，否则进行构建,默认构建 +springcloud.api.generator=true + +#需要导入的组件列表，多个逗号分割,适用于cola模块下依赖的业务组件包或者对外api接口包，或者cola项目本身已有的代码类,或者其他偏业务的工具类组件等等。 +#如要生成的项目会依赖 infosys-user 服务的api则在这里定义即可 +springcloud.component.scan.config=apiresult + + +#需要在领域文档和调用时序文档中识别的读操作统一语言 +springcloud.component.dsl.read=check + +#需要在领域文档和调用时序文档中识别的写操作统一语言 +springcloud.component.dsl.write=settle + +#是否需要根据该参数设置请求参数的最后一级包名为request,默认false +springcloud.subpackage.request=false + +#是否需要根据该参数设置相应参数的最后一级包名为response,默认false +springcloud.subpackage.response=false + + + +#应用级组件中间件工具包的组件扫描bean配置,如无特定技术栈，无需更换该组件 +springcloud.component.scan.beans=appCompScanService + + +#应用级组件中间件工具包的组件装饰bean配置,如无特定技术栈，无需更换该组件 +springcloud.component.decorate.beans=appCompDecorateService + + +#应用级代码工具类注册，项目初始化时可以帮助初始化对应的工具类 +#后面生成代码的时候可以删掉工具类，只专注于生成业务代码 +#格式说明 eg:BaseEvent:core 前面是需要初始化的类，后面是这个类放到哪个模块下 +springcloud.component.init.clazz=BaseEvent:provider,Application:provider,SpringApplicationContext:provider,AppEventPublisher:provider \ No newline at end of file diff --git a/codemaker-core/src/main/resources/template/SpringApplicationContext.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/SpringApplicationContext.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/SpringApplicationContext.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/SpringApplicationContext.ftl diff --git a/codemaker-parent/codemaker-core/src/main/resources/template/api/http.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/api/http.ftl new file mode 100644 index 0000000000000000000000000000000000000000..92d57ee009efa2c83f362836020e473c2e688252 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/api/http.ftl @@ -0,0 +1,25 @@ +## 模块-${moduleDesc} + + +### API列表 +<#list apiList as api> + +#### ${api.interfaceDesc} +1. 访问路径:${api.httpPath} +2. 访问方式: +3. 接口参数: + +| 属性名 | 类型 | 描述 | 是否必填 | +| ---- | ---- | ---- | ---- | + <#list api.paramBeanList as param> +| ${param.fieldName} | ${param.fieldType} | ${param.fieldDesc} | ${param.nullable} | + + + + +4. 返回值:${api.returnClass} + + + +### 公共说明 + diff --git a/codemaker-parent/codemaker-core/src/main/resources/template/api/rpc.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/api/rpc.ftl new file mode 100644 index 0000000000000000000000000000000000000000..c1afbf91c26950af7913f6a6093a7eda374aa75d --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/api/rpc.ftl @@ -0,0 +1,24 @@ +## 模块-${moduleDesc} + +### 接口签名 + +${moduleApi} + + +### API列表 +<#list apiList as api> + +#### ${api.interfaceDesc} +1. 接口签名:${api.interfaceName} +2. 接口参数: + +| 属性名 | 类型 | 描述 | 是否必填 | +| ---- | ---- | ---- | ---- | +<#list api.paramBeanList as param> +| ${param.fieldName} | ${param.fieldType} | ${param.fieldDesc} | ${param.nullable} | + +3. 返回值:${api.returnClass} + + +### 公共说明 + diff --git a/codemaker-core/src/main/resources/template/application.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/application.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/application.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/application.ftl diff --git a/codemaker-core/src/main/resources/template/applicationproperties.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/applicationproperties.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/applicationproperties.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/applicationproperties.ftl diff --git a/codemaker-core/src/main/resources/template/baseController.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/baseController.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/baseController.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/baseController.ftl diff --git a/codemaker-core/src/main/resources/template/cola/AppEventPublisher.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/cola/AppEventPublisher.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/cola/AppEventPublisher.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/cola/AppEventPublisher.ftl diff --git a/codemaker-core/src/main/resources/template/cola/BaseEvent.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/cola/BaseEvent.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/cola/BaseEvent.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/cola/BaseEvent.ftl diff --git a/codemaker-core/src/main/resources/template/cola/SpringApplicationContext.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/cola/SpringApplicationContext.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/cola/SpringApplicationContext.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/cola/SpringApplicationContext.ftl diff --git a/codemaker-core/src/main/resources/template/cola/abstractexe.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/cola/abstractexe.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/cola/abstractexe.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/cola/abstractexe.ftl diff --git a/codemaker-core/src/main/resources/template/cola/acl.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/cola/acl.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/cola/acl.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/cola/acl.ftl diff --git a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/exe/UserCmdExe.java b/codemaker-parent/codemaker-core/src/main/resources/template/cola/aclimpl.ftl similarity index 35% rename from codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/exe/UserCmdExe.java rename to codemaker-parent/codemaker-core/src/main/resources/template/cola/aclimpl.ftl index d7db678df350413a91958b8c20b9b0962ab2289a..0c1a4ee78200bbd0e9696da6c74044bd557816f9 100644 --- a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/exe/UserCmdExe.java +++ b/codemaker-parent/codemaker-core/src/main/resources/template/cola/aclimpl.ftl @@ -1,29 +1,39 @@ -package com.coderman.infosys.auth.app.exe; +package ${class.packageName}; -import com.coderman.infosys.auth.app.command.AbstractCmd; +<#list imports as importClass> +import ${importClass}; + 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 + * @Description:${class.classDesc}接口实现类 + * @Author：${class.author} + * @CreateTime：${.now?string('yyyy-MM-dd HH:mm:ss')} * @version v1.0 */ @Service -public class UserCmdExe implements CmdExeService{ +public class ${class.className} ${class.relationClassStr}{ private Logger logger = LoggerFactory.getLogger(this.getClass()); - @Override - public String exe(AbstractCmd abstractCmd){ + <#list fields as field> + @${field.annotation} + ${field.visibility} ${field.fieldName}; - return null; + + <#list methods as method> + + @Override + public ${method.returnClass} ${method.methodName}{ +${method.methodContent} + ${method.returnBody} } + } \ No newline at end of file diff --git a/codemaker-core/src/main/resources/template/cola/baseController.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/cola/baseController.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/cola/baseController.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/cola/baseController.ftl diff --git a/codemaker-core/src/main/resources/template/cola/bo.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/cola/bo.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/cola/bo.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/cola/bo.ftl diff --git a/codemaker-core/src/main/resources/template/cola/boddd.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/cola/boddd.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/cola/boddd.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/cola/boddd.ftl diff --git a/codemaker-core/src/main/resources/template/cola/factory.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/cola/cache.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/cola/factory.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/cola/cache.ftl diff --git a/codemaker-core/src/main/resources/template/cola/controller.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/cola/controller.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/cola/controller.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/cola/controller.ftl diff --git a/codemaker-core/src/main/resources/template/cola/controllerddd.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/cola/controllerddd.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/cola/controllerddd.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/cola/controllerddd.ftl diff --git a/codemaker-core/src/main/resources/template/cola/convert.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/cola/convert.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/cola/convert.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/cola/convert.ftl diff --git a/codemaker-core/src/main/resources/template/cola/do.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/cola/do.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/cola/do.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/cola/do.ftl diff --git a/codemaker-core/src/main/resources/template/cola/dto.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/cola/dto.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/cola/dto.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/cola/dto.ftl diff --git a/codemaker-core/src/main/resources/template/dubbo/dtoddd.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/cola/dtoddd.ftl similarity index 96% rename from codemaker-core/src/main/resources/template/dubbo/dtoddd.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/cola/dtoddd.ftl index 5ed97d6b99ce06945139fc22114d5823c19b840f..9d21fd692e7e09efe9f09957501c8a513bb16aba 100644 --- a/codemaker-core/src/main/resources/template/dubbo/dtoddd.ftl +++ b/codemaker-parent/codemaker-core/src/main/resources/template/cola/dtoddd.ftl @@ -1,7 +1,7 @@ package ${class.packageName}; <#list imports as importClass> - import ${importClass}; +import ${importClass}; import lombok.Data; @@ -19,6 +19,7 @@ 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/enum.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/cola/enum.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/cola/enum.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/cola/enum.ftl diff --git a/codemaker-core/src/main/resources/template/cola/event.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/cola/event.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/cola/event.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/cola/event.ftl diff --git a/codemaker-core/src/main/resources/template/cola/exeimpl.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/cola/exeimpl.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/cola/exeimpl.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/cola/exeimpl.ftl diff --git a/codemaker-core/src/main/resources/template/cola/facade.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/cola/facade.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/cola/facade.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/cola/facade.ftl diff --git a/codemaker-core/src/main/resources/template/cola/facadeaop.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/cola/facadeaop.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/cola/facadeaop.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/cola/facadeaop.ftl diff --git a/codemaker-core/src/main/resources/template/cola/facadeddd.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/cola/facadeddd.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/cola/facadeddd.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/cola/facadeddd.ftl diff --git a/codemaker-core/src/main/resources/template/cola/facadeimpl.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/cola/facadeimpl.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/cola/facadeimpl.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/cola/facadeimpl.ftl diff --git a/codemaker-core/src/main/resources/template/cola/facadeimplddd.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/cola/facadeimplddd.ftl similarity index 92% rename from codemaker-core/src/main/resources/template/cola/facadeimplddd.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/cola/facadeimplddd.ftl index 59e2867a88ae4e260a4bfcb7fc225026af6fa78b..ea57774dd92fcadb4f8c7a282e948a7fd2f04c2c 100644 --- a/codemaker-core/src/main/resources/template/cola/facadeimplddd.ftl +++ b/codemaker-parent/codemaker-core/src/main/resources/template/cola/facadeimplddd.ftl @@ -2,19 +2,19 @@ package ${class.packageName}; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.dubbo.config.annotation.Service; import org.springframework.beans.factory.annotation.Autowired; - <#list imports as importClass> import ${importClass}; + + /** * @Description:${class.classDesc}接口实现类 * @Author：${class.author} * @CreateTime：${.now?string('yyyy-MM-dd HH:mm:ss')} * @version v1.0 */ -@Service +${class.annotation} public class ${class.className} ${class.relationClassStr}{ private Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git a/codemaker-core/src/main/resources/template/dubbo/factory.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/cola/factory.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dubbo/factory.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/cola/factory.ftl diff --git a/codemaker-parent/codemaker-core/src/main/resources/template/cola/feign.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/cola/feign.ftl new file mode 100644 index 0000000000000000000000000000000000000000..25af93e70591fa7565dcc59cc3d5736f054cbd41 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/cola/feign.ftl @@ -0,0 +1,68 @@ +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; + +/** + * @Description:${table.tableComment}Facade接口 + * @Author:${author} + * @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} + * @version v1.0 + */ +public interface ${table.humpClassName}Facade{ + + /** + * @Description:新增${table.tableComment} + * @author: + * @param dto + * @return ResultDto 返回类型 + * @throws + */ + public ResultDto save(${table.humpClassName}DTO dto) throws Exception; + + /** + * + * @Description: 通过id删除数据 + * @param id + * @return ResultDto 返回类型 + * @throws + */ + public ResultDto delete(Long id); + + /** + * + * @Description: 通过id查询 + * @param @param id + * @return ResultDataDto<${table.humpClassName}DTO> + * @throws + */ + public ResultDataDto<${table.humpClassName}DTO> getById(Long id) throws Exception; + + /** + * @Description:查询所有数据 + * @return ResultDataDto> + * @throws + */ + public ResultDataDto> getAll() throws Exception; + + /** + * @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-parent/codemaker-core/src/main/resources/template/cola/feignddd.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/cola/feignddd.ftl new file mode 100644 index 0000000000000000000000000000000000000000..9607631a0695ae5b502f081cdc2b1756462455b0 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/cola/feignddd.ftl @@ -0,0 +1,22 @@ +package ${class.packageName}; + +<#list imports as importClass> +import ${importClass}; + + + +/** +* @Description:${class.classDesc}接口 +* @Author:${class.author} +* @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} +* @version v1.0 +*/ +${class.annotation} +public interface ${class.className}{ +<#list methods as method> + +${method.doc} + @RequestMapping(value = "${method.pathValue}") + ${method.returnClass} ${method.methodName}; + +} \ No newline at end of file diff --git a/codemaker-core/src/main/resources/template/cola/gataway.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/cola/gataway.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/cola/gataway.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/cola/gataway.ftl diff --git a/codemaker-core/src/main/resources/template/cola/gatawayimpl.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/cola/gatawayimpl.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/cola/gatawayimpl.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/cola/gatawayimpl.ftl diff --git a/codemaker-core/src/main/resources/template/cola/mapper.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/cola/mapper.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/cola/mapper.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/cola/mapper.ftl diff --git a/codemaker-core/src/main/resources/template/cola/mapperddd.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/cola/mapperddd.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/cola/mapperddd.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/cola/mapperddd.ftl diff --git a/codemaker-core/src/main/resources/template/cola/mapperxml.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/cola/mapperxml.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/cola/mapperxml.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/cola/mapperxml.ftl diff --git a/codemaker-core/src/main/resources/template/cola/mapperxmlddd.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/cola/mapperxmlddd.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/cola/mapperxmlddd.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/cola/mapperxmlddd.ftl diff --git a/codemaker-core/src/main/resources/template/cola/mqconsumer.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/cola/mqconsumer.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/cola/mqconsumer.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/cola/mqconsumer.ftl diff --git a/codemaker-core/src/main/resources/template/cola/mqhandler.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/cola/mqhandler.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/cola/mqhandler.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/cola/mqhandler.ftl diff --git a/codemaker-core/src/main/resources/template/cola/mqlistener.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/cola/mqlistener.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/cola/mqlistener.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/cola/mqlistener.ftl diff --git a/codemaker-core/src/main/resources/template/cola/mqproducer.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/cola/mqproducer.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/cola/mqproducer.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/cola/mqproducer.ftl diff --git a/codemaker-core/src/main/resources/template/cola/msgbody.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/cola/msgbody.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/cola/msgbody.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/cola/msgbody.ftl diff --git a/codemaker-core/src/main/resources/template/cola/service.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/cola/service.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/cola/service.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/cola/service.ftl diff --git a/codemaker-core/src/main/resources/template/cola/serviceImpl.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/cola/serviceImpl.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/cola/serviceImpl.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/cola/serviceImpl.ftl diff --git a/codemaker-core/src/main/resources/template/cola/test.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/cola/test.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/cola/test.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/cola/test.ftl diff --git a/codemaker-core/src/main/resources/template/cola/valueobject.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/cola/valueobject.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/cola/valueobject.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/cola/valueobject.ftl diff --git a/codemaker-core/src/main/resources/template/cola/vo.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/cola/vo.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/cola/vo.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/cola/vo.ftl diff --git a/codemaker-core/src/main/resources/template/cola/voddd.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/cola/voddd.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/cola/voddd.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/cola/voddd.ftl diff --git a/codemaker-core/src/main/resources/template/controller.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/controller.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/controller.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/controller.ftl diff --git a/codemaker-core/src/main/resources/template/dubbo/AppEventPublisher.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dubbo/AppEventPublisher.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dubbo/AppEventPublisher.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dubbo/AppEventPublisher.ftl diff --git a/codemaker-core/src/main/resources/template/dubbo/BaseEvent.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dubbo/BaseEvent.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dubbo/BaseEvent.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dubbo/BaseEvent.ftl diff --git a/codemaker-core/src/main/resources/template/dubbo/SpringApplicationContext.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dubbo/SpringApplicationContext.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dubbo/SpringApplicationContext.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dubbo/SpringApplicationContext.ftl diff --git a/codemaker-core/src/main/resources/template/dubbo/abstractexe.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dubbo/abstractexe.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dubbo/abstractexe.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dubbo/abstractexe.ftl diff --git a/codemaker-core/src/main/resources/template/dubbo/acl.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dubbo/acl.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dubbo/acl.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dubbo/acl.ftl diff --git a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/exe/UserGroupCmdExe.java b/codemaker-parent/codemaker-core/src/main/resources/template/dubbo/aclimpl.ftl similarity index 35% rename from codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/exe/UserGroupCmdExe.java rename to codemaker-parent/codemaker-core/src/main/resources/template/dubbo/aclimpl.ftl index 4dd41c43809945767c2b2358a521a40154a9b045..0c1a4ee78200bbd0e9696da6c74044bd557816f9 100644 --- a/codemaker-cola/cola-app/src/main/java/com/coderman/infosys/auth/app/exe/UserGroupCmdExe.java +++ b/codemaker-parent/codemaker-core/src/main/resources/template/dubbo/aclimpl.ftl @@ -1,29 +1,39 @@ -package com.coderman.infosys.auth.app.exe; +package ${class.packageName}; -import com.coderman.infosys.auth.app.command.AbstractCmd; +<#list imports as importClass> +import ${importClass}; + 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 + * @Description:${class.classDesc}接口实现类 + * @Author：${class.author} + * @CreateTime：${.now?string('yyyy-MM-dd HH:mm:ss')} * @version v1.0 */ @Service -public class UserGroupCmdExe implements CmdExeService{ +public class ${class.className} ${class.relationClassStr}{ private Logger logger = LoggerFactory.getLogger(this.getClass()); - @Override - public String exe(AbstractCmd abstractCmd){ + <#list fields as field> + @${field.annotation} + ${field.visibility} ${field.fieldName}; - return null; + + <#list methods as method> + + @Override + public ${method.returnClass} ${method.methodName}{ +${method.methodContent} + ${method.returnBody} } + } \ No newline at end of file diff --git a/codemaker-core/src/main/resources/template/dubbo/application.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dubbo/application.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dubbo/application.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dubbo/application.ftl diff --git a/codemaker-core/src/main/resources/template/dubbo/applicationproperties.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dubbo/applicationproperties.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dubbo/applicationproperties.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dubbo/applicationproperties.ftl diff --git a/codemaker-core/src/main/resources/template/dubbo/bo.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dubbo/bo.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dubbo/bo.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dubbo/bo.ftl diff --git a/codemaker-core/src/main/resources/template/dubbo/boddd.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dubbo/boddd.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dubbo/boddd.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dubbo/boddd.ftl diff --git a/codemaker-core/src/main/resources/template/dynamicddd/factory.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dubbo/cache.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dynamicddd/factory.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dubbo/cache.ftl diff --git a/codemaker-core/src/main/resources/template/dubbo/convert.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dubbo/convert.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dubbo/convert.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dubbo/convert.ftl diff --git a/codemaker-core/src/main/resources/template/dubbo/do.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dubbo/do.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dubbo/do.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dubbo/do.ftl diff --git a/codemaker-core/src/main/resources/template/dubbo/dto.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dubbo/dto.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dubbo/dto.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dubbo/dto.ftl diff --git a/codemaker-parent/codemaker-core/src/main/resources/template/dubbo/dtoddd.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dubbo/dtoddd.ftl new file mode 100644 index 0000000000000000000000000000000000000000..6a9dddea9b8cf3532406193faaf8945b45340d0a --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/dubbo/dtoddd.ftl @@ -0,0 +1,37 @@ +package ${class.packageName}; + +<#list imports as importClass> + import ${importClass}; + + +import lombok.Data; +import lombok.ToString; + +/** +* @Description:${class.classDesc}类 +* @Author:${class.author} +* @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} +* @version v1.0 +*/ +@Data +@ToString +public class ${class.className} ${class.relationClassStr}{ + +<#list fields as field> + /** ${field.desc} **/ + + ${field.visibility} ${field.fieldName}; + + +<#list methods as method> + /** + * + * @Description:${method.desc} + * @return ${method.returnClass} + */ + ${method.visibility} ${method.returnClass} ${method.methodName}{ + ${method.returnBody} + } + + +} \ No newline at end of file diff --git a/codemaker-core/src/main/resources/template/dubbo/enum.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dubbo/enum.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dubbo/enum.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dubbo/enum.ftl diff --git a/codemaker-core/src/main/resources/template/dubbo/event.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dubbo/event.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dubbo/event.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dubbo/event.ftl diff --git a/codemaker-core/src/main/resources/template/dubbo/exeimpl.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dubbo/exeimpl.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dubbo/exeimpl.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dubbo/exeimpl.ftl diff --git a/codemaker-core/src/main/resources/template/dubbo/facade.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dubbo/facade.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dubbo/facade.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dubbo/facade.ftl diff --git a/codemaker-core/src/main/resources/template/dubbo/facadeImpl.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dubbo/facadeImpl.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dubbo/facadeImpl.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dubbo/facadeImpl.ftl diff --git a/codemaker-core/src/main/resources/template/dubbo/facadeaop.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dubbo/facadeaop.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dubbo/facadeaop.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dubbo/facadeaop.ftl diff --git a/codemaker-core/src/main/resources/template/dubbo/facadeddd.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dubbo/facadeddd.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dubbo/facadeddd.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dubbo/facadeddd.ftl diff --git a/codemaker-core/src/main/resources/template/dubbo/facadeimplddd.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dubbo/facadeimplddd.ftl similarity index 92% rename from codemaker-core/src/main/resources/template/dubbo/facadeimplddd.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dubbo/facadeimplddd.ftl index 59e2867a88ae4e260a4bfcb7fc225026af6fa78b..650653a4624f437b75de3ac2c26d95d835645bcf 100644 --- a/codemaker-core/src/main/resources/template/dubbo/facadeimplddd.ftl +++ b/codemaker-parent/codemaker-core/src/main/resources/template/dubbo/facadeimplddd.ftl @@ -2,7 +2,6 @@ package ${class.packageName}; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.dubbo.config.annotation.Service; import org.springframework.beans.factory.annotation.Autowired; <#list imports as importClass> @@ -14,7 +13,7 @@ import ${importClass}; * @CreateTime：${.now?string('yyyy-MM-dd HH:mm:ss')} * @version v1.0 */ -@Service +${class.annotation} public class ${class.className} ${class.relationClassStr}{ private Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git a/codemaker-core/src/main/resources/template/springboot/factory.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dubbo/factory.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/springboot/factory.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dubbo/factory.ftl diff --git a/codemaker-core/src/main/resources/template/dubbo/gataway.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dubbo/gataway.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dubbo/gataway.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dubbo/gataway.ftl diff --git a/codemaker-core/src/main/resources/template/dubbo/gatawayimpl.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dubbo/gatawayimpl.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dubbo/gatawayimpl.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dubbo/gatawayimpl.ftl diff --git a/codemaker-core/src/main/resources/template/dubbo/mapper.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dubbo/mapper.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dubbo/mapper.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dubbo/mapper.ftl diff --git a/codemaker-core/src/main/resources/template/dubbo/mapperddd.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dubbo/mapperddd.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dubbo/mapperddd.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dubbo/mapperddd.ftl diff --git a/codemaker-core/src/main/resources/template/dubbo/mapperxml.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dubbo/mapperxml.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dubbo/mapperxml.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dubbo/mapperxml.ftl diff --git a/codemaker-core/src/main/resources/template/dubbo/mapperxmlddd.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dubbo/mapperxmlddd.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dubbo/mapperxmlddd.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dubbo/mapperxmlddd.ftl diff --git a/codemaker-core/src/main/resources/template/dubbo/mqconsumer.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dubbo/mqconsumer.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dubbo/mqconsumer.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dubbo/mqconsumer.ftl diff --git a/codemaker-core/src/main/resources/template/dubbo/mqhandler.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dubbo/mqhandler.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dubbo/mqhandler.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dubbo/mqhandler.ftl diff --git a/codemaker-core/src/main/resources/template/dubbo/mqlistener.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dubbo/mqlistener.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dubbo/mqlistener.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dubbo/mqlistener.ftl diff --git a/codemaker-core/src/main/resources/template/dubbo/mqproducer.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dubbo/mqproducer.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dubbo/mqproducer.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dubbo/mqproducer.ftl diff --git a/codemaker-core/src/main/resources/template/dubbo/msgbody.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dubbo/msgbody.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dubbo/msgbody.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dubbo/msgbody.ftl diff --git a/codemaker-core/src/main/resources/template/dubbo/service.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dubbo/service.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dubbo/service.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dubbo/service.ftl diff --git a/codemaker-core/src/main/resources/template/dubbo/serviceImpl.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dubbo/serviceImpl.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dubbo/serviceImpl.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dubbo/serviceImpl.ftl diff --git a/codemaker-core/src/main/resources/template/dubbo/test.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dubbo/test.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dubbo/test.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dubbo/test.ftl diff --git a/codemaker-core/src/main/resources/template/dubbo/valueobject.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dubbo/valueobject.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dubbo/valueobject.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dubbo/valueobject.ftl diff --git a/codemaker-core/src/main/resources/template/dynamicddd/abstractexe.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dynamicddd/abstractexe.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dynamicddd/abstractexe.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dynamicddd/abstractexe.ftl diff --git a/codemaker-core/src/main/resources/template/dynamicddd/acl.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dynamicddd/acl.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dynamicddd/acl.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dynamicddd/acl.ftl diff --git a/codemaker-core/src/main/resources/template/dynamicddd/boddd.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dynamicddd/boddd.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dynamicddd/boddd.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dynamicddd/boddd.ftl diff --git a/codemaker-core/src/main/resources/template/dynamicddd/dtoddd.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dynamicddd/dtoddd.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dynamicddd/dtoddd.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dynamicddd/dtoddd.ftl diff --git a/codemaker-core/src/main/resources/template/dynamicddd/enum.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dynamicddd/enum.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dynamicddd/enum.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dynamicddd/enum.ftl diff --git a/codemaker-core/src/main/resources/template/dynamicddd/event.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dynamicddd/event.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dynamicddd/event.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dynamicddd/event.ftl diff --git a/codemaker-core/src/main/resources/template/dynamicddd/exeimpl.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dynamicddd/exeimpl.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dynamicddd/exeimpl.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dynamicddd/exeimpl.ftl diff --git a/codemaker-parent/codemaker-core/src/main/resources/template/dynamicddd/factory.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dynamicddd/factory.ftl new file mode 100644 index 0000000000000000000000000000000000000000..d7514abef0dc2444f918828f8f828e846a2c489b --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/dynamicddd/factory.ftl @@ -0,0 +1,34 @@ +package ${class.packageName}; + +<#list imports as importClass> +import ${importClass}; + + +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; + + /** + * @Description:${class.className}类 + * @Author:${class.author} + * @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} + * @version v1.0 + */ +@Service +public class ${class.className}{ + + <#list fields as field> + /** ${field.desc} **/ + @Autowired + ${field.visibility} ${field.fieldName}; + + + <#list methods as method> + +${method.doc} + ${method.visibility} ${method.returnClass} ${method.methodName}{ +${method.methodContent} + ${method.returnBody} + } + + +} \ No newline at end of file diff --git a/codemaker-core/src/main/resources/template/dynamicddd/gataway.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dynamicddd/gataway.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dynamicddd/gataway.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dynamicddd/gataway.ftl diff --git a/codemaker-core/src/main/resources/template/dynamicddd/gatawayimpl.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dynamicddd/gatawayimpl.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dynamicddd/gatawayimpl.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dynamicddd/gatawayimpl.ftl diff --git a/codemaker-core/src/main/resources/template/dynamicddd/mqconsumer.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dynamicddd/mqconsumer.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dynamicddd/mqconsumer.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dynamicddd/mqconsumer.ftl diff --git a/codemaker-core/src/main/resources/template/dynamicddd/mqhandler.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dynamicddd/mqhandler.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dynamicddd/mqhandler.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dynamicddd/mqhandler.ftl diff --git a/codemaker-core/src/main/resources/template/dynamicddd/mqproducer.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dynamicddd/mqproducer.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dynamicddd/mqproducer.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dynamicddd/mqproducer.ftl diff --git a/codemaker-core/src/main/resources/template/dynamicddd/msgbody.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dynamicddd/msgbody.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dynamicddd/msgbody.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dynamicddd/msgbody.ftl diff --git a/codemaker-core/src/main/resources/template/dynamicddd/service.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dynamicddd/service.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dynamicddd/service.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dynamicddd/service.ftl diff --git a/codemaker-core/src/main/resources/template/dynamicddd/valueobject.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/dynamicddd/valueobject.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/dynamicddd/valueobject.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/dynamicddd/valueobject.ftl diff --git a/codemaker-core/src/main/resources/template/entity.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/entity.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/entity.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/entity.ftl diff --git a/codemaker-core/src/main/resources/template/fast/SpringApplicationContext.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/fast/SpringApplicationContext.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/fast/SpringApplicationContext.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/fast/SpringApplicationContext.ftl diff --git a/codemaker-core/src/main/resources/template/fast/application.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/fast/application.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/fast/application.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/fast/application.ftl diff --git a/codemaker-core/src/main/resources/template/fast/applicationproperties.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/fast/applicationproperties.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/fast/applicationproperties.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/fast/applicationproperties.ftl diff --git a/codemaker-core/src/main/resources/template/fast/baseController.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/fast/baseController.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/fast/baseController.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/fast/baseController.ftl diff --git a/codemaker-core/src/main/resources/template/fast/controller.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/fast/controller.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/fast/controller.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/fast/controller.ftl diff --git a/codemaker-core/src/main/resources/template/fast/entity.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/fast/entity.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/fast/entity.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/fast/entity.ftl diff --git a/codemaker-core/src/main/resources/template/fast/mapper.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/fast/mapper.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/fast/mapper.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/fast/mapper.ftl diff --git a/codemaker-core/src/main/resources/template/fast/mapperxml.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/fast/mapperxml.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/fast/mapperxml.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/fast/mapperxml.ftl diff --git a/codemaker-core/src/main/resources/template/fast/service.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/fast/service.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/fast/service.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/fast/service.ftl diff --git a/codemaker-core/src/main/resources/template/fast/serviceImpl.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/fast/serviceImpl.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/fast/serviceImpl.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/fast/serviceImpl.ftl diff --git a/codemaker-core/src/main/resources/template/fast/test.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/fast/test.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/fast/test.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/fast/test.ftl diff --git a/codemaker-core/src/main/resources/template/fast/vo.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/fast/vo.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/fast/vo.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/fast/vo.ftl diff --git a/codemaker-core/src/main/resources/template/mapper.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/mapper.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/mapper.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/mapper.ftl diff --git a/codemaker-core/src/main/resources/template/mapperxml.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/mapperxml.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/mapperxml.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/mapperxml.ftl diff --git a/codemaker-core/src/main/resources/template/service.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/service.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/service.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/service.ftl diff --git a/codemaker-core/src/main/resources/template/serviceImpl.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/serviceImpl.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/serviceImpl.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/serviceImpl.ftl diff --git a/codemaker-parent/codemaker-core/src/main/resources/template/singleClass/AppEventPublisher.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/singleClass/AppEventPublisher.ftl new file mode 100644 index 0000000000000000000000000000000000000000..b8db74c79e584b623f8eddb10d2ce5a2b4041cc3 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/singleClass/AppEventPublisher.ftl @@ -0,0 +1,21 @@ +package ${package}.domain.support.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; + + /** + * 发送spring容器事件入口方法 + */ + public void publish(T t) { + applicationContext.publishEvent(t); + } + +} \ No newline at end of file diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/Application.java b/codemaker-parent/codemaker-core/src/main/resources/template/singleClass/Application.ftl similarity index 43% rename from codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/Application.java rename to codemaker-parent/codemaker-core/src/main/resources/template/singleClass/Application.ftl index 2ea0edff714f7bcdafc8053553c33473c4449287..cfa97cef405b41106b41e8fd203b7033887b61b5 100644 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/Application.java +++ b/codemaker-parent/codemaker-core/src/main/resources/template/singleClass/Application.ftl @@ -1,22 +1,24 @@ -package com.coderman.infosys.auth; +package ${package}; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -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; +import org.springframework.boot.context.properties.EnableConfigurationProperties; + /** * @Description:应用启动入口 -* @Author:shenshuai -* @CreateTime:2021-11-07 08:18:28 +* @Author:${author} +* @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} * @version v1.0 */ -@DubboComponentScan(basePackages = "com.coderman.infosys.auth") -@EnableDubbo //开启Dubbo的注解支持 -@SpringBootApplication(scanBasePackages = {"com.coderman.infosys.auth"}) -@MapperScan(basePackages = "com.coderman.infosys.auth.common.infrast") +@SpringBootApplication +@MapperScan(value = "${package}.infrast.dao") +@EnableConfigurationProperties public class Application { public static void main(String[] args) { diff --git a/codemaker-parent/codemaker-core/src/main/resources/template/singleClass/BaseBO.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/singleClass/BaseBO.ftl new file mode 100644 index 0000000000000000000000000000000000000000..e43d72431ae92fb6be391fdd985930dc8a1bec45 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/singleClass/BaseBO.ftl @@ -0,0 +1,40 @@ +package ${package}.domain.bo; + +import lombok.ToString; +import lombok.Data; + +import java.io.Serializable; + +/** + * DTO基类 + */ +@ToString +@Data +public class BaseBO implements Serializable { + /** + * 修改时间 + */ + private Date dateUpdate; + + /** + * 创建时间 + */ + private Date dateCreate; + + /** + * 修改人 + */ + private Long updateUserId; + + /** + * 创建人 + */ + private Long createUserId; + + /** + * 请求号 + */ + private String requestNo; + + +} diff --git a/codemaker-core/src/main/resources/template/springboot/baseController.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/singleClass/BaseController.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/springboot/baseController.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/singleClass/BaseController.ftl diff --git a/codemaker-parent/codemaker-core/src/main/resources/template/singleClass/BaseDTO.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/singleClass/BaseDTO.ftl new file mode 100644 index 0000000000000000000000000000000000000000..450386a9c7c2256128ea27d9fa1ab739ba7662f1 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/singleClass/BaseDTO.ftl @@ -0,0 +1,13 @@ +package ${package}.api.dto; + +import lombok.ToString; + +import java.io.Serializable; + +/** + * DTO基类 + */ +@ToString +public class BaseDTO implements Serializable { + +} diff --git a/codemaker-core/src/main/resources/template/springboot/BaseEvent.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/singleClass/BaseEvent.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/springboot/BaseEvent.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/singleClass/BaseEvent.ftl diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/aop/FacadeServiceAop.java b/codemaker-parent/codemaker-core/src/main/resources/template/singleClass/FacadeAspect.ftl similarity index 89% rename from codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/aop/FacadeServiceAop.java rename to codemaker-parent/codemaker-core/src/main/resources/template/singleClass/FacadeAspect.ftl index 158405f6964e6e7412437445854a3df8a2117e57..6811adc8355f4256a377337832242f186f08a29c 100644 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/aop/FacadeServiceAop.java +++ b/codemaker-parent/codemaker-core/src/main/resources/template/singleClass/FacadeAspect.ftl @@ -1,4 +1,4 @@ -package com.coderman.infosys.auth.aop; +package ${package}.app.support; import com.alibaba.fastjson.JSON; @@ -21,7 +21,7 @@ import java.lang.reflect.Method; @Aspect @Slf4j public class FacadeServiceAop { - @Around(value = "execution( public * com.coderman.infosys.auth.app.facadeimpl..*(..))") + @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-parent/codemaker-core/src/main/resources/template/singleClass/PageBO.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/singleClass/PageBO.ftl new file mode 100644 index 0000000000000000000000000000000000000000..a2c28723eeb50b0ae52fe29611ad0f8a77277a4b --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/singleClass/PageBO.ftl @@ -0,0 +1,379 @@ +package ${package}.domain.bo; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +/** +* Description:参考Mybatis_PageHelper的Page对象封装的DTO +* date: 2021/10/26 +* +* @author fanchunshuai +* @version 1.0.0 +* @since JDK 1.8 +*/ +public class PageBO implements Serializable { + + private static final long serialVersionUID = -2470832822882514457L; + /** + * 页码，从1开始 + */ + private int currentPageNum; + + /** + * 当前页的下一页 + */ + private int nextPageNum; + + /** + * 当前页的上一页 + */ + private int prePageNum; + /** + * 页面大小 + */ + private int pageSize; + /** + * 起始行 + */ + private int startRow; + /** + * 末行 + */ + private int endRow; + /** + * 总数 + */ + private long totalRows; + /** + * 总页数 + */ + private int totalPages; + /** + * 包含count查询 + */ + private boolean count = true; + /** + * 分页合理化 + */ + private Boolean reasonable; + /** + * 当设置为true的时候，如果pagesize设置为0（或RowBounds的limit=0），就不执行分页，返回全部结果 + */ + private Boolean pageSizeZero; + /** + * 进行count查询的列名 + */ + private String countColumn; + /** + * 排序 + */ + private String orderBy; + /** + * 只增加排序 + */ + private boolean orderByOnly; + + private List Items; + + + /** + * 针对简单场景 参数的查询map处理 + */ + private Map queryMap; + + /** + * 针对复杂场景 参数的查询queryDTO对象处理 + */ + private Object queryDTO; + + + public Map getQueryMap() { + return queryMap; + } + + public void setQueryMap(Map queryMap) { + this.queryMap = queryMap; + } + + public Object getQueryDTO() { + return queryDTO; + } + + public void setQueryDTO(Object queryDTO) { + this.queryDTO = queryDTO; + } + + public List getItems() { + return Items; + } + + public PageVO setItems(List items) { + Items = items; + return this; + } + + public PageVO() { + super(); + } + + public PageVO(int pageNum, int pageSize) { + this(pageNum, pageSize, true, null); + } + + public PageVO(int pageNum, int pageSize, boolean count) { + this(pageNum, pageSize, count, null); + } + + private PageVO(int pageNum, int pageSize, boolean count, Boolean reasonable) { + + if (pageNum == 1 && pageSize == Integer.MAX_VALUE) { + pageSizeZero = true; + pageSize = 0; + } + this.currentPageNum = pageNum; + this.pageSize = pageSize; + this.count = count; + calculateStartAndEndRow(); + setReasonable(reasonable); + } + + public int getNextIndex() { + if (this.currentPageNum >= this.getTotalPages()) { + this.nextPageNum = this.currentPageNum; + } else { + this.nextPageNum = this.currentPageNum + 1; + } + + return this.nextPageNum; + } + + public int getPreIndex() { + if (this.currentPageNum <= 1) { + this.prePageNum = 0; + } else { + this.prePageNum = this.currentPageNum - 1; + } + + return this.prePageNum; + } + + + public int getTotalPages() { + return totalPages; + } + + public PageVO setPages(int totalPages) { + this.totalPages = totalPages; + return this; + } + + public int getEndRow() { + return endRow; + } + + public PageVO setEndRow(int endRow) { + this.endRow = endRow; + return this; + } + + public int getCurrentPageNum() { + return currentPageNum; + } + + public PageVO setPageNum(int currentPageNum) { + //分页合理化，针对不合理的页码自动处理 + this.currentPageNum = ((reasonable != null && reasonable) && currentPageNum <= 0) ? 1 : currentPageNum; + return this; + } + + public int getPageSize() { + return pageSize; + } + + public PageVO setPageSize(int pageSize) { + this.pageSize = pageSize; + return this; + } + + public int getStartRow() { + return startRow; + } + + public PageVO setStartRow(int startRow) { + this.startRow = startRow; + return this; + } + + public long getTotalRows() { + return totalRows; + } + + public void setTotal(long totalRows) { + this.totalRows = totalRows; + if (totalRows == -1) { + totalPages = 1; + return; + } + if (pageSize > 0) { + totalPages = (int) (totalRows / pageSize + ((totalRows % pageSize == 0) ? 0 : 1)); + } else { + totalPages = 0; + } + //分页合理化，针对不合理的页码自动处理 + if ((reasonable != null && reasonable) && currentPageNum > totalPages) { + if(totalPages!=0){ + currentPageNum = totalPages; + } + calculateStartAndEndRow(); + } + } + + public Boolean getReasonable() { + return reasonable; + } + + public PageVO setReasonable(Boolean reasonable) { + if (reasonable == null) { + return this; + } + this.reasonable = reasonable; + //分页合理化，针对不合理的页码自动处理 + if (this.reasonable && this.currentPageNum <= 0) { + this.currentPageNum = 1; + calculateStartAndEndRow(); + } + return this; + } + + public Boolean getPageSizeZero() { + return pageSizeZero; + } + + public PageVO setPageSizeZero(Boolean pageSizeZero) { + if (pageSizeZero != null) { + this.pageSizeZero = pageSizeZero; + } + return this; + } + public String getOrderBy() { + return orderBy; + } + + public PageVO setOrderBy(String orderBy) { + this.orderBy = orderBy; + return (PageVO) this; + } + + public boolean isOrderByOnly() { + return orderByOnly; + } + + public void setOrderByOnly(boolean orderByOnly) { + this.orderByOnly = orderByOnly; + } + + /** + * 计算起止行号 + */ + private void calculateStartAndEndRow() { + this.startRow = this.currentPageNum > 0 ? (this.currentPageNum - 1) * this.pageSize : 0; + this.endRow = this.startRow + this.pageSize * (this.currentPageNum > 0 ? 1 : 0); + } + + public boolean isCount() { + return this.count; + } + + public PageVO setCount(boolean count) { + this.count = count; + return this; + } + + /** + * 设置页码 + * + * @param pageNum + * @return + */ + public PageVO pageNum(int pageNum) { + //分页合理化，针对不合理的页码自动处理 + this.currentPageNum = ((reasonable != null && reasonable) && pageNum <= 0) ? 1 : pageNum; + return this; + } + + /** + * 设置页面大小 + * + * @param pageSize + * @return + */ + public PageVO pageSize(int pageSize) { + this.pageSize = pageSize; + calculateStartAndEndRow(); + return this; + } + + + /** + * 设置合理化 + * + * @param reasonable + * @return + */ + public PageVO reasonable(Boolean reasonable) { + setReasonable(reasonable); + return this; + } + + /** + * 当设置为true的时候，如果pagesize设置为0（或RowBounds的limit=0），就不执行分页，返回全部结果 + * + * @param pageSizeZero + * @return + */ + public PageVO pageSizeZero(Boolean pageSizeZero) { + setPageSizeZero(pageSizeZero); + return this; + } + + /** + * 指定 count 查询列 + * + * @param columnName + * @return + */ + public PageVO countColumn(String columnName) { + this.countColumn = columnName; + return this; + } + + + + public String getCountColumn() { + return countColumn; + } + + public void setCountColumn(String countColumn) { + this.countColumn = countColumn; + } + + @Override + public String toString() { + return "PageDTO{" + + "currentPageNum=" + currentPageNum + + ", pageSize=" + pageSize + + ", startRow=" + startRow + + ", endRow=" + endRow + + ", totalRows=" + totalRows + + ", totalPages=" + totalPages + + ", count=" + count + + ", reasonable=" + reasonable + + ", pageSizeZero=" + pageSizeZero + + ", countColumn='" + countColumn + '\'' + + ", orderBy='" + orderBy + '\'' + + ", orderByOnly=" + orderByOnly + + ", Items=" + Items + + '}'; + } + } diff --git a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/utils/SpringApplicationContext.java b/codemaker-parent/codemaker-core/src/main/resources/template/singleClass/SpringApplicationContext.ftl similarity index 94% rename from codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/utils/SpringApplicationContext.java rename to codemaker-parent/codemaker-core/src/main/resources/template/singleClass/SpringApplicationContext.ftl index e25418a7467d95c4381890295d4139c3b914d044..77317f9baff8a84029a82292ad8c177bab87b6b0 100644 --- a/codemaker-dubbo/dubbo-core/src/main/java/com/coderman/infosys/auth/utils/SpringApplicationContext.java +++ b/codemaker-parent/codemaker-core/src/main/resources/template/singleClass/SpringApplicationContext.ftl @@ -1,4 +1,4 @@ -package com.coderman.infosys.auth.core.utils; +package ${package}.domain.support.utils; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; diff --git a/codemaker-core/src/main/resources/template/common/pom.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/singleClass/pom.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/common/pom.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/singleClass/pom.ftl diff --git a/codemaker-core/src/main/resources/template/springboot/AppEventPublisher.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springboot/AppEventPublisher.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/springboot/AppEventPublisher.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/springboot/AppEventPublisher.ftl diff --git a/codemaker-parent/codemaker-core/src/main/resources/template/springboot/BaseEvent.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springboot/BaseEvent.ftl new file mode 100644 index 0000000000000000000000000000000000000000..4ff2d9325cbbb820b018940f57ffd1c6968cd2c7 --- /dev/null +++ b/codemaker-parent/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-parent/codemaker-core/src/main/resources/template/springboot/SpringApplicationContext.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/springboot/SpringApplicationContext.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/springboot/SpringApplicationContext.ftl diff --git a/codemaker-core/src/main/resources/template/springboot/acl.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springboot/acl.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/springboot/acl.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/springboot/acl.ftl diff --git a/codemaker-parent/codemaker-core/src/main/resources/template/springboot/aclimpl.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springboot/aclimpl.ftl new file mode 100644 index 0000000000000000000000000000000000000000..0c1a4ee78200bbd0e9696da6c74044bd557816f9 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/springboot/aclimpl.ftl @@ -0,0 +1,39 @@ +package ${class.packageName}; + +<#list imports as importClass> +import ${importClass}; + + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; + + +/** + * @Description:${class.classDesc}接口实现类 + * @Author：${class.author} + * @CreateTime：${.now?string('yyyy-MM-dd HH:mm:ss')} + * @version v1.0 + */ +@Service +public class ${class.className} ${class.relationClassStr}{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + <#list fields as field> + @${field.annotation} + ${field.visibility} ${field.fieldName}; + + + <#list methods as method> + + @Override + public ${method.returnClass} ${method.methodName}{ +${method.methodContent} + ${method.returnBody} + } + + +} \ No newline at end of file diff --git a/codemaker-core/src/main/resources/template/springboot/application.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springboot/application.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/springboot/application.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/springboot/application.ftl diff --git a/codemaker-core/src/main/resources/template/springboot/applicationproperties.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springboot/applicationproperties.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/springboot/applicationproperties.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/springboot/applicationproperties.ftl diff --git a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/controller/BaseController.java b/codemaker-parent/codemaker-core/src/main/resources/template/springboot/baseController.ftl similarity index 90% rename from codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/controller/BaseController.java rename to codemaker-parent/codemaker-core/src/main/resources/template/springboot/baseController.ftl index fce563e46b00cfd383ce9070e16a3ba17efcf898..9aeaf34f9473743def40c5f43d47157f84466aa1 100644 --- a/codemaker-cola/cola-adapter/src/main/java/com/coderman/infosys/auth/controller/BaseController.java +++ b/codemaker-parent/codemaker-core/src/main/resources/template/springboot/baseController.ftl @@ -1,12 +1,12 @@ -package com.coderman.infosys.auth.controller; +package ${package}.controller; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** * @Description:控制层基础父类 -* @Author:shenshuai -* @CreateTime:2021-11-07 08:23:49 +* @Author:${author} +* @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} * @version v1.0 */ public class BaseController{ diff --git a/codemaker-core/src/main/resources/template/springboot/bo.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springboot/bo.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/springboot/bo.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/springboot/bo.ftl diff --git a/codemaker-core/src/main/resources/template/springboot/boddd.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springboot/boddd.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/springboot/boddd.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/springboot/boddd.ftl diff --git a/codemaker-parent/codemaker-core/src/main/resources/template/springboot/cache.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springboot/cache.ftl new file mode 100644 index 0000000000000000000000000000000000000000..d7514abef0dc2444f918828f8f828e846a2c489b --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/springboot/cache.ftl @@ -0,0 +1,34 @@ +package ${class.packageName}; + +<#list imports as importClass> +import ${importClass}; + + +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; + + /** + * @Description:${class.className}类 + * @Author:${class.author} + * @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} + * @version v1.0 + */ +@Service +public class ${class.className}{ + + <#list fields as field> + /** ${field.desc} **/ + @Autowired + ${field.visibility} ${field.fieldName}; + + + <#list methods as method> + +${method.doc} + ${method.visibility} ${method.returnClass} ${method.methodName}{ +${method.methodContent} + ${method.returnBody} + } + + +} \ No newline at end of file diff --git a/codemaker-core/src/main/resources/template/springboot/controller.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springboot/controller.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/springboot/controller.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/springboot/controller.ftl diff --git a/codemaker-core/src/main/resources/template/springboot/controllerddd.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springboot/controllerddd.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/springboot/controllerddd.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/springboot/controllerddd.ftl diff --git a/codemaker-core/src/main/resources/template/springboot/convert.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springboot/convert.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/springboot/convert.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/springboot/convert.ftl diff --git a/codemaker-core/src/main/resources/template/springboot/do.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springboot/do.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/springboot/do.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/springboot/do.ftl diff --git a/codemaker-core/src/main/resources/template/springboot/dto.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springboot/dto.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/springboot/dto.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/springboot/dto.ftl diff --git a/codemaker-core/src/main/resources/template/cola/dtoddd.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springboot/dtoddd.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/cola/dtoddd.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/springboot/dtoddd.ftl diff --git a/codemaker-core/src/main/resources/template/springboot/entity.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springboot/entity.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/springboot/entity.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/springboot/entity.ftl diff --git a/codemaker-core/src/main/resources/template/springboot/enum.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springboot/enum.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/springboot/enum.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/springboot/enum.ftl diff --git a/codemaker-core/src/main/resources/template/springboot/event.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springboot/event.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/springboot/event.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/springboot/event.ftl diff --git a/codemaker-core/src/main/resources/template/springboot/exeimpl.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springboot/exeimpl.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/springboot/exeimpl.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/springboot/exeimpl.ftl diff --git a/codemaker-parent/codemaker-core/src/main/resources/template/springboot/factory.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springboot/factory.ftl new file mode 100644 index 0000000000000000000000000000000000000000..d7514abef0dc2444f918828f8f828e846a2c489b --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/springboot/factory.ftl @@ -0,0 +1,34 @@ +package ${class.packageName}; + +<#list imports as importClass> +import ${importClass}; + + +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; + + /** + * @Description:${class.className}类 + * @Author:${class.author} + * @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} + * @version v1.0 + */ +@Service +public class ${class.className}{ + + <#list fields as field> + /** ${field.desc} **/ + @Autowired + ${field.visibility} ${field.fieldName}; + + + <#list methods as method> + +${method.doc} + ${method.visibility} ${method.returnClass} ${method.methodName}{ +${method.methodContent} + ${method.returnBody} + } + + +} \ No newline at end of file diff --git a/codemaker-core/src/main/resources/template/springboot/gataway.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springboot/gataway.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/springboot/gataway.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/springboot/gataway.ftl diff --git a/codemaker-core/src/main/resources/template/springboot/gatawayimpl.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springboot/gatawayimpl.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/springboot/gatawayimpl.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/springboot/gatawayimpl.ftl diff --git a/codemaker-core/src/main/resources/template/springboot/mapper.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springboot/mapper.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/springboot/mapper.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/springboot/mapper.ftl diff --git a/codemaker-core/src/main/resources/template/springboot/mapperddd.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springboot/mapperddd.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/springboot/mapperddd.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/springboot/mapperddd.ftl diff --git a/codemaker-core/src/main/resources/template/springboot/mapperxml.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springboot/mapperxml.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/springboot/mapperxml.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/springboot/mapperxml.ftl diff --git a/codemaker-core/src/main/resources/template/springboot/mapperxmlddd.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springboot/mapperxmlddd.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/springboot/mapperxmlddd.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/springboot/mapperxmlddd.ftl diff --git a/codemaker-core/src/main/resources/template/springboot/mqconsumer.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springboot/mqconsumer.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/springboot/mqconsumer.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/springboot/mqconsumer.ftl diff --git a/codemaker-core/src/main/resources/template/springboot/mqhandler.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springboot/mqhandler.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/springboot/mqhandler.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/springboot/mqhandler.ftl diff --git a/codemaker-core/src/main/resources/template/springboot/mqlistener.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springboot/mqlistener.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/springboot/mqlistener.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/springboot/mqlistener.ftl diff --git a/codemaker-core/src/main/resources/template/springboot/mqproducer.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springboot/mqproducer.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/springboot/mqproducer.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/springboot/mqproducer.ftl diff --git a/codemaker-core/src/main/resources/template/springboot/msgbody.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springboot/msgbody.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/springboot/msgbody.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/springboot/msgbody.ftl diff --git a/codemaker-core/src/main/resources/template/springboot/service.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springboot/service.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/springboot/service.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/springboot/service.ftl diff --git a/codemaker-core/src/main/resources/template/springboot/serviceImpl.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springboot/serviceImpl.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/springboot/serviceImpl.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/springboot/serviceImpl.ftl diff --git a/codemaker-core/src/main/resources/template/springboot/test.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springboot/test.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/springboot/test.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/springboot/test.ftl diff --git a/codemaker-core/src/main/resources/template/springboot/valueobject.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springboot/valueobject.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/springboot/valueobject.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/springboot/valueobject.ftl diff --git a/codemaker-core/src/main/resources/template/springboot/vo.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springboot/vo.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/springboot/vo.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/springboot/vo.ftl diff --git a/codemaker-core/src/main/resources/template/springboot/voddd.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springboot/voddd.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/springboot/voddd.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/springboot/voddd.ftl diff --git a/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/AppEventPublisher.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/AppEventPublisher.ftl new file mode 100644 index 0000000000000000000000000000000000000000..a46044426b5c0ba29e5c9aba113dbbac727f4761 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/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-parent/codemaker-core/src/main/resources/template/springcloud/BaseEvent.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/BaseEvent.ftl new file mode 100644 index 0000000000000000000000000000000000000000..4ff2d9325cbbb820b018940f57ffd1c6968cd2c7 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/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-springboot/src/main/java/com/coderman/infosys/auth/utils/SpringApplicationContext.java b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/SpringApplicationContext.ftl similarity index 96% rename from codemaker-springboot/src/main/java/com/coderman/infosys/auth/utils/SpringApplicationContext.java rename to codemaker-parent/codemaker-core/src/main/resources/template/springcloud/SpringApplicationContext.ftl index 5ccb6b278c9ebd98d94bb08b762fbfd3d7fb6424..a6e7b6374ce46bd405e58bf3bd179e2feffe8b6b 100644 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/utils/SpringApplicationContext.java +++ b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/SpringApplicationContext.ftl @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ - package com.coderman.infosys.auth.utils; + package ${package}.utils; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; diff --git a/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/acl.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/acl.ftl new file mode 100644 index 0000000000000000000000000000000000000000..f2689c4553a21b9c0f9b83b22c31b7d364c48433 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/acl.ftl @@ -0,0 +1,23 @@ +package ${class.packageName}; + +<#list imports as importClass> +import ${importClass}; + + + +/** + * @Description:${class.classDesc}接口 + * @Author:${class.author} + * @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} + * @version v1.0 + */ +public interface ${class.className}{ + <#list methods as method> + /** + * + * @Description:${method.desc} + * @return ${method.returnClass} + */ + ${method.returnClass} ${method.methodName}; + +} \ No newline at end of file diff --git a/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/aclimpl.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/aclimpl.ftl new file mode 100644 index 0000000000000000000000000000000000000000..0c1a4ee78200bbd0e9696da6c74044bd557816f9 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/aclimpl.ftl @@ -0,0 +1,39 @@ +package ${class.packageName}; + +<#list imports as importClass> +import ${importClass}; + + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; + + +/** + * @Description:${class.classDesc}接口实现类 + * @Author：${class.author} + * @CreateTime：${.now?string('yyyy-MM-dd HH:mm:ss')} + * @version v1.0 + */ +@Service +public class ${class.className} ${class.relationClassStr}{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + <#list fields as field> + @${field.annotation} + ${field.visibility} ${field.fieldName}; + + + <#list methods as method> + + @Override + public ${method.returnClass} ${method.methodName}{ +${method.methodContent} + ${method.returnBody} + } + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/Application.java b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/application.ftl similarity index 81% rename from codemaker-springboot/src/main/java/com/coderman/infosys/auth/Application.java rename to codemaker-parent/codemaker-core/src/main/resources/template/springcloud/application.ftl index 13b0524cd63bdb0de41be085d0728a9f92464e97..62e9e70e4cbd4eff27bc42c1405ffd0281b152bc 100644 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/Application.java +++ b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/application.ftl @@ -1,4 +1,4 @@ -package com.coderman.infosys.auth; +package ${package}; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -13,14 +13,14 @@ import org.springframework.context.annotation.ComponentScan; /** * @Description:应用启动入口 -* @Author:shenshuai -* @CreateTime:2021-11-06 23:38:07 +* @Author:${author} +* @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} * @version v1.0 */ @SpringBootApplication(exclude = DataSourceAutoConfiguration.class) -@ComponentScan({"com.coderman.infosys.auth.**"}) +@ComponentScan({"${package}.**"}) public class Application { - + public static void main(String[] args) { SpringApplication.run(Application.class, args); } diff --git a/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/applicationproperties.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/applicationproperties.ftl new file mode 100644 index 0000000000000000000000000000000000000000..5e846f6a937074a53a02ec436451b8c27e61e13a --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/applicationproperties.ftl @@ -0,0 +1,21 @@ +server.port=8083 +management.port=8073 + +# 跨域 +endpoints.cors.allowed-origins=http://127.0.0.1:8083 +endpoints.cors.allowed-methods=GET,POST + + +#数据库配置 +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +spring.datasource.url=jdbc:mysql://localhost:3306/coder_bank_product?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=UTC +spring.datasource.username=root +spring.datasource.password=root + +#配置.xml文件路径 +mybatis.config-locations=classpath:mybatis-config.xml +mybatis.mapper-locations=classpath:mapper/*.xml +#配置模型路径 +mybatis.type-aliases-package=com.coderman.codemaker.bean + + diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/controller/BaseController.java b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/baseController.ftl similarity index 90% rename from codemaker-springboot/src/main/java/com/coderman/infosys/auth/controller/BaseController.java rename to codemaker-parent/codemaker-core/src/main/resources/template/springcloud/baseController.ftl index 25e870deb01b0fe78e45c0d1197e79ffc6bac8a3..9aeaf34f9473743def40c5f43d47157f84466aa1 100644 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/controller/BaseController.java +++ b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/baseController.ftl @@ -1,12 +1,12 @@ -package com.coderman.infosys.auth.controller; +package ${package}.controller; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** * @Description:控制层基础父类 -* @Author:shenshuai -* @CreateTime:2021-11-06 23:38:07 +* @Author:${author} +* @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} * @version v1.0 */ public class BaseController{ diff --git a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/UserRoleMappingDO.java b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/bo.ftl similarity index 31% rename from codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/UserRoleMappingDO.java rename to codemaker-parent/codemaker-core/src/main/resources/template/springcloud/bo.ftl index 276dcade21ed05621a98ffc017083503c7ad1a6e..bda879528eb4348db9074de60a254d187dec78ea 100644 --- a/codemaker-cola/cola-infrast/src/main/java/com/coderman/infosys/auth/infrast/dao/dataobject/UserRoleMappingDO.java +++ b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/bo.ftl @@ -1,4 +1,4 @@ -package com.coderman.infosys.auth.infrast.dao.dataobject; +package ${package}.bo; import java.util.Date; import java.math.BigDecimal; @@ -6,23 +6,19 @@ import lombok.Data; import lombok.ToString; /** - * @Description:用户角色关联表DO类 - * @Author:shenshuai - * @CreateTime:2021-11-07 08:23:49 + * @Description:${table.tableComment}BO类 + * @Author:${author} + * @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} * @version v1.0 */ @Data @ToString -public class UserRoleMappingDO{ +public class ${table.humpClassName}BO{ + <#list columns as column> - /** 主键 **/ - private Long id; - - /** 用户ID **/ - private Long userId; - - /** 角色code **/ - private String roleCode; + /** ${column.columnComment} **/ + private ${column.columnTypeName} ${column.columnFieldName}; + } \ No newline at end of file diff --git a/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/boddd.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/boddd.ftl new file mode 100644 index 0000000000000000000000000000000000000000..1a43acac8202e47b8613705d0592615b6c3f14fd --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/boddd.ftl @@ -0,0 +1,39 @@ +package ${class.packageName}; + +<#list imports as importClass> +import ${importClass}; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:${class.classDesc}类 + * @Author:${class.author} + * @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} + * @version v1.0 + */ +@Data +@ToString +public class ${class.className} ${class.relationClassStr}{ + + <#list fields as field> + + /** + * ${field.desc} + */ + ${field.visibility} ${field.fieldName}; + + + <#list methods as method> + /** + * + * @Description:${method.desc} + * @return ${method.returnClass} + */ + ${method.visibility} ${method.returnClass} ${method.methodName}{ + ${method.returnBody} + } + + +} \ No newline at end of file diff --git a/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/cache.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/cache.ftl new file mode 100644 index 0000000000000000000000000000000000000000..d7514abef0dc2444f918828f8f828e846a2c489b --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/cache.ftl @@ -0,0 +1,34 @@ +package ${class.packageName}; + +<#list imports as importClass> +import ${importClass}; + + +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; + + /** + * @Description:${class.className}类 + * @Author:${class.author} + * @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} + * @version v1.0 + */ +@Service +public class ${class.className}{ + + <#list fields as field> + /** ${field.desc} **/ + @Autowired + ${field.visibility} ${field.fieldName}; + + + <#list methods as method> + +${method.doc} + ${method.visibility} ${method.returnClass} ${method.methodName}{ +${method.methodContent} + ${method.returnBody} + } + + +} \ No newline at end of file diff --git a/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/controller.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/controller.ftl new file mode 100644 index 0000000000000000000000000000000000000000..3c88f6d538a3d5c5784303201653be94a35443b2 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/controller.ftl @@ -0,0 +1,103 @@ +package ${package}.controller; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import ${package}.service.${table.humpClassName}Service; +import ${package}.vo.${table.humpClassName}VO; + +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:${table.tableComment}控制层 +* @Author:${author} +* @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} +* @version v1.0 +*/ +@RestController +public class ${table.humpClassName}Controller extends BaseController{ + + protected Logger logger = LoggerFactory.getLogger(${table.humpClassName}Controller.class); + + @Autowired + private ${table.humpClassName}Service ${table.humpTableName}Service; + + + /** + * @Description:新增${table.tableComment} + * @version v1.0 + * @param ${table.humpTableName}VO + * @return ResultDto + */ + @RequestMapping(value = "/${table.humpTableName}/add",method = RequestMethod.POST) + public ResultDto add(@RequestBody ${table.humpClassName}VO ${table.humpTableName}VO){ + //todo impl code + return new ResultDto(); + } + + /** + * @Description:修改${table.tableComment} + * @version v1.0 + * @param ${table.humpTableName}VO + * @return ResultDto + */ + @RequestMapping(value = "/${table.humpTableName}/update",method = RequestMethod.POST) + public ResultDto update(@RequestBody ${table.humpClassName}VO ${table.humpTableName}VO){ + //todo impl code + return new ResultDto(); + } + + /** + * @Description:根据id删除${table.tableComment} + * @version v1.0 + * @param id + * @return ResultDto + */ + @PostMapping("/${table.humpTableName}/delete") + public ResultDto delete(@RequestParam(name = "id") Long id){ + //todo impl code + return new ResultDto(); + } + + /** + * @Description:根据ID获取${table.tableComment}单条记录 + * @version v1.0 + * @param id + * @return ResultDataDto + */ + @GetMapping("/${table.humpTableName}/get") + public ResultDataDto getById(@RequestParam(name = "id") Long id){ + //todo impl code + return new ResultDataDto(); + } + + /** + * @Description:分页获取${table.tableComment}记录 + * @version v1.0 + * @return ResultDataDto + */ + @GetMapping("/${table.humpTableName}/getpage") + public ResultDataDto getPage(){ + //todo impl code + return new ResultDataDto(); + } + + /** + * @Description:修改${table.tableComment}状态 + * @version v1.0 + * @param id + * @param status + * @return ResultDataDto + */ + @PostMapping("/${table.humpTableName}/changestatus") + public ResultDto changeStatus(@RequestParam(name = "id") Long id,@RequestParam(name = "status") int status){ + //todo impl code + return new ResultDto(); + } + +} diff --git a/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/controllerddd.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/controllerddd.ftl new file mode 100644 index 0000000000000000000000000000000000000000..746c312f5a54c96461ee594b214cb3824ff9b69a --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/controllerddd.ftl @@ -0,0 +1,38 @@ +package ${class.packageName}; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +<#list imports as importClass> +import ${importClass}; + +import org.springframework.beans.factory.annotation.Autowired; + + + +/** +* @Description:${table.tableComment}控制层 +* @Author:${author} +* @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} +* @version v1.0 +*/ +@RestController +public class ${class.className} ${class.relationClassStr}{ + + protected Logger logger = LoggerFactory.getLogger(${class.className}.class); + +<#list fields as field> + @Autowired + ${field.visibility} ${field.fieldName}; + + +<#list methods as method> + +${method.doc} + @Override + public ${method.returnClass} ${method.methodName}{ +${method.methodContent} + ${method.returnBody} + } + +} diff --git a/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/convert.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/convert.ftl new file mode 100644 index 0000000000000000000000000000000000000000..6fe60c1bbf6b49ed0ddcb1193761b8093091fa98 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/convert.ftl @@ -0,0 +1,30 @@ +package ${class.packageName}; + +<#list imports as importClass> +import ${importClass}; + + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +/** +* @Description:${class.classDesc}接口 +* @Author:${class.author} +* @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} +* @version v1.0 +*/ +@Mapper +public interface ${class.className}{ + ${class.className} INSTANCE = Mappers.getMapper(${class.className}.class); + + <#list methods as method> + /** + * + * @Description:${method.desc} + * @return ${method.returnClass} + */ + ${method.returnClass} ${method.methodName}; + +} \ No newline at end of file diff --git a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/UserRoleMappingDO.java b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/do.ftl similarity index 30% rename from codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/UserRoleMappingDO.java rename to codemaker-parent/codemaker-core/src/main/resources/template/springcloud/do.ftl index 149ab98b7e01f765a5d8029548a76fe5f465e4d9..5cb6980c8680c78017324dca6939094acf5835ec 100644 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/UserRoleMappingDO.java +++ b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/do.ftl @@ -1,4 +1,4 @@ -package com.coderman.infosys.auth.infrast.dao.dataobject; +package ${packageInfrast}.dao.dataobject; import java.util.Date; import java.math.BigDecimal; @@ -6,23 +6,19 @@ import lombok.Data; import lombok.ToString; /** - * @Description:用户角色关联表DO类 - * @Author:shenshuai - * @CreateTime:2021-11-06 23:38:07 + * @Description:${table.tableComment}DO类 + * @Author:${author} + * @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} * @version v1.0 */ @Data @ToString -public class UserRoleMappingDO{ +public class ${table.humpClassName}DO{ + <#list columns as column> - /** 主键 **/ - private Long id; - - /** 用户ID **/ - private Long userId; - - /** 角色code **/ - private String roleCode; + /** ${column.columnComment} **/ + private ${column.columnTypeName} ${column.columnFieldName}; + } \ No newline at end of file diff --git a/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/dto.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/dto.ftl new file mode 100644 index 0000000000000000000000000000000000000000..53b7d4e007d74fb912a31d9b3f39979a36d3c88e --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/dto.ftl @@ -0,0 +1,25 @@ +package ${package}.dto; + +import java.util.Date; +import java.math.BigDecimal; +import lombok.Data; +import lombok.ToString; +import java.io.Serializable; + + +/** +* @Description:${table.tableComment}DTO类 +* @Author:${author} +* @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} +* @version v1.0 +*/ +@Data +@ToString +public class ${table.humpClassName}DTO implements Serializable { + +<#list columns as column> + /** ${column.columnComment} **/ + private ${column.columnTypeName} ${column.columnFieldName}; + + +} \ No newline at end of file diff --git a/codemaker-core/src/main/resources/template/springboot/dtoddd.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/dtoddd.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/springboot/dtoddd.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/springcloud/dtoddd.ftl diff --git a/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/entity.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/entity.ftl new file mode 100644 index 0000000000000000000000000000000000000000..c45bed22e584d61b58d6675286412e84755d1a9c --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/entity.ftl @@ -0,0 +1,33 @@ +package ${package}.entity; + +import java.util.Date; +import java.math.BigDecimal; + + /** + * @Description:${table.tableComment}Entity类 + * @Author:${author} + * @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} + * @version v1.0 + */ +public class ${table.humpClassName}Entity{ + + <#list columns as column> + /** ${column.columnComment} **/ + private ${column.columnTypeName} ${column.columnFieldName}; + + + <#list columns as column> + /** + * 描述：${column.columnComment} + */ + public ${column.columnTypeName} get${column.columnUperName}() { + return ${column.columnFieldName}; + } + /** + * 描述：${column.columnComment} + */ + public void set${column.columnUperName}(${column.columnTypeName} ${column.columnFieldName}) { + this.${column.columnFieldName} = ${column.columnFieldName}; + } + +} \ No newline at end of file diff --git a/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/enum.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/enum.ftl new file mode 100644 index 0000000000000000000000000000000000000000..27c66dd0e0190604a3c1c039819a08895cb3449c --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/enum.ftl @@ -0,0 +1,47 @@ +package ${class.packageName}; + +import lombok.Getter; + + /** + * @Description:${class.classDesc}类 + * @Author:${class.author} + * @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} + * @version v1.0 + */ +@Getter +public enum ${class.className}{ + + /** + * + */ + <#list enums as enumValue> + ${enumValue}, + + ; + + <#list fields as field> + /** ${field.desc} **/ + ${field.visibility} ${field.fieldName}; + + + + ${class.className}(${class.constructParamStr}){ + <#list bodys as body> + ${body}; + + } + + + + <#list methods as method> + /** + * + * @Description:${method.desc} + * @return ${method.returnClass} + */ + public static ${method.returnClass} ${method.methodName}{ + ${method.returnBody} + } + + +} \ No newline at end of file diff --git a/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/event.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/event.ftl new file mode 100644 index 0000000000000000000000000000000000000000..9f15e120dfe9a271ea823b5e318410cbd3be5c44 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/event.ftl @@ -0,0 +1,35 @@ +package ${class.packageName}; + +<#list imports as importClass> +import ${importClass}; + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:${class.classDesc}类 + * @Author:${class.author} + * @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} + * @version v1.0 + */ +@Data +@ToString +public class ${class.className}{ + + <#list fields as field> + /** ${field.desc} **/ + ${field.visibility} ${field.fieldName}; + + + <#list methods as method> + /** + * + * @Description:${method.desc} + * @return ${method.returnClass} + */ + ${method.visibility} ${method.returnClass} ${method.methodName}{ + ${method.returnBody} + } + + +} \ No newline at end of file diff --git a/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/exeimpl.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/exeimpl.ftl new file mode 100644 index 0000000000000000000000000000000000000000..e6a8d75475a8c42353b308de6c43e6e9bd173bca --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/exeimpl.ftl @@ -0,0 +1,38 @@ +package ${class.packageName}; + +<#list imports as importClass> +import ${importClass}; + + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import ${class.packageName}.${class.className}; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * @Description:${class.classDesc}接口实现类 + * @Author：${class.author} + * @CreateTime：${.now?string('yyyy-MM-dd HH:mm:ss')} + * @version v1.0 + */ +@Service +public class ${class.className} ${class.relationClassStr}{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + <#list fields as field> + @Autowired + ${field.visibility} ${field.fieldName}; + + + + <#list methods as method> + + @Override + public ${method.returnClass} ${method.methodName}{ +${method.methodContent} + ${method.returnBody} + } + + +} \ No newline at end of file diff --git a/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/factory.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/factory.ftl new file mode 100644 index 0000000000000000000000000000000000000000..d7514abef0dc2444f918828f8f828e846a2c489b --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/factory.ftl @@ -0,0 +1,34 @@ +package ${class.packageName}; + +<#list imports as importClass> +import ${importClass}; + + +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; + + /** + * @Description:${class.className}类 + * @Author:${class.author} + * @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} + * @version v1.0 + */ +@Service +public class ${class.className}{ + + <#list fields as field> + /** ${field.desc} **/ + @Autowired + ${field.visibility} ${field.fieldName}; + + + <#list methods as method> + +${method.doc} + ${method.visibility} ${method.returnClass} ${method.methodName}{ +${method.methodContent} + ${method.returnBody} + } + + +} \ No newline at end of file diff --git a/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/feign.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/feign.ftl new file mode 100644 index 0000000000000000000000000000000000000000..25af93e70591fa7565dcc59cc3d5736f054cbd41 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/feign.ftl @@ -0,0 +1,68 @@ +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; + +/** + * @Description:${table.tableComment}Facade接口 + * @Author:${author} + * @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} + * @version v1.0 + */ +public interface ${table.humpClassName}Facade{ + + /** + * @Description:新增${table.tableComment} + * @author: + * @param dto + * @return ResultDto 返回类型 + * @throws + */ + public ResultDto save(${table.humpClassName}DTO dto) throws Exception; + + /** + * + * @Description: 通过id删除数据 + * @param id + * @return ResultDto 返回类型 + * @throws + */ + public ResultDto delete(Long id); + + /** + * + * @Description: 通过id查询 + * @param @param id + * @return ResultDataDto<${table.humpClassName}DTO> + * @throws + */ + public ResultDataDto<${table.humpClassName}DTO> getById(Long id) throws Exception; + + /** + * @Description:查询所有数据 + * @return ResultDataDto> + * @throws + */ + public ResultDataDto> getAll() throws Exception; + + /** + * @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-parent/codemaker-core/src/main/resources/template/springcloud/feigncontroller.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/feigncontroller.ftl new file mode 100644 index 0000000000000000000000000000000000000000..b8a174a61d57c094a61d497670fd098957e3fc64 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/feigncontroller.ftl @@ -0,0 +1,103 @@ +package ${package}.controller; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import ${package}.service.${table.humpClassName}Service; +import ${package}.dto.${table.humpClassName}DTO; + +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:${table.tableComment}控制层 +* @Author:${author} +* @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} +* @version v1.0 +*/ +@RestController +public class ${table.humpClassName}Controller extends BaseController{ + + protected Logger logger = LoggerFactory.getLogger(${table.humpClassName}Controller.class); + + @Autowired + private ${table.humpClassName}Service ${table.humpTableName}Service; + + + /** + * @Description:新增${table.tableComment} + * @version v1.0 + * @param ${table.humpTableName}VO + * @return ResultDto + */ + @RequestMapping(value = "/${table.humpTableName}/add",method = RequestMethod.POST) + public ResultDto add(@RequestBody ${table.humpClassName}VO ${table.humpTableName}VO){ + //todo impl code + return new ResultDto(); + } + + /** + * @Description:修改${table.tableComment} + * @version v1.0 + * @param ${table.humpTableName}VO + * @return ResultDto + */ + @RequestMapping(value = "/${table.humpTableName}/update",method = RequestMethod.POST) + public ResultDto update(@RequestBody ${table.humpClassName}VO ${table.humpTableName}VO){ + //todo impl code + return new ResultDto(); + } + + /** + * @Description:根据id删除${table.tableComment} + * @version v1.0 + * @param id + * @return ResultDto + */ + @PostMapping("/${table.humpTableName}/delete") + public ResultDto delete(@RequestParam(name = "id") Long id){ + //todo impl code + return new ResultDto(); + } + + /** + * @Description:根据ID获取${table.tableComment}单条记录 + * @version v1.0 + * @param id + * @return ResultDataDto + */ + @GetMapping("/${table.humpTableName}/get") + public ResultDataDto getById(@RequestParam(name = "id") Long id){ + //todo impl code + return new ResultDataDto(); + } + + /** + * @Description:分页获取${table.tableComment}记录 + * @version v1.0 + * @return ResultDataDto + */ + @GetMapping("/${table.humpTableName}/getpage") + public ResultDataDto getPage(){ + //todo impl code + return new ResultDataDto(); + } + + /** + * @Description:修改${table.tableComment}状态 + * @version v1.0 + * @param id + * @param status + * @return ResultDataDto + */ + @PostMapping("/${table.humpTableName}/changestatus") + public ResultDto changeStatus(@RequestParam(name = "id") Long id,@RequestParam(name = "status") int status){ + //todo impl code + return new ResultDto(); + } + +} diff --git a/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/feigncontrollerddd.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/feigncontrollerddd.ftl new file mode 100644 index 0000000000000000000000000000000000000000..974cd45d8c0edcea7d92487ad7ed20ef3d1112f1 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/feigncontrollerddd.ftl @@ -0,0 +1,38 @@ +package ${class.packageName}; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +<#list imports as importClass> +import ${importClass}; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +/** +* @Description:${table.tableComment}控制层 +* @Author:${author} +* @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} +* @version v1.0 +*/ +@RestController +public class ${class.className} ${class.relationClassStr}{ + + protected Logger logger = LoggerFactory.getLogger(${class.className}.class); + +<#list fields as field> + @Autowired + ${field.visibility} ${field.fieldName}; + + +<#list methods as method> + +${method.doc} + @RequestMapping(value = "${method.pathValue}") + public ${method.returnClass} ${method.methodName}{ +${method.methodContent} + ${method.returnBody} + } + +} diff --git a/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/feignddd.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/feignddd.ftl new file mode 100644 index 0000000000000000000000000000000000000000..9607631a0695ae5b502f081cdc2b1756462455b0 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/feignddd.ftl @@ -0,0 +1,22 @@ +package ${class.packageName}; + +<#list imports as importClass> +import ${importClass}; + + + +/** +* @Description:${class.classDesc}接口 +* @Author:${class.author} +* @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} +* @version v1.0 +*/ +${class.annotation} +public interface ${class.className}{ +<#list methods as method> + +${method.doc} + @RequestMapping(value = "${method.pathValue}") + ${method.returnClass} ${method.methodName}; + +} \ No newline at end of file diff --git a/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/gataway.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/gataway.ftl new file mode 100644 index 0000000000000000000000000000000000000000..f2689c4553a21b9c0f9b83b22c31b7d364c48433 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/gataway.ftl @@ -0,0 +1,23 @@ +package ${class.packageName}; + +<#list imports as importClass> +import ${importClass}; + + + +/** + * @Description:${class.classDesc}接口 + * @Author:${class.author} + * @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} + * @version v1.0 + */ +public interface ${class.className}{ + <#list methods as method> + /** + * + * @Description:${method.desc} + * @return ${method.returnClass} + */ + ${method.returnClass} ${method.methodName}; + +} \ No newline at end of file diff --git a/codemaker-core/src/main/resources/template/cola/infrastaclimpl.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/gatawayimpl.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/cola/infrastaclimpl.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/springcloud/gatawayimpl.ftl diff --git a/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/mapper.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/mapper.ftl new file mode 100644 index 0000000000000000000000000000000000000000..db78b21dca8f442b236fe1bf20f5c7a80263c25d --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/mapper.ftl @@ -0,0 +1,68 @@ +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; + + +/** + * @Description:${table.tableComment}mapperDAO接口 + * @Author:${author} + * @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} + * @version v1.0 + */ +@Mapper +public interface ${table.humpClassName}Mapper{ + + /** + * + * @Description:新增或修改 + * @param ${table.humpTableName}DO + * @return int + */ + public long insert(${table.humpClassName}DO ${table.humpTableName}DO); + + /** + * @Description: 通过id删除数据 + * @param id + * @return int + */ + public int deleteById(Long id); + + /** + * @Description: 通过id查询 + * @param id + * @return ResultDataDto<${table.humpClassName}DO> + */ + public ${table.humpClassName}DO getById(Long id); + + /** + * @Description:查询所有数据 + * @return List<${table.humpClassName}DO + */ + public List<${table.humpClassName}DO> getAll(); + + /** + * + * @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-parent/codemaker-core/src/main/resources/template/springcloud/mapperddd.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/mapperddd.ftl new file mode 100644 index 0000000000000000000000000000000000000000..43102bc46dc874bde3bcc9316203d6183e3adda9 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/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-springboot/src/main/resources/mapper/UserRoleMappingMapper.xml b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/mapperxml.ftl similarity index 38% rename from codemaker-springboot/src/main/resources/mapper/UserRoleMappingMapper.xml rename to codemaker-parent/codemaker-core/src/main/resources/template/springcloud/mapperxml.ftl index 3892d15b65cd2a1491a4a6a4dc54e9a970ea39ef..3e3c284f13bb9414fe3d561bdc4f4a9453ced9bd 100644 --- a/codemaker-springboot/src/main/resources/mapper/UserRoleMappingMapper.xml +++ b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/mapperxml.ftl @@ -1,14 +1,14 @@ - + - - - - + + <#list columns as column> + + @@ -19,44 +19,44 @@ - id,user_id,role_code + ${table.columnNameList} - - insert into user_role_mapping( - user_id,role_code + + insert into ${table.tableName}( + ${table.insertColumnNames} ) values( - #{user_id},#{role_code} + ${table.insertColumnNameList} ) - - update user_role_mapping + + update ${table.tableName} set - user_id=#{user_id},role_code=#{role_code} - where id = #{id} + ${table.updateColumnNameList} + where id = <#noparse>#{id<#noparse>} - - delete from user_role_mapping where id = #{id} + delete from ${table.tableName} where id = <#noparse>#{id<#noparse>} diff --git a/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/mapperxmlddd.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/mapperxmlddd.ftl new file mode 100644 index 0000000000000000000000000000000000000000..7d50a9abc14735d5c345f581d318c4ba35bb7d4d --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/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-parent/codemaker-core/src/main/resources/template/springcloud/mqconsumer.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/mqconsumer.ftl new file mode 100644 index 0000000000000000000000000000000000000000..758b640f34c009f2f7a9a7659d06586a9d51db1a --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/mqconsumer.ftl @@ -0,0 +1,34 @@ +package ${class.packageName}; + +<#list imports as importClass> +import ${importClass}; + + +import org.springframework.stereotype.Service; + + /** + * @Description:${class.className}类 + * @Author:${class.author} + * @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} + * @version v1.0 + */ +@Service +public class ${class.className}{ + + <#list fields as field> + /** ${field.desc} **/ + ${field.visibility} ${field.fieldName}; + + + <#list methods as method> + /** + * + * @Description:${method.desc} + * @return ${method.returnClass} + */ + ${method.visibility} ${method.returnClass} ${method.methodName}{ + ${method.returnBody} + } + + +} \ No newline at end of file diff --git a/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/mqhandler.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/mqhandler.ftl new file mode 100644 index 0000000000000000000000000000000000000000..758b640f34c009f2f7a9a7659d06586a9d51db1a --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/mqhandler.ftl @@ -0,0 +1,34 @@ +package ${class.packageName}; + +<#list imports as importClass> +import ${importClass}; + + +import org.springframework.stereotype.Service; + + /** + * @Description:${class.className}类 + * @Author:${class.author} + * @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} + * @version v1.0 + */ +@Service +public class ${class.className}{ + + <#list fields as field> + /** ${field.desc} **/ + ${field.visibility} ${field.fieldName}; + + + <#list methods as method> + /** + * + * @Description:${method.desc} + * @return ${method.returnClass} + */ + ${method.visibility} ${method.returnClass} ${method.methodName}{ + ${method.returnBody} + } + + +} \ No newline at end of file diff --git a/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/mqlistener.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/mqlistener.ftl new file mode 100644 index 0000000000000000000000000000000000000000..758b640f34c009f2f7a9a7659d06586a9d51db1a --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/mqlistener.ftl @@ -0,0 +1,34 @@ +package ${class.packageName}; + +<#list imports as importClass> +import ${importClass}; + + +import org.springframework.stereotype.Service; + + /** + * @Description:${class.className}类 + * @Author:${class.author} + * @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} + * @version v1.0 + */ +@Service +public class ${class.className}{ + + <#list fields as field> + /** ${field.desc} **/ + ${field.visibility} ${field.fieldName}; + + + <#list methods as method> + /** + * + * @Description:${method.desc} + * @return ${method.returnClass} + */ + ${method.visibility} ${method.returnClass} ${method.methodName}{ + ${method.returnBody} + } + + +} \ No newline at end of file diff --git a/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/mqproducer.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/mqproducer.ftl new file mode 100644 index 0000000000000000000000000000000000000000..758b640f34c009f2f7a9a7659d06586a9d51db1a --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/mqproducer.ftl @@ -0,0 +1,34 @@ +package ${class.packageName}; + +<#list imports as importClass> +import ${importClass}; + + +import org.springframework.stereotype.Service; + + /** + * @Description:${class.className}类 + * @Author:${class.author} + * @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} + * @version v1.0 + */ +@Service +public class ${class.className}{ + + <#list fields as field> + /** ${field.desc} **/ + ${field.visibility} ${field.fieldName}; + + + <#list methods as method> + /** + * + * @Description:${method.desc} + * @return ${method.returnClass} + */ + ${method.visibility} ${method.returnClass} ${method.methodName}{ + ${method.returnBody} + } + + +} \ No newline at end of file diff --git a/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/msgbody.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/msgbody.ftl new file mode 100644 index 0000000000000000000000000000000000000000..e6c85cb66d03e7f57dcafa118bdfe67d37ec6491 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/msgbody.ftl @@ -0,0 +1,33 @@ +package ${class.packageName}; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:${class.classDesc}类 + * @Author:${class.author} + * @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} + * @version v1.0 + */ +@Data +@ToString +public class ${class.className}{ + + <#list fields as field> + /** ${field.desc} **/ + ${field.visibility} ${field.fieldName}; + + + <#list methods as method> + /** + * + * @Description:${method.desc} + * @return ${method.returnClass} + */ + ${method.visibility} ${method.returnClass} ${method.methodName}{ + ${method.returnBody} + } + + +} \ No newline at end of file diff --git a/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/service.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/service.ftl new file mode 100644 index 0000000000000000000000000000000000000000..13903d7f54e740c4970624dde9be6eccc4ad068c --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/service.ftl @@ -0,0 +1,69 @@ +package ${package}.service; + +import java.util.List; + +import ${package}.bo.${table.humpClassName}BO; + +/** + * @Description:${table.tableComment}Service接口 + * @Author:${author} + * @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} + * @version v1.0 + */ +public interface ${table.humpClassName}Service{ + + /** + * @Description:新增 + * @param bo + * @return ResultDto 返回类型 + * @throws + */ + public ${table.humpClassName}BO save(${table.humpClassName}BO bo) throws Exception; + + /** + * @Description: 通过id删除数据 + * @param id + * @return ResultDto 返回类型 + * @throws + */ + public Boolean delete(Long id); + + /** + * @Description: 通过id查询 + * @param id + * @return ResultDataDto<${table.humpClassName}BO> + * @throws + */ + public ${table.humpClassName}BO getById(Long id) throws Exception; + + /** + * @Description:查询所有数据 + * @return List<${table.humpClassName}BO> + * @throws + */ + public List<${table.humpClassName}BO> getAll() 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-parent/codemaker-core/src/main/resources/template/springcloud/serviceImpl.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/serviceImpl.ftl new file mode 100644 index 0000000000000000000000000000000000000000..496601eeae98d89de8913b72045c62a0a364ecf9 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/serviceImpl.ftl @@ -0,0 +1,77 @@ +package ${package}.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 ${package}.dao.mapper.${table.humpClassName}Mapper; +import ${package}.service.${table.humpClassName}Service; +import ${package}.bo.${table.humpClassName}BO; + +import java.util.List; +import org.apache.commons.lang3.StringUtils; +import com.alibaba.fastjson.JSONObject; + +/** + * @Description:${table.tableComment}Service接口实现类 + * @Author：${author} + * @CreateTime：${.now?string('yyyy-MM-dd HH:mm:ss')} + * @version v1.0 + */ +@Service +public class ${table.humpClassName}ServiceImpl implements ${table.humpClassName}Service{ + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + private ${table.humpClassName}Mapper ${table.humpTableName}Mapper; + + @Override + public ${table.humpClassName}BO save(${table.humpClassName}BO bo) { + //todo impl code + return null; + } + + @Override + public Boolean delete(Long id) { + logger.info("${table.humpTableName}Service.delete,id="+id); + //todo impl code + return false; + } + + @Override + public ${table.humpClassName}BO getById(Long id) { + logger.info("${table.humpTableName}Service.getById,id="+id); + //todo impl code + return null; + } + + @Override + public List<${table.humpClassName}BO> getAll() { + //todo impl code + return null; + } + + @Override + public Boolean update(${table.humpClassName}BO bo) { + //todo impl code + 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-core/src/main/resources/template/test.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/test.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/test.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/springcloud/test.ftl diff --git a/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/valueobject.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/valueobject.ftl new file mode 100644 index 0000000000000000000000000000000000000000..5c2f634e6bcd418c79556b914b5b2c9c4701aff5 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/valueobject.ftl @@ -0,0 +1,36 @@ +package ${class.packageName}; + +<#list imports as importClass> +import ${importClass}; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:${class.classDesc}类 + * @Author:${class.author} + * @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} + * @version v1.0 + */ +@Data +@ToString +public class ${class.className} ${class.relationClassStr}{ + + <#list fields as field> + /** ${field.desc} **/ + ${field.visibility} ${field.fieldName}; + + + <#list methods as method> + /** + * + * @Description:${method.desc} + * @return ${method.returnClass} + */ + ${method.visibility} ${method.returnClass} ${method.methodName}{ + ${method.returnBody} + } + + +} \ No newline at end of file diff --git a/codemaker-core/src/main/resources/template/vo.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/vo.ftl similarity index 100% rename from codemaker-core/src/main/resources/template/vo.ftl rename to codemaker-parent/codemaker-core/src/main/resources/template/springcloud/vo.ftl diff --git a/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/voddd.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/voddd.ftl new file mode 100644 index 0000000000000000000000000000000000000000..5c2f634e6bcd418c79556b914b5b2c9c4701aff5 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/springcloud/voddd.ftl @@ -0,0 +1,36 @@ +package ${class.packageName}; + +<#list imports as importClass> +import ${importClass}; + + +import lombok.Data; +import lombok.ToString; + + /** + * @Description:${class.classDesc}类 + * @Author:${class.author} + * @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} + * @version v1.0 + */ +@Data +@ToString +public class ${class.className} ${class.relationClassStr}{ + + <#list fields as field> + /** ${field.desc} **/ + ${field.visibility} ${field.fieldName}; + + + <#list methods as method> + /** + * + * @Description:${method.desc} + * @return ${method.returnClass} + */ + ${method.visibility} ${method.returnClass} ${method.methodName}{ + ${method.returnBody} + } + + +} \ No newline at end of file diff --git a/codemaker-springboot/src/test/java/com/lightsnail/app/user/crm/core/service/test/AccountServiceTest.java b/codemaker-parent/codemaker-core/src/main/resources/template/test.ftl similarity index 50% rename from codemaker-springboot/src/test/java/com/lightsnail/app/user/crm/core/service/test/AccountServiceTest.java rename to codemaker-parent/codemaker-core/src/main/resources/template/test.ftl index 3b0dfcf3d6a3cbe63e46f2e5e934f454865f48ff..bddd6827a33d6e58ca7d55206efe1c2510a4a550 100644 --- a/codemaker-springboot/src/test/java/com/lightsnail/app/user/crm/core/service/test/AccountServiceTest.java +++ b/codemaker-parent/codemaker-core/src/main/resources/template/test.ftl @@ -1,11 +1,11 @@ -package com.lightsnail.app.user.crm.core.service.test; +package ${package}.service.test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.lightsnail.app.user.crm.core.service.AccountService; -import com.lightsnail.app.user.crm.core.vo.AccountVO; -import com.lightsnail.app.user.crm.core.Application; +import ${package}.service.${table.humpClassName}Service; +import ${package}.vo.${table.humpClassName}VO; +import ${package}.Application; import com.coderman.utils.response.ResultDataDto; import com.coderman.utils.response.ResultDto; @@ -22,68 +22,68 @@ import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.test.context.junit4.SpringRunner; /** -* @Description:合作用户表单元测试 -* @Author:fanchunshuai -* @CreateTime:2020-11-17 00:02:53 +* @Description:${table.tableComment}单元测试 +* @Author:${author} +* @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} * @version v1.0 */ @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment= SpringBootTest.WebEnvironment.RANDOM_PORT,classes = {Application.class}) -public class AccountServiceTest{ +public class ${table.humpClassName}ServiceTest{ - protected Logger logger = LoggerFactory.getLogger(AccountServiceTest.class); + protected Logger logger = LoggerFactory.getLogger(${table.humpClassName}ServiceTest.class); @Autowired - private AccountService accountService; + private ${table.humpClassName}Service ${table.humpTableName}Service; @Autowired private TestRestTemplate restTemplate; /** - * @Description:测试新增合作用户表 接口 + * @Description:测试新增${table.tableComment} 接口 */ @Test public void testAdd(){ //todo test code - AccountVO vo = new AccountVO(); + ${table.humpClassName}VO vo = new ${table.humpClassName}VO(); - ResultDto resultDto = restTemplate.postForEntity("/account/add",vo, ResultDto.class).getBody(); + ResultDto resultDto = restTemplate.postForEntity("/${table.humpTableName}/add",vo, ResultDto.class).getBody(); System.out.println(JSON.toJSONString(resultDto)); } /** - * @Description:测试修改合作用户表 + * @Description:测试修改${table.tableComment} */ @Test public void testUpdate(){ //todo test code - AccountVO vo = new AccountVO(); - ResultDto resultDto = restTemplate.postForEntity("/account/update",vo, ResultDto.class).getBody(); + ${table.humpClassName}VO vo = new ${table.humpClassName}VO(); + ResultDto resultDto = restTemplate.postForEntity("/${table.humpTableName}/update",vo, ResultDto.class).getBody(); System.out.println(JSON.toJSONString(resultDto)); } /** - * @Description:测试删除根据id删除合作用户表 + * @Description:测试删除根据id删除${table.tableComment} */ @Test public void testDelete(){ //todo test code long id = 1L; - ResultDto resultDto = restTemplate.postForEntity("/account/delete",id, ResultDto.class).getBody(); + ResultDto resultDto = restTemplate.postForEntity("/${table.humpTableName}/delete",id, ResultDto.class).getBody(); System.out.println(JSON.toJSONString(resultDto)); } /** - * @Description:但是根据ID获取合作用户表单条记录 + * @Description:但是根据ID获取${table.tableComment}单条记录 */ @Test public void testGetById(){ //todo test code - ResultDataDto resultDataDto = restTemplate.getForEntity("/account/get?id=1",ResultDataDto.class).getBody(); + ResultDataDto resultDataDto = restTemplate.getForEntity("/${table.humpTableName}/get?id=1",ResultDataDto.class).getBody(); System.out.println(JSON.toJSONString(resultDataDto)); } /** - * @Description:测试分页获取合作用户表记录 + * @Description:测试分页获取${table.tableComment}记录 */ @Test public void getPage(){ @@ -91,14 +91,14 @@ public class AccountServiceTest{ } /** - * @Description:测试禁用合作用户表状态 + * @Description:测试禁用${table.tableComment}状态 */ @Test public void testDisable(){ //todo test code } /** - * @Description:测试启用合作用户表状态 + * @Description:测试启用${table.tableComment}状态 */ @Test public void testEnable(){ diff --git a/codemaker-parent/codemaker-core/src/main/resources/template/vo.ftl b/codemaker-parent/codemaker-core/src/main/resources/template/vo.ftl new file mode 100644 index 0000000000000000000000000000000000000000..8113fd2240a602e78a54895474b39b7c1e56d0e4 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/main/resources/template/vo.ftl @@ -0,0 +1,33 @@ +package ${package}.vo; + +import java.util.Date; +import java.math.BigDecimal; + +/** +* @Description:${table.tableComment}VO类 +* @Author:${author} +* @CreateTime:${.now?string('yyyy-MM-dd HH:mm:ss')} +* @version v1.0 +*/ +public class ${table.humpClassName}VO{ + +<#list columns as column> + /** ${column.columnComment} **/ + private ${column.columnTypeName} ${column.columnFieldName}; + + +<#list columns as column> + /** + * 描述：${column.columnComment} + */ + public ${column.columnTypeName} get${column.columnUperName}() { + return ${column.columnFieldName}; + } + /** + * 描述：${column.columnComment} + */ + public void set${column.columnUperName}(${column.columnTypeName} ${column.columnFieldName}) { + this.${column.columnFieldName} = ${column.columnFieldName}; + } + +} \ No newline at end of file diff --git a/codemaker-parent/codemaker-core/src/test/java/ClassLoaderTest.java b/codemaker-parent/codemaker-core/src/test/java/ClassLoaderTest.java new file mode 100644 index 0000000000000000000000000000000000000000..ba2de1e79df240795372b20f3076325a9fa8083c --- /dev/null +++ b/codemaker-parent/codemaker-core/src/test/java/ClassLoaderTest.java @@ -0,0 +1,68 @@ +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.InputStream; +import java.lang.reflect.Method; + +/** + * Description: + * date: 2021/11/22 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +public class ClassLoaderTest extends ClassLoader { + + private final static String filePathSuffix = ".class"; + private String filePathPrefix; + + public ClassLoaderTest(String filePathPrefix) { + this.filePathPrefix = filePathPrefix; + } + + @Override + protected Class findClass(String name) { + String fileName = name.split("\\.")[name.split("\\.").length - 1]; + byte[] bytes = loadClassData(filePathPrefix + fileName + filePathSuffix); + return defineClass(name, bytes, 0, bytes.length); + } + + private byte[] loadClassData(String filePath) { + InputStream in = null; + ByteArrayOutputStream out = null; + try { + in = new FileInputStream(new File(filePath)); + out = new ByteArrayOutputStream(); + int i = 0; + while ((i = in.read()) != -1) { + out.write(i); + } + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + out.close(); + in.close(); + } catch (Exception e) { + e.printStackTrace(); + } + } + return out.toByteArray(); + } + + public static void main(String[] args) throws Exception { + + ClassLoaderTest clt = new ClassLoaderTest("D:/"); + Class c = clt.loadClass("com.Hello"); + System.out.println(c.getClassLoader()); + System.out.println(c.getClassLoader().getParent()); + System.out.println(c.getClassLoader().getParent().getParent()); + System.out.println(c.getClassLoader().getParent().getParent().getParent()); + Method sayHi = c.getMethod("sayHi", String.class); + // 无参实例化 + Object o = c.newInstance(); + // 调用方法 + sayHi.invoke(o, "zhangsan"); + } +} diff --git a/codemaker-parent/codemaker-core/src/test/java/ClassLoaderTest2.java b/codemaker-parent/codemaker-core/src/test/java/ClassLoaderTest2.java new file mode 100644 index 0000000000000000000000000000000000000000..f9d05eb2644b7643745ecbc4982d522480c88362 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/test/java/ClassLoaderTest2.java @@ -0,0 +1,31 @@ +import java.io.File; +import java.lang.reflect.InvocationTargetException; +import java.net.MalformedURLException; +import java.net.URLClassLoader; + +/** + * Description: + * date: 2021/12/22 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +public class ClassLoaderTest2 { + public static void main(String[] args) + throws IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, + SecurityException, ClassNotFoundException, InstantiationException, MalformedURLException { +// String path = +// "/xx/.m2/repository/org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar"; + String path = "commons-lang3-3.1.jar";//jar文件需放在工程目录下 + + + Class aClass = Class.forName("org.apache.commons.lang3.StringUtils"); + Object instance = aClass.newInstance(); + Object strip = aClass.getDeclaredMethod("strip", String.class, String.class).invoke(instance, + "[1,2,3,4,5,6,2,3,5,1]", "[]"); + System.out.println(strip); + + } + +} diff --git a/codemaker-parent/codemaker-core/src/test/java/ClassUtils.java b/codemaker-parent/codemaker-core/src/test/java/ClassUtils.java new file mode 100644 index 0000000000000000000000000000000000000000..7a95e91343df4397989253b268fa071d88e40ce8 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/test/java/ClassUtils.java @@ -0,0 +1,307 @@ +import javassist.ClassPool; +import javassist.CtClass; +import javassist.CtMethod; +import javassist.NotFoundException; +import javassist.bytecode.CodeAttribute; +import javassist.bytecode.LocalVariableAttribute; +import javassist.bytecode.MethodInfo; +import org.apache.commons.lang3.StringUtils; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.net.JarURLConnection; +import java.net.URISyntaxException; +import java.net.URL; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.*; +import java.util.jar.JarEntry; +import java.util.jar.JarFile; +import java.util.stream.Stream; + +/** + * Created 2018-10-16. + * + * @author: fanchunshuai + * @version: V1.0 + * @Desc: class加载工具类 + */ +public class ClassUtils { + /** jar中的文件路径分隔符 */ + private static final char SLASH_CHAR = '/'; + /** 包名分隔符 */ + private static final char DOT_CHAR = '.'; + + /** + * 在当前项目中寻找指定包下的所有类 + * + * @param packageName 用'.'分隔的包名 + * @param recursive 是否递归搜索 + * @return 该包名下的所有类 + */ + public static List> getClass(String packageName, boolean recursive) { + List> classList = new ArrayList<>(); + try { + //获取当前线程的类装载器中相应包名对应的资源 + Enumeration iterator = Thread.currentThread().getContextClassLoader().getResources(packageName.replace(DOT_CHAR, File.separatorChar)); + while (iterator.hasMoreElements()) { + URL url = iterator.nextElement(); + String protocol = url.getProtocol(); + List> childClassList = Collections.emptyList(); + switch (protocol) { + case "file": + childClassList = getClassInFile(url, packageName, recursive); + break; + case "jar": + childClassList = getClassInJar(url, packageName, recursive); + break; + default: + //在某些WEB服务器中运行WAR包时，它不会像TOMCAT一样将WAR包解压为目录的，如JBOSS7，它是使用了一种叫VFS的协议 + System.out.println("unknown protocol " + protocol); + break; + } + classList.addAll(childClassList); + } + return classList; + } catch (IOException e) { + e.printStackTrace(); + } + return Collections.emptyList(); + } + + /** + * 在给定的文件或文件夹中寻找指定包下的所有类 + * + * @param filePath 包的路径 + * @param packageName 用'.'分隔的包名 + * @param recursive 是否递归搜索 + * @return 该包名下的所有类 + */ + public static List> getClassInFile(String filePath, String packageName, boolean recursive) { + Path path = Paths.get(filePath); + return getClassInFile(path, packageName, recursive); + } + + /** + * 在给定的文件或文件夹中寻找指定包下的所有类 + * + * @param url 包的统一资源定位符 + * @param packageName 用'.'分隔的包名 + * @param recursive 是否递归搜索 + * @return 该包名下的所有类 + */ + public static List> getClassInFile(URL url, String packageName, boolean recursive) { + try { + Path path = Paths.get(url.toURI()); + return getClassInFile(path, packageName, recursive); + } catch (URISyntaxException e) { + e.printStackTrace(); + } + return Collections.emptyList(); + } + + /** + * 在给定的文件或文件夹中寻找指定包下的所有类 + * + * @param path 包的路径 + * @param packageName 用'.'分隔的包名 + * @param recursive 是否递归搜索 + * @return 该包名下的所有类 + */ + public static List> getClassInFile(Path path, String packageName, boolean recursive) { + if (!Files.exists(path)) { + return Collections.emptyList(); + } + List> classList = new ArrayList>(); + if (Files.isDirectory(path)) { + if (!recursive) { + return Collections.emptyList(); + } + try { + //获取目录下的所有文件 + Stream stream = Files.list(path); + Iterator iterator = stream.iterator(); + while (iterator.hasNext()) { + classList.addAll(getClassInFile(iterator.next(), packageName, recursive)); + } + } catch (IOException e) { + e.printStackTrace(); + } + } else { + try { + //由于传入的文件可能是相对路径, 这里要拿到文件的实际路径, 如果不存在则报IOException + path = path.toRealPath(); + String pathStr = path.toString(); + //这里拿到的一般的"aa:\bb\...\cc.class"格式的文件名, 要去除末尾的类型后缀(.class) + int lastDotIndex = pathStr.lastIndexOf(DOT_CHAR); + //Class.forName只允许使用用'.'分隔的类名的形式 + String className = pathStr.replace(File.separatorChar, DOT_CHAR); + //获取包名的起始位置 + int beginIndex = className.indexOf(packageName); + if (beginIndex == -1) { + return Collections.emptyList(); + } + className = lastDotIndex == -1 ? className.substring(beginIndex) : className.substring(beginIndex, lastDotIndex); + classList.add(Class.forName(className)); + } catch (IOException e) { + e.printStackTrace(); + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } + } + return classList; + } + + /** + * 在给定的jar包中寻找指定包下的所有类 + * + * @param filePath 包的路径 + * @param packageName 用'.'分隔的包名 + * @param recursive 是否递归搜索 + * @return 该包名下的所有类 + */ + public static List> getClassInJar(String filePath, String packageName, boolean recursive) { + try { + JarFile jar = new JarFile(filePath); + return getClassInJar(jar, packageName, recursive); + } catch (IOException e) { + e.printStackTrace(); + } + return Collections.emptyList(); + } + + /** + * 在给定的jar包中寻找指定包下的所有类 + * + * @param url jar包的统一资源定位符 + * @param packageName 用'.'分隔的包名 + * @param recursive 是否递归搜索 + * @return 该包名下的所有类 + */ + public static List> getClassInJar(URL url, String packageName, boolean recursive) { + try { + JarFile jar = ((JarURLConnection) url.openConnection()).getJarFile(); + return getClassInJar(jar, packageName, recursive); + } catch (IOException e) { + e.printStackTrace(); + } + return Collections.emptyList(); + } + + /** + * 在给定的jar包中寻找指定包下的所有类 + * + * @param jar jar对象 + * @param packageName 用'.'分隔的包名 + * @param recursive 是否递归搜索 + * @return 该包名下的所有类 + */ + public static List> getClassInJar(JarFile jar, String packageName, boolean recursive) { + List> classList = new ArrayList<>(); + //该迭代器会递归得到该jar底下所有的目录和文件 + Enumeration iterator = jar.entries(); + while (iterator.hasMoreElements()) { + //这里拿到的一般的"aa/bb/.../cc.class"格式的Entry或 "包路径" + JarEntry jarEntry = iterator.nextElement(); + if (!jarEntry.isDirectory()) { + String name = jarEntry.getName(); + //对于拿到的文件,要去除末尾的.class + int lastDotClassIndex = name.lastIndexOf(".class"); + if(lastDotClassIndex != -1) { + int lastSlashIndex = name.lastIndexOf(SLASH_CHAR); + name = name.replace(SLASH_CHAR, DOT_CHAR); + if(name.startsWith(packageName)) { + if(recursive || packageName.length() == lastSlashIndex) { + String className = name.substring(0, lastDotClassIndex); + try { + classList.add(Class.forName(className)); + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } + } + } + } + } + } + return classList; + } + + + public static Map getParameterNames(Class clazz){ + Map paramMap = new HashMap<>(); + try { + ClassPool pool = ClassPool.getDefault(); + CtClass cc = pool.get(clazz.getName()); + + Method [] methods = clazz.getDeclaredMethods(); + for (Method method : methods){ + + CtMethod cm = cc.getDeclaredMethod(method.getName()); + // 使用javaassist的反射方法获取方法的参数名 + MethodInfo methodInfo = cm.getMethodInfo(); + if(methodInfo.getName().contains("lambda") && methodInfo.getName().contains("$")){ + continue; + } + + + CodeAttribute codeAttribute = methodInfo.getCodeAttribute(); + LocalVariableAttribute attr = (LocalVariableAttribute) codeAttribute.getAttribute(LocalVariableAttribute.tag); + if (attr == null) { + paramMap.put(method.getName(),""); + } + String[] paramNames = new String[cm.getParameterTypes().length]; + int paramLength; + if(paramNames.length > 10){ + paramLength = 10; + }else { + paramLength = paramNames.length; + } + + int pos = Modifier.isStatic(cm.getModifiers()) ? 0 : 1; + for (int i = 0; i < paramLength; i++) { + paramNames[i] = attr.variableName(i + pos); + } + + paramMap.put(method.getName(), StringUtils.join(paramNames,",")); + } + } catch (NotFoundException e) { + e.printStackTrace(); + } + + return paramMap; + } + /** + * 读取class + * + * @param classFilePath + * @return + */ + public static byte[] readClassBytes(String classFilePath) { + byte[] raw = null; + InputStream stream = null; + try { + File file = new File(classFilePath); + stream = new FileInputStream(file); + raw = new byte[(int) file.length()]; + stream.read(raw); + } catch (Exception e) { + + } finally { + try { + stream.close(); + } catch (Exception e) { + } + } + return raw; + } + + public static void main(String[] args) { + + } + +} diff --git a/codemaker-core/src/test/java/DAOTest.java b/codemaker-parent/codemaker-core/src/test/java/DAOTest.java similarity index 100% rename from codemaker-core/src/test/java/DAOTest.java rename to codemaker-parent/codemaker-core/src/test/java/DAOTest.java diff --git a/codemaker-core/src/test/java/ProjectTemplateConfigTest.java b/codemaker-parent/codemaker-core/src/test/java/ProjectTemplateConfigTest.java similarity index 100% rename from codemaker-core/src/test/java/ProjectTemplateConfigTest.java rename to codemaker-parent/codemaker-core/src/test/java/ProjectTemplateConfigTest.java diff --git a/codemaker-parent/codemaker-core/src/test/java/RbcClassLoader.java b/codemaker-parent/codemaker-core/src/test/java/RbcClassLoader.java new file mode 100644 index 0000000000000000000000000000000000000000..a0e97f428276ca23bb1abfb563c6105a4872a844 --- /dev/null +++ b/codemaker-parent/codemaker-core/src/test/java/RbcClassLoader.java @@ -0,0 +1,49 @@ + + +import java.io.IOException; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLClassLoader; + +/** + * Description: + * date: 2021/11/22 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +public class RbcClassLoader extends URLClassLoader { + public RbcClassLoader(final String path, final ClassLoader parent) throws MalformedURLException { + super(new URL[]{ new URL(path) }, parent); + } + + public static void main(String[] args) throws IOException, ClassNotFoundException { + String path = "jar:file:///Users/dasouche/.m2/repository/com/souche/trade/api/7.0.0-SNAPSHOT/api-7.0.0-SNAPSHOT.jar!/"; + RbcClassLoader myClassLoader = new RbcClassLoader(path, Thread.currentThread().getContextClassLoader().getParent()); + Thread.currentThread().setContextClassLoader(myClassLoader); + + Class clazz = Thread.currentThread() + .getContextClassLoader() + .loadClass("com.souche.trade.api.fullorder.TradeFullOrderFacade"); + System.out.println(clazz.getName()); + for (Method method : clazz.getMethods()){ + System.out.println(method.getName()); + method.getParameterTypes(); + for (Class paramType : method.getParameterTypes()){ + System.out.println( paramType.getName()); + } + } + + Class dtoClass = Thread.currentThread() + .getContextClassLoader() + .loadClass("com.souche.trade.api.fullorder.req.CreateMainOrderRequestDTO"); + System.out.println(dtoClass.getName()); + for (Field field : dtoClass.getDeclaredFields()){ + System.out.println(field.getName()); + } + } + +} diff --git a/codemaker-parent/codemaker-core/src/test/java/Test.java b/codemaker-parent/codemaker-core/src/test/java/Test.java new file mode 100644 index 0000000000000000000000000000000000000000..60257b4f1ad52a7fd0475d92c7515816942980db --- /dev/null +++ b/codemaker-parent/codemaker-core/src/test/java/Test.java @@ -0,0 +1,13 @@ +/** + * Description: + * date: 2021/11/22 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +public class Test { + public static void main(String[] args) { + + } +} diff --git a/codemaker-parent/codemaker-core/src/test/java/Test2.java b/codemaker-parent/codemaker-core/src/test/java/Test2.java new file mode 100644 index 0000000000000000000000000000000000000000..0c4fbc491850ca5c5326e7a93948114a0d5f934e --- /dev/null +++ b/codemaker-parent/codemaker-core/src/test/java/Test2.java @@ -0,0 +1,74 @@ +import com.coderman.codemaker.bean.ClassContentBean; +import com.coderman.codemaker.bean.plantuml.ClassBean; + +import java.lang.reflect.Method; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.util.Map; +import java.lang.reflect.*; + +import java.util.*; + +/** + * Description: + * date: 2021/12/18 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +public class Test2 { + public static void main(String[] args) throws NoSuchMethodException, SecurityException { + // 获取指定方法的返回值泛型信息 + System.out.println("----------test02获取返回值类型-------------"); + Method method = Test2.class.getMethod("test04", null);// 根据方法名和参数获取test02方法 + Type type = method.getGenericReturnType();// 获取返回值类型 + if (type instanceof ParameterizedType) { // 判断获取的类型是否是参数类型 + System.out.println(type.getTypeName()); + Type[] typesto = ((ParameterizedType) type).getActualTypeArguments();// 强制转型为带参数的泛型类型， + // getActualTypeArguments()方法获取类型中的实际类型，如map中的 + // String，integer因为可能是多个，所以使用数组 + for (Type type2 : typesto) { + System.out.println("泛型类型" + type2); + } + } + System.out.println("-------------------------1111-----------------------------"); + // 获取指定方法的参数泛型信息 + System.out.println("----------获取指定方法的参数泛型信息-------------"); + Method methodtwo = Test2.class.getMethod("test01", Map.class, List.class); + Type[] types = methodtwo.getGenericParameterTypes();// 获取参数，可能是多个，所以是数组 + for (Type type2 : types) { + System.out.println("====22222====="+type2.getTypeName()); + if (type2 instanceof ParameterizedType)// 判断获取的类型是否是参数类型 + { + System.out.println(type); + Type[] typetwos = ((ParameterizedType) type2).getActualTypeArguments();// 强制转型为带参数的泛型类型， + // getActualTypeArguments()方法获取类型中的实际类型，如map中的 + // String，integer因为可能是多个，所以使用数组 + for (Type type3 : typetwos) { + System.out.println("参数类型========" + type3); + } + + } + } + } + + // 带参数的方法Test01 + public static void test01(Map map, List list) { + } + + // 带返回值的方法Test02 + public static Map test02() { + return null; + } + + // 带返回值的方法Test02 + public static List test03() { + return null; + } + + public static void test04() { + + } + +} diff --git a/codemaker-parent/codemaker-core/src/test/java/Test3.java b/codemaker-parent/codemaker-core/src/test/java/Test3.java new file mode 100644 index 0000000000000000000000000000000000000000..d3b27a55a39678525f54b9ccd46498eeda9a4c7b --- /dev/null +++ b/codemaker-parent/codemaker-core/src/test/java/Test3.java @@ -0,0 +1,41 @@ +import com.coderman.codemaker.bean.ClassContentBean; +import com.coderman.codemaker.bean.plantuml.ClassBean; + +import java.lang.reflect.Method; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.regex.Pattern; + +/** + * Description: + * date: 2021/12/18 + * + * @author fanchunshuai + * @version 1.0.0 + * @since JDK 1.8 + */ +public class Test3 { + public static void main(String[] args) throws NoSuchMethodException, SecurityException { + String paramStr = "java.util.List"; + String [] paramArr = paramStr.split("\\."); + List paramList = new ArrayList<>(); + + String pattern = "^[A-Z].*?"; + + for (String param : paramArr){ + boolean match = Pattern.matches(pattern, param); + if(match){ + paramList.add(param); + } + } + + if(paramList.size() == 1){ + System.out.println(paramList.get(0)); + } + + + } +} diff --git a/codemaker-core/src/test/java/TestTableName.java b/codemaker-parent/codemaker-core/src/test/java/TestTableName.java similarity index 100% rename from codemaker-core/src/test/java/TestTableName.java rename to codemaker-parent/codemaker-core/src/test/java/TestTableName.java diff --git a/codemaker-core/src/test/resources/application.properties b/codemaker-parent/codemaker-core/src/test/resources/application.properties similarity index 100% rename from codemaker-core/src/test/resources/application.properties rename to codemaker-parent/codemaker-core/src/test/resources/application.properties diff --git a/codemaker-core/src/test/resources/log4j.properties b/codemaker-parent/codemaker-core/src/test/resources/log4j.properties similarity index 100% rename from codemaker-core/src/test/resources/log4j.properties rename to codemaker-parent/codemaker-core/src/test/resources/log4j.properties diff --git a/codemaker-core/src/test/resources/mapper/sqlMapper.xml b/codemaker-parent/codemaker-core/src/test/resources/mapper/sqlMapper.xml similarity index 100% rename from codemaker-core/src/test/resources/mapper/sqlMapper.xml rename to codemaker-parent/codemaker-core/src/test/resources/mapper/sqlMapper.xml diff --git a/codemaker-core/src/test/resources/mybatis-config.xml b/codemaker-parent/codemaker-core/src/test/resources/mybatis-config.xml similarity index 100% rename from codemaker-core/src/test/resources/mybatis-config.xml rename to codemaker-parent/codemaker-core/src/test/resources/mybatis-config.xml diff --git a/codemaker-parent/pom.xml b/codemaker-parent/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..92b08a38772216226b528b10827ef5495189494a --- /dev/null +++ b/codemaker-parent/pom.xml @@ -0,0 +1,43 @@ + + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.3.1.RELEASE + + + pom + com.coderman.codemaker + codemaker-parent + 1.2.2-SNAPSHOT + + codemaker-parent + + http://www.example.com + + + codemaker-apiImpl + codemaker-api + codemaker-core + + + UTF-8 + 1.7 + 1.7 + + + + + junit + junit + 4.11 + test + + + + + + diff --git a/codemaker-springboot/.gitignore b/codemaker-springboot/.gitignore deleted file mode 100644 index a2a3040aa86debfd8826d9c2b5c816314c17d9fe..0000000000000000000000000000000000000000 --- a/codemaker-springboot/.gitignore +++ /dev/null @@ -1,31 +0,0 @@ -HELP.md -target/ -!.mvn/wrapper/maven-wrapper.jar -!**/src/main/** -!**/src/test/** - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ -build/ - -### VS Code ### -.vscode/ diff --git a/codemaker-springboot/.mvn/wrapper/MavenWrapperDownloader.java b/codemaker-springboot/.mvn/wrapper/MavenWrapperDownloader.java deleted file mode 100644 index a45eb6ba269cd38f8965cef786729790945d9537..0000000000000000000000000000000000000000 --- a/codemaker-springboot/.mvn/wrapper/MavenWrapperDownloader.java +++ /dev/null @@ -1,118 +0,0 @@ -/* - * Copyright 2007-present the original author or authors. - * - * 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 - * - * https://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. - */ - -import java.net.*; -import java.io.*; -import java.nio.channels.*; -import java.util.Properties; - -public class MavenWrapperDownloader { - - private static final String WRAPPER_VERSION = "0.5.6"; - /** - * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. - */ - private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" - + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; - - /** - * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to - * use instead of the default one. - */ - private static final String MAVEN_WRAPPER_PROPERTIES_PATH = - ".mvn/wrapper/maven-wrapper.properties"; - - /** - * Path where the maven-wrapper.jar will be saved to. - */ - private static final String MAVEN_WRAPPER_JAR_PATH = - ".mvn/wrapper/maven-wrapper.jar"; - - /** - * Name of the property which should be used to override the default download url for the wrapper. - */ - private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; - - public static void main(String args[]) { - System.out.println("- Downloader started"); - File baseDirectory = new File(args[0]); - System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); - - // If the maven-wrapper.properties exists, read it and check if it contains a custom - // wrapperUrl parameter. - File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); - String url = DEFAULT_DOWNLOAD_URL; - if (mavenWrapperPropertyFile.exists()) { - FileInputStream mavenWrapperPropertyFileInputStream = null; - try { - mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); - Properties mavenWrapperProperties = new Properties(); - mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); - url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); - } catch (IOException e) { - System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); - } finally { - try { - if (mavenWrapperPropertyFileInputStream != null) { - mavenWrapperPropertyFileInputStream.close(); - } - } catch (IOException e) { - // Ignore ... - } - } - } - System.out.println("- Downloading from: " + url); - - File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); - if (!outputFile.getParentFile().exists()) { - if (!outputFile.getParentFile().mkdirs()) { - System.out.println( - "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); - } - } - System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); - try { - downloadFileFromURL(url, outputFile); - System.out.println("Done"); - System.exit(0); - } catch (Throwable e) { - System.out.println("- Error downloading"); - e.printStackTrace(); - System.exit(1); - } - } - - private static void downloadFileFromURL(String urlString, File destination) throws Exception { - if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { - String username = System.getenv("MVNW_USERNAME"); - char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); - Authenticator.setDefault(new Authenticator() { - @Override - protected PasswordAuthentication getPasswordAuthentication() { - return new PasswordAuthentication(username, password); - } - }); - } - URL website = new URL(urlString); - ReadableByteChannel rbc; - rbc = Channels.newChannel(website.openStream()); - FileOutputStream fos = new FileOutputStream(destination); - fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); - fos.close(); - rbc.close(); - } - -} diff --git a/codemaker-springboot/.mvn/wrapper/maven-wrapper.jar b/codemaker-springboot/.mvn/wrapper/maven-wrapper.jar deleted file mode 100644 index 2cc7d4a55c0cd0092912bf49ae38b3a9e3fd0054..0000000000000000000000000000000000000000 Binary files a/codemaker-springboot/.mvn/wrapper/maven-wrapper.jar and /dev/null differ diff --git a/codemaker-springboot/.mvn/wrapper/maven-wrapper.properties b/codemaker-springboot/.mvn/wrapper/maven-wrapper.properties deleted file mode 100644 index 642d572ce90e5085986bdd9c9204b9404f028084..0000000000000000000000000000000000000000 --- a/codemaker-springboot/.mvn/wrapper/maven-wrapper.properties +++ /dev/null @@ -1,2 +0,0 @@ -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/codemaker-springboot/mvnw b/codemaker-springboot/mvnw deleted file mode 100644 index a16b5431b4c3cab50323a3f558003fd0abd87dad..0000000000000000000000000000000000000000 --- a/codemaker-springboot/mvnw +++ /dev/null @@ -1,310 +0,0 @@ -#!/bin/sh -# ---------------------------------------------------------------------------- -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you 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 -# -# https://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. -# ---------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------- -# Maven Start Up Batch script -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir -# -# Optional ENV vars -# ----------------- -# M2_HOME - location of maven2's installed home dir -# MAVEN_OPTS - parameters passed to the Java VM when running Maven -# e.g. to debug Maven itself, use -# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -# MAVEN_SKIP_RC - flag to disable loading of mavenrc files -# ---------------------------------------------------------------------------- - -if [ -z "$MAVEN_SKIP_RC" ] ; then - - if [ -f /etc/mavenrc ] ; then - . /etc/mavenrc - fi - - if [ -f "$HOME/.mavenrc" ] ; then - . "$HOME/.mavenrc" - fi - -fi - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; -mingw=false -case "`uname`" in - CYGWIN*) cygwin=true ;; - MINGW*) mingw=true;; - Darwin*) darwin=true - # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home - # See https://developer.apple.com/library/mac/qa/qa1170/_index.html - if [ -z "$JAVA_HOME" ]; then - if [ -x "/usr/libexec/java_home" ]; then - export JAVA_HOME="`/usr/libexec/java_home`" - else - export JAVA_HOME="/Library/Java/Home" - fi - fi - ;; -esac - -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=`java-config --jre-home` - fi -fi - -if [ -z "$M2_HOME" ] ; then - ## resolve links - $0 may be a link to maven's home - PRG="$0" - - # need this for relative symlinks - while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG="`dirname "$PRG"`/$link" - fi - done - - saveddir=`pwd` - - M2_HOME=`dirname "$PRG"`/.. - - # make it fully qualified - M2_HOME=`cd "$M2_HOME" && pwd` - - cd "$saveddir" - # echo Using m2 at $M2_HOME -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --unix "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --unix "$CLASSPATH"` -fi - -# For Mingw, ensure paths are in UNIX format before anything is touched -if $mingw ; then - [ -n "$M2_HOME" ] && - M2_HOME="`(cd "$M2_HOME"; pwd)`" - [ -n "$JAVA_HOME" ] && - JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" -fi - -if [ -z "$JAVA_HOME" ]; then - javaExecutable="`which javac`" - if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then - # readlink(1) is not available as standard on Solaris 10. - readLink=`which readlink` - if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then - if $darwin ; then - javaHome="`dirname \"$javaExecutable\"`" - javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" - else - javaExecutable="`readlink -f \"$javaExecutable\"`" - fi - javaHome="`dirname \"$javaExecutable\"`" - javaHome=`expr "$javaHome" : '\(.*\)/bin'` - JAVA_HOME="$javaHome" - export JAVA_HOME - fi - fi -fi - -if [ -z "$JAVACMD" ] ; then - if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - else - JAVACMD="`which java`" - fi -fi - -if [ ! -x "$JAVACMD" ] ; then - echo "Error: JAVA_HOME is not defined correctly." >&2 - echo " We cannot execute $JAVACMD" >&2 - exit 1 -fi - -if [ -z "$JAVA_HOME" ] ; then - echo "Warning: JAVA_HOME environment variable is not set." -fi - -CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher - -# traverses directory structure from process work directory to filesystem root -# first directory with .mvn subdirectory is considered project base directory -find_maven_basedir() { - - if [ -z "$1" ] - then - echo "Path not specified to find_maven_basedir" - return 1 - fi - - basedir="$1" - wdir="$1" - while [ "$wdir" != '/' ] ; do - if [ -d "$wdir"/.mvn ] ; then - basedir=$wdir - break - fi - # workaround for JBEAP-8937 (on Solaris 10/Sparc) - if [ -d "${wdir}" ]; then - wdir=`cd "$wdir/.."; pwd` - fi - # end of workaround - done - echo "${basedir}" -} - -# concatenates all lines of a file -concat_lines() { - if [ -f "$1" ]; then - echo "$(tr -s '\n' ' ' < "$1")" - fi -} - -BASE_DIR=`find_maven_basedir "$(pwd)"` -if [ -z "$BASE_DIR" ]; then - exit 1; -fi - -########################################################################################## -# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -# This allows using the maven wrapper in projects that prohibit checking in binary data. -########################################################################################## -if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found .mvn/wrapper/maven-wrapper.jar" - fi -else - if [ "$MVNW_VERBOSE" = true ]; then - echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." - fi - if [ -n "$MVNW_REPOURL" ]; then - jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" - else - jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" - fi - while IFS="=" read key value; do - case "$key" in (wrapperUrl) jarUrl="$value"; break ;; - esac - done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" - if [ "$MVNW_VERBOSE" = true ]; then - echo "Downloading from: $jarUrl" - fi - wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" - if $cygwin; then - wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` - fi - - if command -v wget > /dev/null; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found wget ... using wget" - fi - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - wget "$jarUrl" -O "$wrapperJarPath" - else - wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" - fi - elif command -v curl > /dev/null; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found curl ... using curl" - fi - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - curl -o "$wrapperJarPath" "$jarUrl" -f - else - curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f - fi - - else - if [ "$MVNW_VERBOSE" = true ]; then - echo "Falling back to using Java to download" - fi - javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" - # For Cygwin, switch paths to Windows format before running javac - if $cygwin; then - javaClass=`cygpath --path --windows "$javaClass"` - fi - if [ -e "$javaClass" ]; then - if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then - if [ "$MVNW_VERBOSE" = true ]; then - echo " - Compiling MavenWrapperDownloader.java ..." - fi - # Compiling the Java class - ("$JAVA_HOME/bin/javac" "$javaClass") - fi - if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then - # Running the downloader - if [ "$MVNW_VERBOSE" = true ]; then - echo " - Running MavenWrapperDownloader.java ..." - fi - ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") - fi - fi - fi -fi -########################################################################################## -# End of extension -########################################################################################## - -export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} -if [ "$MVNW_VERBOSE" = true ]; then - echo $MAVEN_PROJECTBASEDIR -fi -MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --path --windows "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --windows "$CLASSPATH"` - [ -n "$MAVEN_PROJECTBASEDIR" ] && - MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` -fi - -# Provide a "standardized" way to retrieve the CLI args that will -# work with both Windows and non-Windows executions. -MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" -export MAVEN_CMD_LINE_ARGS - -WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -exec "$JAVACMD" \ - $MAVEN_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/codemaker-springboot/mvnw.cmd b/codemaker-springboot/mvnw.cmd deleted file mode 100644 index c8d43372c986d97911cdc21bd87e0cbe3d83bdda..0000000000000000000000000000000000000000 --- a/codemaker-springboot/mvnw.cmd +++ /dev/null @@ -1,182 +0,0 @@ -@REM ---------------------------------------------------------------------------- -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM https://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM ---------------------------------------------------------------------------- - -@REM ---------------------------------------------------------------------------- -@REM Maven Start Up Batch script -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir -@REM -@REM Optional ENV vars -@REM M2_HOME - location of maven2's installed home dir -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files -@REM ---------------------------------------------------------------------------- - -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@REM set title of command window -title %0 -@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' -@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% - -@REM set %HOME% to equivalent of $HOME -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") - -@REM Execute a user defined script before this one -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre -@REM check for pre script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" -if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" -:skipRcPre - -@setlocal - -set ERROR_CODE=0 - -@REM To isolate internal variables from possible post scripts, we use another setlocal -@setlocal - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. -echo Error: JAVA_HOME not found in your environment. >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto init - -echo. -echo Error: JAVA_HOME is set to an invalid directory. >&2 -echo JAVA_HOME = "%JAVA_HOME%" >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -@REM ==== END VALIDATION ==== - -:init - -@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". -@REM Fallback to current working directory if not found. - -set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% -IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir - -set EXEC_DIR=%CD% -set WDIR=%EXEC_DIR% -:findBaseDir -IF EXIST "%WDIR%"\.mvn goto baseDirFound -cd .. -IF "%WDIR%"=="%CD%" goto baseDirNotFound -set WDIR=%CD% -goto findBaseDir - -:baseDirFound -set MAVEN_PROJECTBASEDIR=%WDIR% -cd "%EXEC_DIR%" -goto endDetectBaseDir - -:baseDirNotFound -set MAVEN_PROJECTBASEDIR=%EXEC_DIR% -cd "%EXEC_DIR%" - -:endDetectBaseDir - -IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig - -@setlocal EnableExtensions EnableDelayedExpansion -for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a -@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% - -:endReadAdditionalConfig - -SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" -set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" -set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" - -FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B -) - -@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -@REM This allows using the maven wrapper in projects that prohibit checking in binary data. -if exist %WRAPPER_JAR% ( - if "%MVNW_VERBOSE%" == "true" ( - echo Found %WRAPPER_JAR% - ) -) else ( - if not "%MVNW_REPOURL%" == "" ( - SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" - ) - if "%MVNW_VERBOSE%" == "true" ( - echo Couldn't find %WRAPPER_JAR%, downloading it ... - echo Downloading from: %DOWNLOAD_URL% - ) - - powershell -Command "&{"^ - "$webclient = new-object System.Net.WebClient;"^ - "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ - "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ - "}"^ - "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ - "}" - if "%MVNW_VERBOSE%" == "true" ( - echo Finished downloading %WRAPPER_JAR% - ) -) -@REM End of extension - -@REM Provide a "standardized" way to retrieve the CLI args that will -@REM work with both Windows and non-Windows executions. -set MAVEN_CMD_LINE_ARGS=%* - -%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* -if ERRORLEVEL 1 goto error -goto end - -:error -set ERROR_CODE=1 - -:end -@endlocal & set ERROR_CODE=%ERROR_CODE% - -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost -@REM check for post script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" -if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" -:skipRcPost - -@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%" == "on" pause - -if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% - -exit /B %ERROR_CODE% diff --git a/codemaker-springboot/pom.xml b/codemaker-springboot/pom.xml index f96af0074b95dcc3ca41ad4a26d4074c0d1b40fa..c4afe9c247f4e6cdee9e50c28fc53d20ef15ccd2 100644 --- a/codemaker-springboot/pom.xml +++ b/codemaker-springboot/pom.xml @@ -1,214 +1,214 @@ - 4.0.0 - + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.1.9.RELEASE + + + com.coderman.codemaker + codemaker-springboot + 0.0.1-SNAPSHOT + codemaker-springboot + Demo project for Spring Boot + + + 1.8 + 1.2.0.Final + + + + + org.springframework.boot + spring-boot-starter + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-freemarker + + + + org.springframework.boot + spring-boot-configuration-processor + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + 1.3.2 + + + + junit + junit + 4.12 + test + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter-test + 1.3.2 + + + + commons-io + commons-io + 2.7 + + + + + com.google.guava + guava + 29.0-jre + + + + javax.servlet + javax.servlet-api + 4.0.1 + + + + + org.mybatis + mybatis + 3.4.1 + + + + com.alibaba + druid + 1.1.17 + + + + + + org.mybatis + mybatis-spring + 1.3.0 + + + + + com.alibaba + fastjson + 1.2.61 + + + + org.apache.commons + commons-collections4 + 4.3 + + + + mysql + mysql-connector-java + 8.0.11 + + + org.slf4j + slf4j-api + 1.7.30 + compile + + + + org.freemarker + freemarker-gae + 2.3.26-incubating + + + + cglib + cglib + 3.2.6 + + + + org.apache.commons + commons-lang3 + 3.10 + + + org.springframework + spring-test + test + + + org.springframework.boot + spring-boot-test + test + + + org.springframework.boot + spring-boot-test + test + + + + com.coderman.utils + coderman-utils + 1.0.4-SNAPSHOT + + + org.projectlombok + lombok + + + + org.mapstruct + mapstruct + ${mapstruct.version} + + + org.mapstruct + mapstruct-processor + ${mapstruct.version} + + + org.mapstruct + mapstruct-jdk8 + ${mapstruct.version} + + + + + + + aliyun-releases + 阿里云仓库 + https://maven.aliyun.com/repository/public + + + apache.snapshots.https + Apache Development Snapshot Repository + https://repository.apache.org/content/repositories/snapshots + + false + + + true + + + + + + org.springframework.boot - spring-boot-starter-parent - 2.1.9.RELEASE - - - com.coderman.codemaker - codemaker-springboot - 0.0.1-SNAPSHOT - codemaker-springboot - Demo project for Spring Boot - - - 1.8 - 1.2.0.Final - - - - - org.springframework.boot - spring-boot-starter - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-freemarker - - - - org.springframework.boot - spring-boot-configuration-processor - - - - org.mybatis.spring.boot - mybatis-spring-boot-starter - 1.3.2 - - - - junit - junit - 4.12 - test - - - - org.mybatis.spring.boot - mybatis-spring-boot-starter-test - 1.3.2 - - - - commons-io - commons-io - 2.7 - - - - - com.google.guava - guava - 29.0-jre - - - - javax.servlet - javax.servlet-api - 4.0.1 - - - - - org.mybatis - mybatis - 3.4.1 - - - - com.alibaba - druid - 1.1.17 - - - - - - org.mybatis - mybatis-spring - 1.3.0 - - - - - com.alibaba - fastjson - 1.2.61 - - - - org.apache.commons - commons-collections4 - 4.3 - - - - mysql - mysql-connector-java - 8.0.11 - - - org.slf4j - slf4j-api - 1.7.30 - compile - - - - org.freemarker - freemarker-gae - 2.3.26-incubating - - - - cglib - cglib - 3.2.6 - - - - org.apache.commons - commons-lang3 - 3.10 - - - org.springframework - spring-test - test - - - org.springframework.boot - spring-boot-test - test - - - org.springframework.boot - spring-boot-test - test - - - - com.coderman.utils - coderman-utils - 1.0.4-SNAPSHOT - - - org.projectlombok - lombok - - - - org.mapstruct - mapstruct - ${mapstruct.version} - - - org.mapstruct - mapstruct-processor - ${mapstruct.version} - - - org.mapstruct - mapstruct-jdk8 - ${mapstruct.version} - - - - - - - aliyun-releases - 阿里云仓库 - https://maven.aliyun.com/repository/public - - - apache.snapshots.https - Apache Development Snapshot Repository - https://repository.apache.org/content/repositories/snapshots - - false - - - true - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - + spring-boot-maven-plugin + + + 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 deleted file mode 100644 index 08da03d25b56390d85f5b9f38bcce5bf083d0a2f..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/AuthorityOperationController.java +++ /dev/null @@ -1,36 +0,0 @@ -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 deleted file mode 100644 index caa3c18220cb047a0ba610949073963a25c2e0ba..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/AuthorityQueryController.java +++ /dev/null @@ -1,48 +0,0 @@ -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 deleted file mode 100644 index 70a80533e93f4c7300e3fec58345e5d2ab5bcbbd..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/DataAuthorityController.java +++ /dev/null @@ -1,36 +0,0 @@ -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 deleted file mode 100644 index a17b727cc7f40229d32642c168b0315500805b3e..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/DataColumnController.java +++ /dev/null @@ -1,63 +0,0 @@ -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 deleted file mode 100644 index 0814643bcb3ca272d18ea2beb37d40a77f3660b3..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/MenuController.java +++ /dev/null @@ -1,84 +0,0 @@ -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 deleted file mode 100644 index 253abf1d7124654d8877bc38edd68674eb8a1a61..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/ModuleController.java +++ /dev/null @@ -1,127 +0,0 @@ -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 deleted file mode 100644 index 9ad42e1cd85b66c57d69bfeae61d2653eadad466..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/RoleController.java +++ /dev/null @@ -1,73 +0,0 @@ -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 deleted file mode 100644 index f904c00aac64215da4eb6503e6c5dfa0eef82067..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/RoleGroupController.java +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index a02de769f69ca61fa30441d9ed4fed4efc06738f..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/RoleQueryController.java +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index b7bf8952e90e92133f073250e23fcd5341405f3e..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/SystemAuthorityController.java +++ /dev/null @@ -1,49 +0,0 @@ -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 deleted file mode 100644 index 84a694fd4d0d8f85af1f179aa6b40617fe1df408..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/SystemController.java +++ /dev/null @@ -1,107 +0,0 @@ -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 deleted file mode 100644 index 943f3374ffb67d8ced68d11f516ae61be6f71a1b..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/UserGroupController.java +++ /dev/null @@ -1,36 +0,0 @@ -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 deleted file mode 100644 index a0d79372ad6656145ef5c0488ab8d410a084b40d..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/controller/UserGroupQueryController.java +++ /dev/null @@ -1,36 +0,0 @@ -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 deleted file mode 100644 index 432c41922861648e4a6073948cfe5500b3e79c60..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/AuthorityVO.java +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index 8e4ea0d17a62dd046dba6226eba22911e4363e2c..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/CreateMenuRequestVO.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index 78d5aa8d8c697b72b25ab542a41a3acae2360a00..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/CreateModuleRequestVO.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index e0939b2cc43e6c9017e1a18b0a86e29c6e7b7b2a..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/CreateRoleRequestVO.java +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index 3ef0aa4bf0f435260a5e13da8c4025cfbf7260d5..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/CreateSystemRequestVO.java +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index 5db48de00dd34fd4e61ad06a95cc94dc3120910c..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/DataAuthorityResponseVO.java +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index 60545a50a25b9bcc4a2952c645e8e72e651ee213..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/DataColumnResponseVO.java +++ /dev/null @@ -1,35 +0,0 @@ -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 deleted file mode 100644 index 24b62c9b858cb3163d077e09ac6fa7769e48f3d3..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/DataColumnVO.java +++ /dev/null @@ -1,35 +0,0 @@ -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 deleted file mode 100644 index 9d90bde6f381d7e8d506490935d43a3119282711..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/MenuVO.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index 5dc379147d0e245aea23bf0d8f7236d057f942f8..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/ModuleVO.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index 011caac96c7ce12c49deb33da956015b417445e6..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/RoleGroupVO.java +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index 6f45f6d69700046fdf7e11f8b93d57a497045578..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/RoleVO.java +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index 5ba37826e49c999951f56daa448ee32f234d9d51..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/SystemAuthorityVO.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index 87bed3a27a5e67bc59e2b8ed8a55c43417d6855e..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/SystemVO.java +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index e264836cacd73cbe20f329c9240c7ac234cb21d2..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/UpdateMenuRequestVO.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index 0fa42b6cf011a262ebbfe97531b9039b7f3ff657..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/UpdateModuleRequestVO.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index a69dc783b4f132b95f398dd0ba38e1cc3b1b8c86..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/UpdateSystemRequestVO.java +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index ad571b4919cdc0edfeeca887832081cad25f02fa..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/adapter/vo/UserGroupVO.java +++ /dev/null @@ -1,33 +0,0 @@ -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 deleted file mode 100644 index 5f42f26b14ec5eaa63db1c624bf1f17376c4986b..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/AuthorityResponseDTO.java +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index dfd047404e18e595bcb3bd77ef5931df3983f81c..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/CreateAuthorityRequestDTO.java +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index 20ae27f4cd571f9ec399e70843bebc25f7753bf1..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/CreateDataAuthorityRequestDTO.java +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index 6e4703e54e0f13403991c1f672a73161d1f14a4f..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/CreateMenuRequestDTO.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index 107ff1aa4b27da6c0069564f9bf6db3224d185cb..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/CreateModuleRequestDTO.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index 51da7ebd3cea44663281c7200d7d4075c1e300cc..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/CreateRoleRequestDTO.java +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index 1b9db9000d195b1426c437da35c39f5419aa2c56..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/CreateSystemAuthorityRequestDTO.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index 4721381e1c1309330e78cc840900faebf4904ff4..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/CreateSystemRequestDTO.java +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index cd6da28d7ccf1fba4ffccceb023c8d485882094a..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/CreateUserGroupRequestDTO.java +++ /dev/null @@ -1,33 +0,0 @@ -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 deleted file mode 100644 index 8fd45db577e35c1a927366939a6082b7d81a50a6..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/DataAuthorityResponseDTO.java +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index 852cf64fb6e1aafa7c8857a4cf4e934671beed82..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/MenuResponseDTO.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index 666a9216fd9683746d659d245d9045da83ac74b1..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/ModuleResponseDTO.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index a362eb3387b75e28d0da3dd1893bbf519d51d13c..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/RoleGroupResponseDTO.java +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index be0990ac6d6daf50640b32d145490df4ad79b127..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/RoleResponseDTO.java +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index 627d7da433686f5ccdf4c66d999e93e95f9a7426..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/SystemAuthorityResponseDTO.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index 24f2da86de31124972c290fe0775f267a3620a26..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/SystemDTO.java +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index c282835c7c9beaeeee4eadbb3257d3877ffcd8d3..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/UpdateAuthorityRequestDTO.java +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index 8115724ace14757f8e28a2e2de86d66ed4214131..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/UpdateDataAuthorityRequestDTO.java +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index 50b1358dabba13841fc7cae481e11f94946a50f2..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/UpdateMenuRequestDTO.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index c656588e42af80ab70f397bbf6f40cb41eda64e9..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/UpdateModuleRequestDTO.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index 22d9c2c993425170f553d0675c7537207f2d315d..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/UpdateRoleGroupRequestDTO.java +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index 19fb60f9ae22e7c31dcdc7172e8f7b4ced2dc6a9..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/UpdateRoleRequestDTO.java +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index 4a9aee0358fcb4dc56cec4d08e5647bff3fe806c..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/UpdateSystemAuthorityRequestDTO.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index a0ae6cfec2bc04b2bfcc6ec593f2e80162718d55..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/UpdateSystemRequestDTO.java +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index 637069b8bf9f85ecc1daa2b0f4be08d3ebbf5ed3..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/UpdateUserGroupRequestDTO.java +++ /dev/null @@ -1,33 +0,0 @@ -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 deleted file mode 100644 index e519936dd5c31c6c33347f7a34e776b7b4e38f8f..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/dto/UserGroupResponseDTO.java +++ /dev/null @@ -1,33 +0,0 @@ -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 deleted file mode 100644 index f06dce65a279638b631106f2436ec07f69f35cae..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/api/enums/AuthorityTypeEnum.java +++ /dev/null @@ -1,45 +0,0 @@ -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 deleted file mode 100644 index 7f245dc71122201d1330d06937bb025e4cf805ae..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/command/AbstractCmd.java +++ /dev/null @@ -1,40 +0,0 @@ -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 deleted file mode 100644 index 0f853f5f0a06132f3965af824b9f24f09d5637c2..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/command/AddRoleAuthCmd.java +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index ea0e9020e39143a6daea4a139feb9a005358bafc..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/command/AddUserAuthCmd.java +++ /dev/null @@ -1,39 +0,0 @@ -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 deleted file mode 100644 index 146f1e5952076670fdc36d8cb2485b455080a252..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/command/AddUserCmd.java +++ /dev/null @@ -1,34 +0,0 @@ -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 deleted file mode 100644 index 3dd38593a803bb45da7345cf70c8041fb1b501f6..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/command/AddUserGroupCmd.java +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index 67b9a18813963c97ab738f86c9d2262e8042a1e4..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/command/UpdateRoleAuthCmd.java +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index 4facd9f38d27b2d82c3d05d7258ed0888e7e504c..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/command/UpdateUserAuthCmd.java +++ /dev/null @@ -1,34 +0,0 @@ -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 deleted file mode 100644 index f3b68efe8bcafff73689b24267f94b0ab9dd1ea0..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/convert/AuthorityConvert.java +++ /dev/null @@ -1,60 +0,0 @@ -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 deleted file mode 100644 index f4abe7c44e57f8457ad994dad6e26c68d31d23e4..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/convert/DataAuthorityConvert.java +++ /dev/null @@ -1,61 +0,0 @@ -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 deleted file mode 100644 index 3acc017b7365d3f4a804e0880a6a65f0a3a1540d..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/convert/MenuConvert.java +++ /dev/null @@ -1,60 +0,0 @@ -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 deleted file mode 100644 index 1d6d2ea5e0369d4d75f100b49a1260c1453f4b2c..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/convert/ModuleConvert.java +++ /dev/null @@ -1,60 +0,0 @@ -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 deleted file mode 100644 index ded3a635ea50e89d1591a0261cc4cccd08862cb2..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/convert/RoleConvert.java +++ /dev/null @@ -1,60 +0,0 @@ -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 deleted file mode 100644 index 520d2a88e418afec3ab891536cebc86c998b0a5c..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/convert/RoleGroupConvert.java +++ /dev/null @@ -1,47 +0,0 @@ -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 deleted file mode 100644 index adad5d8e535371abe89b311e8bc50b1c9c86e6ba..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/convert/SystemAuthorityConvert.java +++ /dev/null @@ -1,61 +0,0 @@ -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 deleted file mode 100644 index 8705de75ebb4ab9f788dd4f43450082128ee65e8..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/convert/SystemConvert.java +++ /dev/null @@ -1,72 +0,0 @@ -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 deleted file mode 100644 index 5782989686868e084430fe3b209573b87156f313..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/convert/UserGroupConvert.java +++ /dev/null @@ -1,60 +0,0 @@ -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 deleted file mode 100644 index 723b622e729f7ced7d2728923d9420b7d520dbf9..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/exe/CmdExeService.java +++ /dev/null @@ -1,19 +0,0 @@ -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 deleted file mode 100644 index 425dea5523740c5ac1d34a79673bc4d8c00caf12..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/exe/RoleAuthCmdExe.java +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index 7d937e14b78dce9026e3b148fa4bbce75099e7f9..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/exe/UserAuthCmdExe.java +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index df08cee162bb44f438b4a5e2b3d17a0b2cfa749c..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/exe/UserCmdExe.java +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index 966f6957828e4319fd6f8b91627d543499c22a71..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/app/exe/UserGroupCmdExe.java +++ /dev/null @@ -1,29 +0,0 @@ -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/domain/bo/AdminAuthorityBO.java b/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/AdminAuthorityBO.java deleted file mode 100644 index 18db1e5cfc7b0d56ef907f1c4316105f7ae7090c..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/AdminAuthorityBO.java +++ /dev/null @@ -1,39 +0,0 @@ -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 deleted file mode 100644 index 1b209ec3571fe8965abb1c0d5a1e4381e29347e5..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/AuthAggregateBO.java +++ /dev/null @@ -1,50 +0,0 @@ -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 deleted file mode 100644 index 834e22b6d1f97b5e0f4b55008fc2b0184f547af0..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/AuthorityBO.java +++ /dev/null @@ -1,65 +0,0 @@ -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 deleted file mode 100644 index 1185e700cea66b2387d14c1da054752218fe1069..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/AuthorityUpdateRequestBO.java +++ /dev/null @@ -1,24 +0,0 @@ -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 deleted file mode 100644 index 79ca5c5b125dc0d6ebbc35c967aed097dcd0a32c..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/BasicOperateBO.java +++ /dev/null @@ -1,40 +0,0 @@ -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 deleted file mode 100644 index 22d506b90d51d14f7fe8cf06aa5da87a739d3571..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/DataAuthorityBO.java +++ /dev/null @@ -1,34 +0,0 @@ -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 deleted file mode 100644 index ebbe7aa406c52c4315f242ae19334fc9e8892f8a..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/DataColumnBO.java +++ /dev/null @@ -1,59 +0,0 @@ -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 deleted file mode 100644 index e454145ebfa2faf0f2731f45b523071c4d828ae0..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/MenuBO.java +++ /dev/null @@ -1,49 +0,0 @@ -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 deleted file mode 100644 index 895905fa5413f7bf4610c0f768af2c3a3535aa17..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/ModuleBO.java +++ /dev/null @@ -1,50 +0,0 @@ -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 deleted file mode 100644 index b9e8014fb34f5251306eddf8e4eb0a2d1634d117..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/OperateDateBO.java +++ /dev/null @@ -1,30 +0,0 @@ -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 deleted file mode 100644 index 1e35d910a2c7fa94af1fbde85d5a92a459e3ae3b..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/OperatorBO.java +++ /dev/null @@ -1,30 +0,0 @@ -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 deleted file mode 100644 index c60f483cdba74e4ba08c245a0e174b52f8dc67b5..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/RoleAuthAggregateBO.java +++ /dev/null @@ -1,24 +0,0 @@ -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 deleted file mode 100644 index 554cbfe4cb4832d8428ec57e9a6b9db772a146e9..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/RoleBO.java +++ /dev/null @@ -1,45 +0,0 @@ -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 deleted file mode 100644 index f6937034a8a2448ffccdeed359a862e141dc82ff..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/RoleGroupBO.java +++ /dev/null @@ -1,45 +0,0 @@ -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 deleted file mode 100644 index a98c36bb93dd8c22606a668c614397e0c9d852e3..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/SystemAuthorityBO.java +++ /dev/null @@ -1,49 +0,0 @@ -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 deleted file mode 100644 index 80dad2fdf3f91a786b541a8498ec65102f9cd560..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/SystemBO.java +++ /dev/null @@ -1,65 +0,0 @@ -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 deleted file mode 100644 index dcd5abb96d305636976f2e2482acb82ef652d5b8..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/SystemConfig.java +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index 7ea40b2f65beb6a327a68ef65bab849a3316314d..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/UserAuthAggregateBO.java +++ /dev/null @@ -1,24 +0,0 @@ -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 deleted file mode 100644 index d67e7e028a6b6d6be4d7dc0aff3126b7fdc4de06..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/UserBO.java +++ /dev/null @@ -1,40 +0,0 @@ -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 deleted file mode 100644 index b61b1a0bd5504852bdf040bb3da15d813cbea686..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/bo/UserGroupBO.java +++ /dev/null @@ -1,55 +0,0 @@ -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 deleted file mode 100644 index c0d61b79914b5af59f0ffa9047c527682f2041ad..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/enums/AuthorityTypeEnum.java +++ /dev/null @@ -1,45 +0,0 @@ -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 deleted file mode 100644 index 22c0d908928a00f63cd478802d8e5dbca90ea875..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/event/BaseEvent.java +++ /dev/null @@ -1,18 +0,0 @@ -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 deleted file mode 100644 index 4d7aa1a2676014ac2dfa8e2ee9b307d477f173b0..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/event/MenuChangeEvent.java +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index ea5ddf75e5fd581fe8dab92c20d8f031d4a9580e..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/event/RoleAuthChangeEvent.java +++ /dev/null @@ -1,27 +0,0 @@ -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 deleted file mode 100644 index 5f6338aafdcd4a723b726070bdbf2b06c7616874..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/event/RoleChangeEvent.java +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index cf085c7b45991f542eb577a313818a00af2db56f..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/factory/AuthorityFactory.java +++ /dev/null @@ -1,43 +0,0 @@ -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 deleted file mode 100644 index c6315cb5272aba5de0659310369400067ab96841..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/gataway/AuthorityRepository.java +++ /dev/null @@ -1,44 +0,0 @@ -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 deleted file mode 100644 index 4d52f3084fd9b1b9abf65a15bd2df49ccd44edfe..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/gataway/DataColumnGataWay.java +++ /dev/null @@ -1,51 +0,0 @@ -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 deleted file mode 100644 index be66458c1d807cb9b80754b4d1e5495b760e37d2..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/gataway/SystemModuleQueryGataWay.java +++ /dev/null @@ -1,71 +0,0 @@ -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 deleted file mode 100644 index bed64b7da1f592b4c62ce38dc6ab4ce62735a274..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/gataway/SystemModuleRepository.java +++ /dev/null @@ -1,51 +0,0 @@ -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 deleted file mode 100644 index c5c1629136f823903264d9ac8bdf9dd46db5fbc7..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/gataway/UserRoleRepository.java +++ /dev/null @@ -1,77 +0,0 @@ -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 deleted file mode 100644 index 87697cce3f86b383cc6791beccdafd2ca29440ba..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/domain/msgbody/UserStatusChangeMsgBody.java +++ /dev/null @@ -1,23 +0,0 @@ -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 deleted file mode 100644 index 9e9ece009cb7cdb130c96f892f689ab1201990b3..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/AdminAuthorityDO.java +++ /dev/null @@ -1,43 +0,0 @@ -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 deleted file mode 100644 index 1e4e5c71a22294f751479dd0196f54d4fc5ae119..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/AuthorityDO.java +++ /dev/null @@ -1,49 +0,0 @@ -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 deleted file mode 100644 index 9e1ec68d3c09cb77a45f4f3d60f068ccedb5d1d9..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/DataAuthorityDO.java +++ /dev/null @@ -1,40 +0,0 @@ -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 deleted file mode 100644 index d3f21adb15e9bca19811cd46a65acf7291478922..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/DataColumnConfigDO.java +++ /dev/null @@ -1,55 +0,0 @@ -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 deleted file mode 100644 index 8bfac74725157b8401e94b2511c9ef73acc7a89d..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/MenuDO.java +++ /dev/null @@ -1,49 +0,0 @@ -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 deleted file mode 100644 index 4cd09be972cd696e58290de8cda441135416c531..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/ModuleDO.java +++ /dev/null @@ -1,46 +0,0 @@ -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 deleted file mode 100644 index dbab670c07e81fe928719e747c6ac4112df510b4..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/RoleDO.java +++ /dev/null @@ -1,43 +0,0 @@ -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 deleted file mode 100644 index e74a1a3fdb2adb7463dd044e79a517adacc2d8e1..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/RoleGroupDO.java +++ /dev/null @@ -1,43 +0,0 @@ -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 deleted file mode 100644 index 39f283ed93015ab2ae5372f55ba2ea1f76138769..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/SystemAuthorityDO.java +++ /dev/null @@ -1,40 +0,0 @@ -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 deleted file mode 100644 index d4994536bffe3a92d5bde46d29ea40717104500e..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/SystemDO.java +++ /dev/null @@ -1,49 +0,0 @@ -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 deleted file mode 100644 index f02dd771cbee9737b57f62358c60add6abb387e1..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast.dao.dataobject/UserGroupDO.java +++ /dev/null @@ -1,46 +0,0 @@ -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-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 deleted file mode 100644 index 0b83524b872018c42b6a7344da5a5cd61dcb1065..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/acl/AreaServiceAdapter.java +++ /dev/null @@ -1,27 +0,0 @@ -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 deleted file mode 100644 index d82d0d0dbf6c494d203acdf781700bc0d4218e81..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/acl/DepartmentServiceAdapter.java +++ /dev/null @@ -1,27 +0,0 @@ -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 deleted file mode 100644 index 3059fbb0cc6ec3a1a11220c86a9af96075a310af..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/acl/impl/AreaServiceAdapterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -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 deleted file mode 100644 index 3318e3743540a8fdd10fad0f5f28c59b3346133e..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/acl/impl/DepartmentServiceAdapterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -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 deleted file mode 100644 index 50e1dacf881ad46edead76567c847f7501a44c16..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/acl/req/dto/DepartmentQueryDTO.java +++ /dev/null @@ -1,19 +0,0 @@ -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 deleted file mode 100644 index ec950d5a9998705e69fa5cef89f0ba92a0569e45..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/acl/res/dto/CityResponseDTO.java +++ /dev/null @@ -1,19 +0,0 @@ -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 deleted file mode 100644 index c428df1f71cd34adb3aa45d365438715041799e3..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/acl/res/dto/DepartmentResponseDTO.java +++ /dev/null @@ -1,19 +0,0 @@ -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 deleted file mode 100644 index a9a9519567939ec4734c4ab6552168bc60227606..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/acl/res/dto/ProvinceResponseDTO.java +++ /dev/null @@ -1,19 +0,0 @@ -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 deleted file mode 100644 index 9e5347b8e002eb0586521cbb0f8a340d2a929e5c..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/AdminAuthorityMapper.java +++ /dev/null @@ -1,60 +0,0 @@ -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 deleted file mode 100644 index 2bea428825d4db2d9c4681a9c6fdd297fac00d12..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/AuthorityMapper.java +++ /dev/null @@ -1,59 +0,0 @@ -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 deleted file mode 100644 index 0b0b80ff674685ddbd275aa37de66b8f5b19e3d7..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/DataAuthorityMapper.java +++ /dev/null @@ -1,60 +0,0 @@ -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 deleted file mode 100644 index af5a9bfce1e27c0fe715ba505967116dbe65f61a..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/DataColumnConfigMapper.java +++ /dev/null @@ -1,59 +0,0 @@ -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 deleted file mode 100644 index 91c3dbfa0173db445af364cd053e208af54e1380..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/MenuMapper.java +++ /dev/null @@ -1,67 +0,0 @@ -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 deleted file mode 100644 index e2ed6f86afb897dbd07986837b1a7effcb261088..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/ModuleMapper.java +++ /dev/null @@ -1,67 +0,0 @@ -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 deleted file mode 100644 index 8a85e15fc61b739b2526d6a2dddb343e3c2242bc..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/RoleGroupMapper.java +++ /dev/null @@ -1,59 +0,0 @@ -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 deleted file mode 100644 index b62d788b7aa1c740b1e0e5c0417327c5b6a51c4a..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/RoleMapper.java +++ /dev/null @@ -1,59 +0,0 @@ -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 deleted file mode 100644 index 7dd030aa93d1693353861482a0504fb1b2cacb0e..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/SystemAuthorityMapper.java +++ /dev/null @@ -1,60 +0,0 @@ -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 deleted file mode 100644 index d3093303c1e171ef677e5ec754f6f92e5dd03319..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/SystemMapper.java +++ /dev/null @@ -1,98 +0,0 @@ -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 deleted file mode 100644 index 6d9cbe8f711bc2e1591031dceed2f376972d9fc2..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/UserGroupMapper.java +++ /dev/null @@ -1,59 +0,0 @@ -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 deleted file mode 100644 index b1adcd72507ed606246382a021b5788082d90899..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dao/mapper/UserRoleMappingMapper.java +++ /dev/null @@ -1,59 +0,0 @@ -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 deleted file mode 100644 index a0947d130414f2b52bb3dc7954e68e5da4de1c13..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/AuthorityConvert.java +++ /dev/null @@ -1,46 +0,0 @@ -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 deleted file mode 100644 index fc8053e007f58bca8c8308c6f8d2eb2d338c305b..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/DataAuthorityConvert.java +++ /dev/null @@ -1,48 +0,0 @@ -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 deleted file mode 100644 index 2921ed4be59f89b8b13a833d6790581d24f6fa2b..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/DataColumnConvert.java +++ /dev/null @@ -1,46 +0,0 @@ -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 deleted file mode 100644 index 8348b8812d726d6430100cee21cf6f09d5b4d5d1..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/MenuConvert.java +++ /dev/null @@ -1,46 +0,0 @@ -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 deleted file mode 100644 index 9293261ec30ee0350816fc9603cd54ee41d67d2a..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/ModuleConvert.java +++ /dev/null @@ -1,46 +0,0 @@ -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 deleted file mode 100644 index 03dd86b9c689c002138ba0a72c270dcef69c1494..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/RoleConvert.java +++ /dev/null @@ -1,46 +0,0 @@ -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 deleted file mode 100644 index bc97ffe085e27bb168d67971cf67c5cdd97a70d0..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/RoleGroupConvert.java +++ /dev/null @@ -1,46 +0,0 @@ -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 deleted file mode 100644 index fdd86864f74c217619112bcd998833b7d2027c8d..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/SystemAuthorityConvert.java +++ /dev/null @@ -1,48 +0,0 @@ -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 deleted file mode 100644 index e80c7dee6610e5d58b2e810c962a6d1ee1ff9de4..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/SystemConvert.java +++ /dev/null @@ -1,46 +0,0 @@ -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 deleted file mode 100644 index a85453dfe2b76f6ffec93340ee1a2d3c3620f730..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/dataconvert/UserGroupConvert.java +++ /dev/null @@ -1,46 +0,0 @@ -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 deleted file mode 100644 index 2b3fd7269d90d157ddc05cf668c722473ae19b5a..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/gatawayimpl/DataColumnGataWayImpl.java +++ /dev/null @@ -1,63 +0,0 @@ -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 deleted file mode 100644 index a490f7d874c1151e42f11a93b69cbf31e491acbe..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/gatawayimpl/SystemModuleQueryGataWayImpl.java +++ /dev/null @@ -1,113 +0,0 @@ -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 deleted file mode 100644 index e9dcd92ddcab29e59be44bb70cc2826eef3144cf..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/mq/consumer/DepartmentMqConsumer.java +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index 7a7adaa5ca1464fc2a110478750fae8e92fd6154..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/mq/consumer/UserMqConsumer.java +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index 0a6591466f27c6ae872c6884b3b9bad74b942e24..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/mq/handler/UserMqHandler.java +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index c83dd08e9948fe85696f73b80d91373c697b8c40..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/mq/producer/AuthorityMqProducer.java +++ /dev/null @@ -1,33 +0,0 @@ -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 deleted file mode 100644 index 653af71c264df8b4fe69b13033c751e7b6434643..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/mq/producer/SystemMqProducer.java +++ /dev/null @@ -1,26 +0,0 @@ -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 deleted file mode 100644 index 2a5b1a7f547e770b889fd6149eecf687ed5fc1fe..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/repositoryimpl/AuthorityRepositoryImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -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 deleted file mode 100644 index cb2be0b9a396e6c4a0dc5ecf9ddbf68cda7c9875..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/repositoryimpl/SystemModuleRepositoryImpl.java +++ /dev/null @@ -1,98 +0,0 @@ -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 deleted file mode 100644 index b531ee7b31d79f2f428be0b9536f9f4cebdf8024..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/infrast/repositoryimpl/UserRoleRepositoryImpl.java +++ /dev/null @@ -1,89 +0,0 @@ -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 deleted file mode 100644 index 7006ca6489a3435267a04c1cec029bd4585b800c..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/model/convert/AuthorityConverter.java +++ /dev/null @@ -1,46 +0,0 @@ -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 deleted file mode 100644 index ebb5800cd05cc8eb1b6f16f2e67663e85b07c214..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/model/convert/DataAuthorityConverter.java +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index ba59db1aa12d51c1ce4982ae226536d79abe1435..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/model/convert/DataColumnConverter.java +++ /dev/null @@ -1,53 +0,0 @@ -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 deleted file mode 100644 index 50d224eb5606d3c26bf154fb05e8c3f462dd14d2..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/model/convert/MenuConverter.java +++ /dev/null @@ -1,72 +0,0 @@ -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 deleted file mode 100644 index a8a34c009b5beac59f46a075310566c2e1633f1c..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/model/convert/ModuleConverter.java +++ /dev/null @@ -1,72 +0,0 @@ -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 deleted file mode 100644 index 92044a7df2bc1f7aa0f1355fd9dc9ddf2568bbdc..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/model/convert/RoleConverter.java +++ /dev/null @@ -1,59 +0,0 @@ -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 deleted file mode 100644 index cd3ab6f2116de80b599a2c74d6a1f339a7f16b03..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/model/convert/RoleGroupConverter.java +++ /dev/null @@ -1,46 +0,0 @@ -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 deleted file mode 100644 index 6d327ae488c4923e6ba7611f693041525cf736ee..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/model/convert/SystemAuthorityConverter.java +++ /dev/null @@ -1,47 +0,0 @@ -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 deleted file mode 100644 index 31c9270a0b2883571ab8bcfe12310073361123f4..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/model/convert/SystemConverter.java +++ /dev/null @@ -1,72 +0,0 @@ -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 deleted file mode 100644 index cc782e29bdc65443a5743e3e6f4702bf6be9d6fd..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/java/com/coderman/infosys/auth/model/convert/UserGroupConverter.java +++ /dev/null @@ -1,46 +0,0 @@ -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/resources/erpicture/school_manager.puml b/codemaker-springboot/src/main/resources/erpicture/school_manager.puml deleted file mode 100644 index 0af688dbd77cddf059a2c50cf7132cf2b41295e1..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/resources/erpicture/school_manager.puml +++ /dev/null @@ -1,44 +0,0 @@ -@startuml -' hide the spot -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/erpicture/snail_app_user_crm.puml b/codemaker-springboot/src/main/resources/erpicture/snail_app_user_crm.puml deleted file mode 100644 index 6550efd51441e1f26a4d6d95525d04bc3cb43989..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/resources/erpicture/snail_app_user_crm.puml +++ /dev/null @@ -1,150 +0,0 @@ -@startuml -' hide the spot -hide circle - -' avoid problems with angled crows feet -skinparam linetype ortho - -entity " real_room_source 房东-房源表" as real_room_source { - id: 出租房源表id/bigint(20) unsigned - landlord_account_id: 房东账号id/bigint(20) - landlord_room_source_id: 房源表主表id/bigint(20) - room_status: 房屋状态/tinyint(4) - rent_start_time: 出租开始时间/date - rent_end_time: 出租结束时间/date - room_form_type: 房屋类型，主卧，次卧，客厅，阳台,一居室,两居室,开间/int(11) - room_index: 房屋编号/varchar(30) - room_desc: 房屋出租描述/varchar(500) - room_price: 出租价格/月/decimal(10,0) - room_rent_form: 出租形式(整租,合租)/int(11) - room_pay_form: 租金形式(月付,季度付,半年付,整年付)/int(11) - service_price: 服务费（中介房源，与押金类似）/decimal(10,0) -} - -entity " room_landlord 房东表" as room_landlord { - id: 房东id，主键id/bigint(20) unsigned - chinese_name: 房东姓名/varchar(50) - card_number: 房东身份证号/varchar(50) - card_number_urls: 房东人身份证图片(正反面)/varchar(200) - handphone: 房东电话/varchar(20) - check_status: 审核状态/tinyint(4) -} - -entity " room_publish 代理人-房源发布表" as room_publish { - id: 代理人id，主键id/bigint(20) unsigned - publisher_account_id: 发布人账号id/bigint(20) - room_source_id: 真实房源id/bigint(20) - publish_source_id: 发布的房源id/bigint(20) - create_time: 记录创建时间/发布时间/timestamp -} - -entity " landlord_contract_template 房东合同模板表" as landlord_contract_template { - id: 房源表id/bigint(20) unsigned - landlord_account_id: 房东账号id/bigint(20) - contract_template_id: 合同模板id/bigint(20) - create_time: 记录创建时间/timestamp -} - -entity " landlord_room_source 房东-房源表" as landlord_room_source { - id: 房源表id/bigint(20) unsigned - landlord_account_id: 房东账号id/bigint(20) - area_id: 房源所属行政区域id/int(11) - area_code: 房源所属小区/varchar(50) - floor_address: 房源所在楼层单元地址/varchar(200) - handphone: 房东电话/varchar(20) - create_time: 账号创建时间/timestamp - room_form_type: 户型类型/tinyint(4) - source_numbers: 可出租房间数量/tinyint(4) - size_info: 房屋面积/decimal(10,0) - living_room_num: 客厅数目/int(11) - kitchen_num: 厨房数目/int(11) - toilet_num: 卫生间数目/int(11) - require_info: 出租要求/varchar(5000) - decorate_info: 装修情况，精装修，简装修，毛坯房/int(11) - support_equipments: 支持的房屋设备/varchar(100) - money_water: 水费/吨/decimal(10,0) - money_thunder: 电费/度/decimal(10,0) - money_internet: 网费/月/decimal(10,0) - money_manage: 物业费/月/decimal(10,0) - money_car_park: 停车费/月/decimal(10,0) -} - -entity " attract_investment 招商服务注册表" as attract_investment { - id: 主键id/bigint(20) unsigned - chinese_name: 招商对象名称/varchar(100) - handphone: 联系电话/varchar(20) - investment_type: 招商类型/tinyint(4) - company_address: 公司地址/varchar(200) - start_time: 合作开始时间/date - end_time: 合作结束时间/date - is_openaccount: 是否开通账号/tinyint(4) - account_id: 会员账号id/bigint(20) - create_time: 记录创建时间/timestamp -} - -entity " room_agent 代理人表" as room_agent { - id: 代理人id，主键id/bigint(20) unsigned - chinese_name: 代理人姓名/varchar(50) - card_number: 代理人身份证号/varchar(50) - card_number_urls: 代理人身份证图片(正反面)/varchar(200) - handphone: 代理人电话/varchar(20) - area_codes: 代理小区列表/varchar(500) -} - -entity " room_subscribe 代理人-预约看房记录表" as room_subscribe { - id: 主键id/bigint(20) unsigned - agent_account_id: 代理人账号id/bigint(20) unsigned - room_agent_type: 代理人类型0:房东,1:代理人,2:中介/tinyint(4) unsigned - user_id: 用户id/bigint(11) unsigned - area_code: 房源所属小区/看房小区/varchar(50) - floor_address: 房源所在楼层单元地址/varchar(200) - mind_hourse_before: 提前N小时提醒/int(11) - handphone: 用户电话/varchar(20) - is_mind: 是否进行预约提醒/int(11) - subscribe_time: 预约时间/date - subscribe_result: 看房结果/varchar(500) -} - -entity " account 合作用户表" as account { - id: 账号id/bigint(20) unsigned - nick_name: 账号昵称/varchar(100) - pass_word: 密码/varchar(100) - account_type: 账号类型（代理人，房东，招商用户）/tinyint(4) - member_id: 代理人，房东，招商用户id /bigint(20) - status: 账号状态/tinyint(4) - handphone: 电话号码/varchar(100) -} - -entity " room_agent_order 代理人-签单表" as room_agent_order { - id: 主键id/bigint(20) unsigned - agent_account_id: 代理人账号id/bigint(20) - landlord_account_id: 房东账号id/bigint(20) - room_source_id: 房源id/bigint(20) - create_time: 记录创建时间/timestamp - order_time: 签单时间/date - tip_money: 佣金额度/元/int(11) - settlement_form: 结算形式/一单一结，月结/tinyint(11) -} - -entity " landlord_room_rent_record 房源出租记录表" as landlord_room_rent_record { - id: 主键id/bigint(20) unsigned - landlord_account_id: 房东账号id/bigint(20) - room_source_id: 房源id/bigint(20) - agent_account_id: 代理人账号id/bigint(20) - room_source_index: 房源房屋序号索引/int(11) - user_id: 用户id/bigint(20) - contract_id: 合同ID/bigint(20) - rent_start_time: 出租开始时间/date - rent_end_time: 出租结束时间/date - real_end_time: 出租实际结束时间/date - create_time: 记录创建时间/timestamp - update_time: 记录修改时间/timestamp -} - - - -landlord_room_source ||--o{ real_room_source -account ||--o{ attract_investment - - -@enduml \ No newline at end of file diff --git a/codemaker-springboot/src/main/resources/mapper/AccountMapper.xml b/codemaker-springboot/src/main/resources/mapper/AccountMapper.xml deleted file mode 100644 index 052f64613fd237f3a1ef6d1ae5fd59cbbe4b7739..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/resources/mapper/AccountMapper.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - id,nick_name,pass_word,account_type,member_id,status,handphone - - - - insert into account( - nick_name,pass_word,account_type,member_status,handphone - ) - values( - #{nick_name},#{pass_word},#{account_type},#{member_id},#{status},#{handphone} - ) - - - - update account - set - nick_name=#{nick_name},pass_word=#{pass_word},account_type=#{account_type},member_id=#{member_id},status=#{status},handphone=#{handphone} - where id = #{id} - - - - - - - - delete from account where id = #{id} - - - diff --git a/codemaker-springboot/src/main/resources/mapper/AdminAuthorityMapper.xml b/codemaker-springboot/src/main/resources/mapper/AdminAuthorityMapper.xml deleted file mode 100644 index e3b5a31dd23a2da5cb3c7c16bcd1de7b4b9dcaf8..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/resources/mapper/AdminAuthorityMapper.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - 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/AttractInvestmentMapper.xml b/codemaker-springboot/src/main/resources/mapper/AttractInvestmentMapper.xml deleted file mode 100644 index 93d96fc233cb74f6b5f3a867c072fb1a69955886..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/resources/mapper/AttractInvestmentMapper.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - id,chinese_name,handphone,investment_type,company_address,start_time,end_time,is_openaccount,account_id,create_time - - - - insert into attract_investment( - chinese_name,handphone,investment_type,company_address,start_time,end_time,is_openaccount,account_create_time - ) - values( - #{chinese_name},#{handphone},#{investment_type},#{company_address},#{start_time},#{end_time},#{is_openaccount},#{account_id},#{create_time} - ) - - - - update attract_investment - set - chinese_name=#{chinese_name},handphone=#{handphone},investment_type=#{investment_type},company_address=#{company_address},start_time=#{start_time},end_time=#{end_time},is_openaccount=#{is_openaccount},account_id=#{account_id},create_time=#{create_time} - where id = #{id} - - - - - - - - delete from attract_investment where id = #{id} - - - diff --git a/codemaker-springboot/src/main/resources/mapper/AuthorityMapper.xml b/codemaker-springboot/src/main/resources/mapper/AuthorityMapper.xml deleted file mode 100644 index 29c84a2c191e1c16d63cfbe0ff6fad29f9373829..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/resources/mapper/AuthorityMapper.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 deleted file mode 100644 index 162def4e29869b827ec970920f12315a79271a68..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/resources/mapper/ClassMapper.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - id,manager,student_count,grade_num,class_num - - - - insert into class( - manager,student_count,grade_num,class_num - ) - values( - #{manager},#{student_count},#{grade_num},#{class_num} - ) - - - - update class - set - manager=#{manager},student_count=#{student_count},grade_num=#{grade_num},class_num=#{class_num} - where id = #{id} - - - - - - - - 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 deleted file mode 100644 index e3fd270b47c5b9f34ca57b58ca8d15d0ab773617..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/resources/mapper/ClassTeacherMapper.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - id,class_id,teacher_id - - - - insert into class_teacher( - class_id,teacher_id - ) - values( - #{class_id},#{teacher_id} - ) - - - - update class_teacher - set - class_id=#{class_id},teacher_id=#{teacher_id} - where id = #{id} - - - - - - - - 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 deleted file mode 100644 index 3235c31f59c904ccf3d66dd4c314ab9a20970a6b..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/resources/mapper/DataAuthorityMapper.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - 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 deleted file mode 100644 index 287b31a5082292542817008d9e365abc4e968517..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/resources/mapper/DataColumnConfigMapper.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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/LandlordContractTemplateMapper.xml b/codemaker-springboot/src/main/resources/mapper/LandlordContractTemplateMapper.xml deleted file mode 100644 index 111237ddfc82cb04de3fc634e7ece91ca2f75210..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/resources/mapper/LandlordContractTemplateMapper.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - id,landlord_account_id,contract_template_id,create_time - - - - insert into landlord_contract_template( - landlord_account_contract_template_create_time - ) - values( - #{landlord_account_id},#{contract_template_id},#{create_time} - ) - - - - update landlord_contract_template - set - landlord_account_id=#{landlord_account_id},contract_template_id=#{contract_template_id},create_time=#{create_time} - where id = #{id} - - - - - - - - delete from landlord_contract_template where id = #{id} - - - diff --git a/codemaker-springboot/src/main/resources/mapper/LandlordRoomRentRecordMapper.xml b/codemaker-springboot/src/main/resources/mapper/LandlordRoomRentRecordMapper.xml deleted file mode 100644 index bd857bfc363e0821c3ed156f96b1b2a7e797049d..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/resources/mapper/LandlordRoomRentRecordMapper.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - id,landlord_account_id,room_source_id,agent_account_id,room_source_index,user_id,contract_id,rent_start_time,rent_end_time,real_end_time,create_time,update_time - - - - insert into landlord_room_rent_record( - landlord_account_room_source_agent_account_room_source_index,user_contract_rent_start_time,rent_end_time,real_end_time,create_time,update_time - ) - values( - #{landlord_account_id},#{room_source_id},#{agent_account_id},#{room_source_index},#{user_id},#{contract_id},#{rent_start_time},#{rent_end_time},#{real_end_time},#{create_time},#{update_time} - ) - - - - update landlord_room_rent_record - set - landlord_account_id=#{landlord_account_id},room_source_id=#{room_source_id},agent_account_id=#{agent_account_id},room_source_index=#{room_source_index},user_id=#{user_id},contract_id=#{contract_id},rent_start_time=#{rent_start_time},rent_end_time=#{rent_end_time},real_end_time=#{real_end_time},create_time=#{create_time},update_time=#{update_time} - where id = #{id} - - - - - - - - delete from landlord_room_rent_record where id = #{id} - - - diff --git a/codemaker-springboot/src/main/resources/mapper/LandlordRoomSourceMapper.xml b/codemaker-springboot/src/main/resources/mapper/LandlordRoomSourceMapper.xml deleted file mode 100644 index c1e075051d95b8afdaa4be7e1d634d5ed17ff220..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/resources/mapper/LandlordRoomSourceMapper.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id,landlord_account_id,area_id,area_code,floor_address,handphone,create_time,room_form_type,source_numbers,size_info,living_room_num,kitchen_num,toilet_num,require_info,decorate_info,support_equipments,money_water,money_thunder,money_internet,money_manage,money_car_park - - - - insert into landlord_room_source( - landlord_account_area_area_code,floor_address,handphone,create_time,room_form_type,source_numbers,size_info,living_room_num,kitchen_num,toilet_num,require_info,decorate_info,support_equipments,money_water,money_thunder,money_internet,money_manage,money_car_park - ) - values( - #{landlord_account_id},#{area_id},#{area_code},#{floor_address},#{handphone},#{create_time},#{room_form_type},#{source_numbers},#{size_info},#{living_room_num},#{kitchen_num},#{toilet_num},#{require_info},#{decorate_info},#{support_equipments},#{money_water},#{money_thunder},#{money_internet},#{money_manage},#{money_car_park} - ) - - - - update landlord_room_source - set - landlord_account_id=#{landlord_account_id},area_id=#{area_id},area_code=#{area_code},floor_address=#{floor_address},handphone=#{handphone},create_time=#{create_time},room_form_type=#{room_form_type},source_numbers=#{source_numbers},size_info=#{size_info},living_room_num=#{living_room_num},kitchen_num=#{kitchen_num},toilet_num=#{toilet_num},require_info=#{require_info},decorate_info=#{decorate_info},support_equipments=#{support_equipments},money_water=#{money_water},money_thunder=#{money_thunder},money_internet=#{money_internet},money_manage=#{money_manage},money_car_park=#{money_car_park} - where id = #{id} - - - - - - - - delete from landlord_room_source where id = #{id} - - - diff --git a/codemaker-springboot/src/main/resources/mapper/MenuMapper.xml b/codemaker-springboot/src/main/resources/mapper/MenuMapper.xml deleted file mode 100644 index 98387fbbd63e4afeee1df0e92bc7a912eeedcf36..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/resources/mapper/MenuMapper.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 deleted file mode 100644 index ec9f69e788eae2b607fb9bc0fd23aa66b7c93d95..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/resources/mapper/ModuleMapper.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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/RealRoomSourceMapper.xml b/codemaker-springboot/src/main/resources/mapper/RealRoomSourceMapper.xml deleted file mode 100644 index 04809270a2b3befc7c016855414da6ee0a7df498..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/resources/mapper/RealRoomSourceMapper.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - id,landlord_account_id,landlord_room_source_id,room_status,rent_start_time,rent_end_time,room_form_type,room_index,room_desc,room_price,room_rent_form,room_pay_form,service_price - - - - insert into real_room_source( - landlord_account_landlord_room_source_room_status,rent_start_time,rent_end_time,room_form_type,room_index,room_desc,room_price,room_rent_form,room_pay_form,service_price - ) - values( - #{landlord_account_id},#{landlord_room_source_id},#{room_status},#{rent_start_time},#{rent_end_time},#{room_form_type},#{room_index},#{room_desc},#{room_price},#{room_rent_form},#{room_pay_form},#{service_price} - ) - - - - update real_room_source - set - landlord_account_id=#{landlord_account_id},landlord_room_source_id=#{landlord_room_source_id},room_status=#{room_status},rent_start_time=#{rent_start_time},rent_end_time=#{rent_end_time},room_form_type=#{room_form_type},room_index=#{room_index},room_desc=#{room_desc},room_price=#{room_price},room_rent_form=#{room_rent_form},room_pay_form=#{room_pay_form},service_price=#{service_price} - where id = #{id} - - - - - - - - delete from real_room_source where id = #{id} - - - diff --git a/codemaker-springboot/src/main/resources/mapper/RoleGroupMapper.xml b/codemaker-springboot/src/main/resources/mapper/RoleGroupMapper.xml deleted file mode 100644 index 968f59e75bddb204244e12a9062884dbf1d85dc4..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/resources/mapper/RoleGroupMapper.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 deleted file mode 100644 index 08f103a1a8f5b4e69d1ba3a7f3a974d754150edb..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/resources/mapper/RoleMapper.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - 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/RoomAgentMapper.xml b/codemaker-springboot/src/main/resources/mapper/RoomAgentMapper.xml deleted file mode 100644 index 21fe517f91607e2ad18a665d85dda762eb36b57d..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/resources/mapper/RoomAgentMapper.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - id,chinese_name,card_number,card_number_urls,handphone,area_codes - - - - insert into room_agent( - chinese_name,card_number,card_number_urls,handphone,area_codes - ) - values( - #{chinese_name},#{card_number},#{card_number_urls},#{handphone},#{area_codes} - ) - - - - update room_agent - set - chinese_name=#{chinese_name},card_number=#{card_number},card_number_urls=#{card_number_urls},handphone=#{handphone},area_codes=#{area_codes} - where id = #{id} - - - - - - - - delete from room_agent where id = #{id} - - - diff --git a/codemaker-springboot/src/main/resources/mapper/RoomAgentOrderMapper.xml b/codemaker-springboot/src/main/resources/mapper/RoomAgentOrderMapper.xml deleted file mode 100644 index c14903e572abb363fc4f177adea2598c9fc9af21..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/resources/mapper/RoomAgentOrderMapper.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - id,agent_account_id,landlord_account_id,room_source_id,create_time,order_time,tip_money,settlement_form - - - - insert into room_agent_order( - agent_account_landlord_account_room_source_create_time,order_time,tip_money,settlement_form - ) - values( - #{agent_account_id},#{landlord_account_id},#{room_source_id},#{create_time},#{order_time},#{tip_money},#{settlement_form} - ) - - - - update room_agent_order - set - agent_account_id=#{agent_account_id},landlord_account_id=#{landlord_account_id},room_source_id=#{room_source_id},create_time=#{create_time},order_time=#{order_time},tip_money=#{tip_money},settlement_form=#{settlement_form} - where id = #{id} - - - - - - - - delete from room_agent_order where id = #{id} - - - diff --git a/codemaker-springboot/src/main/resources/mapper/RoomLandlordMapper.xml b/codemaker-springboot/src/main/resources/mapper/RoomLandlordMapper.xml deleted file mode 100644 index 4ad0b37930c534f1c3f1a60ae5c2b77cb198ffb8..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/resources/mapper/RoomLandlordMapper.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - id,chinese_name,card_number,card_number_urls,handphone,check_status - - - - insert into room_landlord( - chinese_name,card_number,card_number_urls,handphone,check_status - ) - values( - #{chinese_name},#{card_number},#{card_number_urls},#{handphone},#{check_status} - ) - - - - update room_landlord - set - chinese_name=#{chinese_name},card_number=#{card_number},card_number_urls=#{card_number_urls},handphone=#{handphone},check_status=#{check_status} - where id = #{id} - - - - - - - - delete from room_landlord where id = #{id} - - - diff --git a/codemaker-springboot/src/main/resources/mapper/RoomPublishMapper.xml b/codemaker-springboot/src/main/resources/mapper/RoomPublishMapper.xml deleted file mode 100644 index 4c1c6bff594344e40aa4ab8ac3261155f598e69b..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/resources/mapper/RoomPublishMapper.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - id,publisher_account_id,room_source_id,publish_source_id,create_time - - - - insert into room_publish( - publisher_account_room_source_publish_source_create_time - ) - values( - #{publisher_account_id},#{room_source_id},#{publish_source_id},#{create_time} - ) - - - - update room_publish - set - publisher_account_id=#{publisher_account_id},room_source_id=#{room_source_id},publish_source_id=#{publish_source_id},create_time=#{create_time} - where id = #{id} - - - - - - - - delete from room_publish where id = #{id} - - - diff --git a/codemaker-springboot/src/main/resources/mapper/RoomSubscribeMapper.xml b/codemaker-springboot/src/main/resources/mapper/RoomSubscribeMapper.xml deleted file mode 100644 index 3dd859c2ef9e3d6a91c24c0b0c17b6e07484d908..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/resources/mapper/RoomSubscribeMapper.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - id,agent_account_id,room_agent_type,user_id,area_code,floor_address,mind_hourse_before,handphone,is_mind,subscribe_time,subscribe_result - - - - insert into room_subscribe( - agent_account_room_agent_type,user_area_code,floor_address,mind_hourse_before,handphone,is_mind,subscribe_time,subscribe_result - ) - values( - #{agent_account_id},#{room_agent_type},#{user_id},#{area_code},#{floor_address},#{mind_hourse_before},#{handphone},#{is_mind},#{subscribe_time},#{subscribe_result} - ) - - - - update room_subscribe - set - agent_account_id=#{agent_account_id},room_agent_type=#{room_agent_type},user_id=#{user_id},area_code=#{area_code},floor_address=#{floor_address},mind_hourse_before=#{mind_hourse_before},handphone=#{handphone},is_mind=#{is_mind},subscribe_time=#{subscribe_time},subscribe_result=#{subscribe_result} - where id = #{id} - - - - - - - - delete from room_subscribe where id = #{id} - - - diff --git a/codemaker-springboot/src/main/resources/mapper/StudentMapper.xml b/codemaker-springboot/src/main/resources/mapper/StudentMapper.xml deleted file mode 100644 index 10233adffb6efb45aa6aec7831e5be0a1235ac4d..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/resources/mapper/StudentMapper.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - id,student_name,student_code,sex,age,class_id - - - - insert into student( - student_name,student_code,sex,age,class_id - ) - values( - #{student_name},#{student_code},#{sex},#{age},#{class_id} - ) - - - - update student - set - student_name=#{student_name},student_code=#{student_code},sex=#{sex},age=#{age},class_id=#{class_id} - where id = #{id} - - - - - - - - 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 deleted file mode 100644 index d2194168db93234dcca21982b49f6cf2123a51ef..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/resources/mapper/SystemAuthorityMapper.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - 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 deleted file mode 100644 index 87b7c92093231f259c95be2949e836e522eb29c5..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/resources/mapper/SystemMapper.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 deleted file mode 100644 index 2dcc080db1ea26a3c747812ba7e55ea8b8018b2a..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/resources/mapper/TeacherMapper.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - id,teacher_name,age,sex - - - - insert into teacher( - teacher_name,age,sex - ) - values( - #{teacher_name},#{age},#{sex} - ) - - - - update teacher - set - teacher_name=#{teacher_name},age=#{age},sex=#{sex} - where id = #{id} - - - - - - - - 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 deleted file mode 100644 index d9441a973f286f90ac5c7ce16ba1a5321a7b9e9a..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/main/resources/mapper/UserGroupMapper.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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/test/java/com/coderman/infosys/auth/service/test/AdminAuthorityServiceTest.java b/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/AdminAuthorityServiceTest.java index 815effa2ffa2dd9d2f3780e557a01c70306c30ef..a8ea23558e7cc3e3f1aec2233c5ed204a98b0bc0 100644 --- 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 @@ -24,7 +24,7 @@ import org.springframework.test.context.junit4.SpringRunner; /** * @Description:行政数据权限单元测试 * @Author:shenshuai -* @CreateTime:2021-11-06 23:38:07 +* @CreateTime:2021-12-24 23:46:19 * @version v1.0 */ @RunWith(SpringRunner.class) 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 index 08e2e1e4aa0e22c5a369e384bb35803571a7aa82..8f65a13185d329837df2b468a27d29c3b288d97a 100644 --- 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 @@ -24,7 +24,7 @@ import org.springframework.test.context.junit4.SpringRunner; /** * @Description:抽象权限表单元测试 * @Author:shenshuai -* @CreateTime:2021-11-06 23:38:07 +* @CreateTime:2021-12-24 23:46:19 * @version v1.0 */ @RunWith(SpringRunner.class) 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 deleted file mode 100644 index f161090639feab41c5b37c98072430ac1f5af58d..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/ClassServiceTest.java +++ /dev/null @@ -1,107 +0,0 @@ -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 deleted file mode 100644 index f891d6d83c2e47a7fa2c46452096e45b2012e8cc..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/ClassTeacherServiceTest.java +++ /dev/null @@ -1,107 +0,0 @@ -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 index ec9bd4c8259316c236379c01ad968dd250f3a6f5..65c65746203193ee874ddcefad0a3623cbd6e16d 100644 --- 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 @@ -24,7 +24,7 @@ import org.springframework.test.context.junit4.SpringRunner; /** * @Description:数据字段权限单元测试 * @Author:shenshuai -* @CreateTime:2021-11-06 23:38:07 +* @CreateTime:2021-12-24 23:46:19 * @version v1.0 */ @RunWith(SpringRunner.class) 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 index 25642c520e3edd19c3a358aa8a975db3941aa1b5..006cbe001e7f05989114cf6afa4d8c9b3a5b9894 100644 --- 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 @@ -24,7 +24,7 @@ import org.springframework.test.context.junit4.SpringRunner; /** * @Description:数据字段管理表单元测试 * @Author:shenshuai -* @CreateTime:2021-11-06 23:38:07 +* @CreateTime:2021-12-24 23:46:19 * @version v1.0 */ @RunWith(SpringRunner.class) 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 index 51466f870111f32ade4763d14fe6c7148b6c7d80..f1cd9aa56679f7810a12576bc06956445b6ed5b8 100644 --- 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 @@ -24,7 +24,7 @@ import org.springframework.test.context.junit4.SpringRunner; /** * @Description:按钮表单元测试 * @Author:shenshuai -* @CreateTime:2021-11-06 23:38:07 +* @CreateTime:2021-12-24 23:46:19 * @version v1.0 */ @RunWith(SpringRunner.class) 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 index c92791e7cf79b8c420b574c5b3e2d2f561f6f0a1..cdc39d12462e739c3b8d764a3fe18db1a8499c09 100644 --- 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 @@ -24,7 +24,7 @@ import org.springframework.test.context.junit4.SpringRunner; /** * @Description:菜单模块表单元测试 * @Author:shenshuai -* @CreateTime:2021-11-06 23:38:07 +* @CreateTime:2021-12-24 23:46:19 * @version v1.0 */ @RunWith(SpringRunner.class) 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 index adfe9c6185c65de1f344a428d1f92ad323e95af2..aa50f4c0e958e8818f6638a14ce478668e7a183c 100644 --- 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 @@ -24,7 +24,7 @@ import org.springframework.test.context.junit4.SpringRunner; /** * @Description:角色组单元测试 * @Author:shenshuai -* @CreateTime:2021-11-06 23:38:07 +* @CreateTime:2021-12-24 23:46:19 * @version v1.0 */ @RunWith(SpringRunner.class) 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 index c78469a6d2ffdd7ff0a227464b711577d33933ce..eef8d55398948d3a01208b64da372c1b50b7f8e2 100644 --- 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 @@ -24,7 +24,7 @@ import org.springframework.test.context.junit4.SpringRunner; /** * @Description:角色表单元测试 * @Author:shenshuai -* @CreateTime:2021-11-06 23:38:07 +* @CreateTime:2021-12-24 23:46:19 * @version v1.0 */ @RunWith(SpringRunner.class) 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 deleted file mode 100644 index 6979ce0c78764c44a9b6f96057f9562156d23824..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/StudentServiceTest.java +++ /dev/null @@ -1,107 +0,0 @@ -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 index cdf489d5317b3181221f2d7cb04456f3f15f6f26..77ee39d6cb42b61ab2cfe7c81e0611b8452d1aa1 100644 --- 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 @@ -24,7 +24,7 @@ import org.springframework.test.context.junit4.SpringRunner; /** * @Description:系统菜单权限表单元测试 * @Author:shenshuai -* @CreateTime:2021-11-06 23:38:07 +* @CreateTime:2021-12-24 23:46:19 * @version v1.0 */ @RunWith(SpringRunner.class) 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 index 7a691614bcc9a9b31a2adee5c84f89e08f6d0382..f68fb65732b68935755a7af69759bb01c89a0caf 100644 --- 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 @@ -24,7 +24,7 @@ import org.springframework.test.context.junit4.SpringRunner; /** * @Description:系统表单元测试 * @Author:shenshuai -* @CreateTime:2021-11-06 23:38:07 +* @CreateTime:2021-12-24 23:46:19 * @version v1.0 */ @RunWith(SpringRunner.class) 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 deleted file mode 100644 index 1a592a9ba01095122311364e78838a734362450e..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/test/java/com/coderman/infosys/auth/service/test/TeacherServiceTest.java +++ /dev/null @@ -1,107 +0,0 @@ -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 index e6c5bcbf6b47d23056387e7d0a750173b9da36da..d14df64dbcbd3213281682d413fa633c4a6803cf 100644 --- 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 @@ -24,7 +24,7 @@ import org.springframework.test.context.junit4.SpringRunner; /** * @Description:用户组单元测试 * @Author:shenshuai -* @CreateTime:2021-11-06 23:38:07 +* @CreateTime:2021-12-24 23:46:19 * @version v1.0 */ @RunWith(SpringRunner.class) 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 index 1005d510023e7bfb576ae55489a77a8a6c7e4181..52bdbfbc2f61cf86a71c2cccf2903a0850b0ccf8 100644 --- 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 @@ -24,7 +24,7 @@ import org.springframework.test.context.junit4.SpringRunner; /** * @Description:用户角色关联表单元测试 * @Author:shenshuai -* @CreateTime:2021-11-06 23:38:07 +* @CreateTime:2021-12-24 23:46:19 * @version v1.0 */ @RunWith(SpringRunner.class) diff --git a/codemaker-springboot/src/test/java/com/lightsnail/app/user/crm/core/service/test/LandlordContractTemplateServiceTest.java b/codemaker-springboot/src/test/java/com/lightsnail/app/user/crm/core/service/test/LandlordContractTemplateServiceTest.java deleted file mode 100644 index f172e6b264cca1faefde08f2135c1274e3145b75..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/test/java/com/lightsnail/app/user/crm/core/service/test/LandlordContractTemplateServiceTest.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.lightsnail.app.user.crm.core.service.test; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.lightsnail.app.user.crm.core.service.LandlordContractTemplateService; -import com.lightsnail.app.user.crm.core.vo.LandlordContractTemplateVO; -import com.lightsnail.app.user.crm.core.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:fanchunshuai -* @CreateTime:2020-11-17 00:02:53 -* @version v1.0 -*/ -@RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment= SpringBootTest.WebEnvironment.RANDOM_PORT,classes = {Application.class}) -public class LandlordContractTemplateServiceTest{ - - protected Logger logger = LoggerFactory.getLogger(LandlordContractTemplateServiceTest.class); - - @Autowired - private LandlordContractTemplateService landlordContractTemplateService; - @Autowired - private TestRestTemplate restTemplate; - - /** - * @Description:测试新增房东合同模板表 接口 - */ - @Test - public void testAdd(){ - //todo test code - LandlordContractTemplateVO vo = new LandlordContractTemplateVO(); - - ResultDto resultDto = restTemplate.postForEntity("/landlordContractTemplate/add",vo, ResultDto.class).getBody(); - System.out.println(JSON.toJSONString(resultDto)); - } - - /** - * @Description:测试修改房东合同模板表 - */ - @Test - public void testUpdate(){ - //todo test code - LandlordContractTemplateVO vo = new LandlordContractTemplateVO(); - ResultDto resultDto = restTemplate.postForEntity("/landlordContractTemplate/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("/landlordContractTemplate/delete",id, ResultDto.class).getBody(); - System.out.println(JSON.toJSONString(resultDto)); - } - - /** - * @Description:但是根据ID获取房东合同模板表单条记录 - */ - @Test - public void testGetById(){ - //todo test code - ResultDataDto resultDataDto = restTemplate.getForEntity("/landlordContractTemplate/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/lightsnail/app/user/crm/core/service/test/LandlordRoomRentRecordServiceTest.java b/codemaker-springboot/src/test/java/com/lightsnail/app/user/crm/core/service/test/LandlordRoomRentRecordServiceTest.java deleted file mode 100644 index 034fc84436677354de9d51dba12f6a01958cd3ae..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/test/java/com/lightsnail/app/user/crm/core/service/test/LandlordRoomRentRecordServiceTest.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.lightsnail.app.user.crm.core.service.test; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.lightsnail.app.user.crm.core.service.LandlordRoomRentRecordService; -import com.lightsnail.app.user.crm.core.vo.LandlordRoomRentRecordVO; -import com.lightsnail.app.user.crm.core.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:fanchunshuai -* @CreateTime:2020-11-17 00:02:54 -* @version v1.0 -*/ -@RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment= SpringBootTest.WebEnvironment.RANDOM_PORT,classes = {Application.class}) -public class LandlordRoomRentRecordServiceTest{ - - protected Logger logger = LoggerFactory.getLogger(LandlordRoomRentRecordServiceTest.class); - - @Autowired - private LandlordRoomRentRecordService landlordRoomRentRecordService; - @Autowired - private TestRestTemplate restTemplate; - - /** - * @Description:测试新增房源出租记录表 接口 - */ - @Test - public void testAdd(){ - //todo test code - LandlordRoomRentRecordVO vo = new LandlordRoomRentRecordVO(); - - ResultDto resultDto = restTemplate.postForEntity("/landlordRoomRentRecord/add",vo, ResultDto.class).getBody(); - System.out.println(JSON.toJSONString(resultDto)); - } - - /** - * @Description:测试修改房源出租记录表 - */ - @Test - public void testUpdate(){ - //todo test code - LandlordRoomRentRecordVO vo = new LandlordRoomRentRecordVO(); - ResultDto resultDto = restTemplate.postForEntity("/landlordRoomRentRecord/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("/landlordRoomRentRecord/delete",id, ResultDto.class).getBody(); - System.out.println(JSON.toJSONString(resultDto)); - } - - /** - * @Description:但是根据ID获取房源出租记录表单条记录 - */ - @Test - public void testGetById(){ - //todo test code - ResultDataDto resultDataDto = restTemplate.getForEntity("/landlordRoomRentRecord/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/lightsnail/app/user/crm/core/service/test/LandlordRoomSourceServiceTest.java b/codemaker-springboot/src/test/java/com/lightsnail/app/user/crm/core/service/test/LandlordRoomSourceServiceTest.java deleted file mode 100644 index 09da91df9cde3e1629646f31b7d924b6bc480001..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/test/java/com/lightsnail/app/user/crm/core/service/test/LandlordRoomSourceServiceTest.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.lightsnail.app.user.crm.core.service.test; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.lightsnail.app.user.crm.core.service.LandlordRoomSourceService; -import com.lightsnail.app.user.crm.core.vo.LandlordRoomSourceVO; -import com.lightsnail.app.user.crm.core.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:fanchunshuai -* @CreateTime:2020-11-17 00:02:53 -* @version v1.0 -*/ -@RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment= SpringBootTest.WebEnvironment.RANDOM_PORT,classes = {Application.class}) -public class LandlordRoomSourceServiceTest{ - - protected Logger logger = LoggerFactory.getLogger(LandlordRoomSourceServiceTest.class); - - @Autowired - private LandlordRoomSourceService landlordRoomSourceService; - @Autowired - private TestRestTemplate restTemplate; - - /** - * @Description:测试新增房东-房源表 接口 - */ - @Test - public void testAdd(){ - //todo test code - LandlordRoomSourceVO vo = new LandlordRoomSourceVO(); - - ResultDto resultDto = restTemplate.postForEntity("/landlordRoomSource/add",vo, ResultDto.class).getBody(); - System.out.println(JSON.toJSONString(resultDto)); - } - - /** - * @Description:测试修改房东-房源表 - */ - @Test - public void testUpdate(){ - //todo test code - LandlordRoomSourceVO vo = new LandlordRoomSourceVO(); - ResultDto resultDto = restTemplate.postForEntity("/landlordRoomSource/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("/landlordRoomSource/delete",id, ResultDto.class).getBody(); - System.out.println(JSON.toJSONString(resultDto)); - } - - /** - * @Description:但是根据ID获取房东-房源表单条记录 - */ - @Test - public void testGetById(){ - //todo test code - ResultDataDto resultDataDto = restTemplate.getForEntity("/landlordRoomSource/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/lightsnail/app/user/crm/core/service/test/RealRoomSourceServiceTest.java b/codemaker-springboot/src/test/java/com/lightsnail/app/user/crm/core/service/test/RealRoomSourceServiceTest.java deleted file mode 100644 index ca12330acfd121b9d5f4ce665585be3ab901c33a..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/test/java/com/lightsnail/app/user/crm/core/service/test/RealRoomSourceServiceTest.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.lightsnail.app.user.crm.core.service.test; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.lightsnail.app.user.crm.core.service.RealRoomSourceService; -import com.lightsnail.app.user.crm.core.vo.RealRoomSourceVO; -import com.lightsnail.app.user.crm.core.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:fanchunshuai -* @CreateTime:2020-11-17 00:02:53 -* @version v1.0 -*/ -@RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment= SpringBootTest.WebEnvironment.RANDOM_PORT,classes = {Application.class}) -public class RealRoomSourceServiceTest{ - - protected Logger logger = LoggerFactory.getLogger(RealRoomSourceServiceTest.class); - - @Autowired - private RealRoomSourceService realRoomSourceService; - @Autowired - private TestRestTemplate restTemplate; - - /** - * @Description:测试新增房东-房源表 接口 - */ - @Test - public void testAdd(){ - //todo test code - RealRoomSourceVO vo = new RealRoomSourceVO(); - - ResultDto resultDto = restTemplate.postForEntity("/realRoomSource/add",vo, ResultDto.class).getBody(); - System.out.println(JSON.toJSONString(resultDto)); - } - - /** - * @Description:测试修改房东-房源表 - */ - @Test - public void testUpdate(){ - //todo test code - RealRoomSourceVO vo = new RealRoomSourceVO(); - ResultDto resultDto = restTemplate.postForEntity("/realRoomSource/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("/realRoomSource/delete",id, ResultDto.class).getBody(); - System.out.println(JSON.toJSONString(resultDto)); - } - - /** - * @Description:但是根据ID获取房东-房源表单条记录 - */ - @Test - public void testGetById(){ - //todo test code - ResultDataDto resultDataDto = restTemplate.getForEntity("/realRoomSource/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/lightsnail/app/user/crm/core/service/test/RoomAgentOrderServiceTest.java b/codemaker-springboot/src/test/java/com/lightsnail/app/user/crm/core/service/test/RoomAgentOrderServiceTest.java deleted file mode 100644 index 98c281ad1663a6c74735590e98754674f65fa725..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/test/java/com/lightsnail/app/user/crm/core/service/test/RoomAgentOrderServiceTest.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.lightsnail.app.user.crm.core.service.test; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.lightsnail.app.user.crm.core.service.RoomAgentOrderService; -import com.lightsnail.app.user.crm.core.vo.RoomAgentOrderVO; -import com.lightsnail.app.user.crm.core.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:fanchunshuai -* @CreateTime:2020-11-17 00:02:54 -* @version v1.0 -*/ -@RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment= SpringBootTest.WebEnvironment.RANDOM_PORT,classes = {Application.class}) -public class RoomAgentOrderServiceTest{ - - protected Logger logger = LoggerFactory.getLogger(RoomAgentOrderServiceTest.class); - - @Autowired - private RoomAgentOrderService roomAgentOrderService; - @Autowired - private TestRestTemplate restTemplate; - - /** - * @Description:测试新增代理人-签单表 接口 - */ - @Test - public void testAdd(){ - //todo test code - RoomAgentOrderVO vo = new RoomAgentOrderVO(); - - ResultDto resultDto = restTemplate.postForEntity("/roomAgentOrder/add",vo, ResultDto.class).getBody(); - System.out.println(JSON.toJSONString(resultDto)); - } - - /** - * @Description:测试修改代理人-签单表 - */ - @Test - public void testUpdate(){ - //todo test code - RoomAgentOrderVO vo = new RoomAgentOrderVO(); - ResultDto resultDto = restTemplate.postForEntity("/roomAgentOrder/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("/roomAgentOrder/delete",id, ResultDto.class).getBody(); - System.out.println(JSON.toJSONString(resultDto)); - } - - /** - * @Description:但是根据ID获取代理人-签单表单条记录 - */ - @Test - public void testGetById(){ - //todo test code - ResultDataDto resultDataDto = restTemplate.getForEntity("/roomAgentOrder/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/lightsnail/app/user/crm/core/service/test/RoomAgentServiceTest.java b/codemaker-springboot/src/test/java/com/lightsnail/app/user/crm/core/service/test/RoomAgentServiceTest.java deleted file mode 100644 index 1550a279c73aed0bc1c7e9081adac729e6dd19b2..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/test/java/com/lightsnail/app/user/crm/core/service/test/RoomAgentServiceTest.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.lightsnail.app.user.crm.core.service.test; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.lightsnail.app.user.crm.core.service.RoomAgentService; -import com.lightsnail.app.user.crm.core.vo.RoomAgentVO; -import com.lightsnail.app.user.crm.core.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:fanchunshuai -* @CreateTime:2020-11-17 00:02:53 -* @version v1.0 -*/ -@RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment= SpringBootTest.WebEnvironment.RANDOM_PORT,classes = {Application.class}) -public class RoomAgentServiceTest{ - - protected Logger logger = LoggerFactory.getLogger(RoomAgentServiceTest.class); - - @Autowired - private RoomAgentService roomAgentService; - @Autowired - private TestRestTemplate restTemplate; - - /** - * @Description:测试新增代理人表 接口 - */ - @Test - public void testAdd(){ - //todo test code - RoomAgentVO vo = new RoomAgentVO(); - - ResultDto resultDto = restTemplate.postForEntity("/roomAgent/add",vo, ResultDto.class).getBody(); - System.out.println(JSON.toJSONString(resultDto)); - } - - /** - * @Description:测试修改代理人表 - */ - @Test - public void testUpdate(){ - //todo test code - RoomAgentVO vo = new RoomAgentVO(); - ResultDto resultDto = restTemplate.postForEntity("/roomAgent/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("/roomAgent/delete",id, ResultDto.class).getBody(); - System.out.println(JSON.toJSONString(resultDto)); - } - - /** - * @Description:但是根据ID获取代理人表单条记录 - */ - @Test - public void testGetById(){ - //todo test code - ResultDataDto resultDataDto = restTemplate.getForEntity("/roomAgent/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/lightsnail/app/user/crm/core/service/test/RoomLandlordServiceTest.java b/codemaker-springboot/src/test/java/com/lightsnail/app/user/crm/core/service/test/RoomLandlordServiceTest.java deleted file mode 100644 index dba8e4f28c04ad905a331589f5e1137432c43d1d..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/test/java/com/lightsnail/app/user/crm/core/service/test/RoomLandlordServiceTest.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.lightsnail.app.user.crm.core.service.test; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.lightsnail.app.user.crm.core.service.RoomLandlordService; -import com.lightsnail.app.user.crm.core.vo.RoomLandlordVO; -import com.lightsnail.app.user.crm.core.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:fanchunshuai -* @CreateTime:2020-11-17 00:02:53 -* @version v1.0 -*/ -@RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment= SpringBootTest.WebEnvironment.RANDOM_PORT,classes = {Application.class}) -public class RoomLandlordServiceTest{ - - protected Logger logger = LoggerFactory.getLogger(RoomLandlordServiceTest.class); - - @Autowired - private RoomLandlordService roomLandlordService; - @Autowired - private TestRestTemplate restTemplate; - - /** - * @Description:测试新增房东表 接口 - */ - @Test - public void testAdd(){ - //todo test code - RoomLandlordVO vo = new RoomLandlordVO(); - - ResultDto resultDto = restTemplate.postForEntity("/roomLandlord/add",vo, ResultDto.class).getBody(); - System.out.println(JSON.toJSONString(resultDto)); - } - - /** - * @Description:测试修改房东表 - */ - @Test - public void testUpdate(){ - //todo test code - RoomLandlordVO vo = new RoomLandlordVO(); - ResultDto resultDto = restTemplate.postForEntity("/roomLandlord/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("/roomLandlord/delete",id, ResultDto.class).getBody(); - System.out.println(JSON.toJSONString(resultDto)); - } - - /** - * @Description:但是根据ID获取房东表单条记录 - */ - @Test - public void testGetById(){ - //todo test code - ResultDataDto resultDataDto = restTemplate.getForEntity("/roomLandlord/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/lightsnail/app/user/crm/core/service/test/RoomPublishServiceTest.java b/codemaker-springboot/src/test/java/com/lightsnail/app/user/crm/core/service/test/RoomPublishServiceTest.java deleted file mode 100644 index aac3c9c2bc9aa4bdb6f3f213f1c95892ceab71e8..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/test/java/com/lightsnail/app/user/crm/core/service/test/RoomPublishServiceTest.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.lightsnail.app.user.crm.core.service.test; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.lightsnail.app.user.crm.core.service.RoomPublishService; -import com.lightsnail.app.user.crm.core.vo.RoomPublishVO; -import com.lightsnail.app.user.crm.core.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:fanchunshuai -* @CreateTime:2020-11-17 00:02:53 -* @version v1.0 -*/ -@RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment= SpringBootTest.WebEnvironment.RANDOM_PORT,classes = {Application.class}) -public class RoomPublishServiceTest{ - - protected Logger logger = LoggerFactory.getLogger(RoomPublishServiceTest.class); - - @Autowired - private RoomPublishService roomPublishService; - @Autowired - private TestRestTemplate restTemplate; - - /** - * @Description:测试新增代理人-房源发布表 接口 - */ - @Test - public void testAdd(){ - //todo test code - RoomPublishVO vo = new RoomPublishVO(); - - ResultDto resultDto = restTemplate.postForEntity("/roomPublish/add",vo, ResultDto.class).getBody(); - System.out.println(JSON.toJSONString(resultDto)); - } - - /** - * @Description:测试修改代理人-房源发布表 - */ - @Test - public void testUpdate(){ - //todo test code - RoomPublishVO vo = new RoomPublishVO(); - ResultDto resultDto = restTemplate.postForEntity("/roomPublish/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("/roomPublish/delete",id, ResultDto.class).getBody(); - System.out.println(JSON.toJSONString(resultDto)); - } - - /** - * @Description:但是根据ID获取代理人-房源发布表单条记录 - */ - @Test - public void testGetById(){ - //todo test code - ResultDataDto resultDataDto = restTemplate.getForEntity("/roomPublish/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/lightsnail/app/user/crm/core/service/test/RoomSubscribeServiceTest.java b/codemaker-springboot/src/test/java/com/lightsnail/app/user/crm/core/service/test/RoomSubscribeServiceTest.java deleted file mode 100644 index 72ed25665e939424c9ab76ca2ac0c92634de085b..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/test/java/com/lightsnail/app/user/crm/core/service/test/RoomSubscribeServiceTest.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.lightsnail.app.user.crm.core.service.test; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.lightsnail.app.user.crm.core.service.RoomSubscribeService; -import com.lightsnail.app.user.crm.core.vo.RoomSubscribeVO; -import com.lightsnail.app.user.crm.core.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:fanchunshuai -* @CreateTime:2020-11-17 00:02:53 -* @version v1.0 -*/ -@RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment= SpringBootTest.WebEnvironment.RANDOM_PORT,classes = {Application.class}) -public class RoomSubscribeServiceTest{ - - protected Logger logger = LoggerFactory.getLogger(RoomSubscribeServiceTest.class); - - @Autowired - private RoomSubscribeService roomSubscribeService; - @Autowired - private TestRestTemplate restTemplate; - - /** - * @Description:测试新增代理人-预约看房记录表 接口 - */ - @Test - public void testAdd(){ - //todo test code - RoomSubscribeVO vo = new RoomSubscribeVO(); - - ResultDto resultDto = restTemplate.postForEntity("/roomSubscribe/add",vo, ResultDto.class).getBody(); - System.out.println(JSON.toJSONString(resultDto)); - } - - /** - * @Description:测试修改代理人-预约看房记录表 - */ - @Test - public void testUpdate(){ - //todo test code - RoomSubscribeVO vo = new RoomSubscribeVO(); - ResultDto resultDto = restTemplate.postForEntity("/roomSubscribe/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("/roomSubscribe/delete",id, ResultDto.class).getBody(); - System.out.println(JSON.toJSONString(resultDto)); - } - - /** - * @Description:但是根据ID获取代理人-预约看房记录表单条记录 - */ - @Test - public void testGetById(){ - //todo test code - ResultDataDto resultDataDto = restTemplate.getForEntity("/roomSubscribe/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/lightsnail/schoolmanager/service/test/ClassServiceTest.java b/codemaker-springboot/src/test/java/com/lightsnail/schoolmanager/service/test/ClassServiceTest.java deleted file mode 100644 index 2f3683b181de34ff32f170b309409ed4137192c1..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/test/java/com/lightsnail/schoolmanager/service/test/ClassServiceTest.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.lightsnail.schoolmanager.service.test; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.lightsnail.schoolmanager.service.ClassService; -import com.lightsnail.schoolmanager.vo.ClassVO; -import com.lightsnail.schoolmanager.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:fanchunshuai -* @CreateTime:2021-06-25 16:08:54 -* @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/lightsnail/schoolmanager/service/test/ClassTeacherServiceTest.java b/codemaker-springboot/src/test/java/com/lightsnail/schoolmanager/service/test/ClassTeacherServiceTest.java deleted file mode 100644 index ab5c1b03ad8c78c87bad7cc3880b370b50804ce5..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/test/java/com/lightsnail/schoolmanager/service/test/ClassTeacherServiceTest.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.lightsnail.schoolmanager.service.test; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.lightsnail.schoolmanager.service.ClassTeacherService; -import com.lightsnail.schoolmanager.vo.ClassTeacherVO; -import com.lightsnail.schoolmanager.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:fanchunshuai -* @CreateTime:2021-06-25 16:08:54 -* @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/lightsnail/schoolmanager/service/test/StudentServiceTest.java b/codemaker-springboot/src/test/java/com/lightsnail/schoolmanager/service/test/StudentServiceTest.java deleted file mode 100644 index 5541ceaa063dbf29d5bd9770b4cd6399d3e10943..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/test/java/com/lightsnail/schoolmanager/service/test/StudentServiceTest.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.lightsnail.schoolmanager.service.test; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.lightsnail.schoolmanager.service.StudentService; -import com.lightsnail.schoolmanager.vo.StudentVO; -import com.lightsnail.schoolmanager.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:fanchunshuai -* @CreateTime:2021-06-25 16:08:54 -* @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/lightsnail/schoolmanager/service/test/TeacherServiceTest.java b/codemaker-springboot/src/test/java/com/lightsnail/schoolmanager/service/test/TeacherServiceTest.java deleted file mode 100644 index 1afd51709a2d84b3faa09097c4ad7cb31ec371fb..0000000000000000000000000000000000000000 --- a/codemaker-springboot/src/test/java/com/lightsnail/schoolmanager/service/test/TeacherServiceTest.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.lightsnail.schoolmanager.service.test; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.lightsnail.schoolmanager.service.TeacherService; -import com.lightsnail.schoolmanager.vo.TeacherVO; -import com.lightsnail.schoolmanager.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:fanchunshuai -* @CreateTime:2021-06-25 16:08:54 -* @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-springcloud/pom.xml b/codemaker-springcloud/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..f81c3a5ecc6d418ae84bbd29289ba24dc8cd4b21 --- /dev/null +++ b/codemaker-springcloud/pom.xml @@ -0,0 +1,191 @@ + + + 4.0.0 + pom + + com.codemaker.springcloud + codemaker-springcloud + 1.0-SNAPSHOT + + feign-api + feign-provider + + + codemaker-springcloud + Demo project for Spring Boot + + UTF-8 + 1.8 + 1.8 + 1.8 + 2.1.9.RELEASE + 1.2.0.Final + 4.8.0 + + + + + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + + + + com.alibaba.spring + spring-context-support + 1.0.5 + + + + org.mapstruct + mapstruct + ${mapstruct.version} + + + org.mapstruct + mapstruct-processor + ${mapstruct.version} + + + org.mapstruct + mapstruct-jdk8 + ${mapstruct.version} + + + + + commons-collections + commons-collections + 3.2.1 + + + + com.alibaba + fastjson + 1.2.72 + + + + commons-lang + commons-lang + 2.4 + + + + org.apache.dubbo + dubbo-registry-nacos + 2.7.3 + + + + + org.slf4j + slf4j-api + 1.7.28 + + + org.slf4j + slf4j-ext + 1.7.28 + + + + org.slf4j + slf4j-log4j12 + 1.7.28 + + + + org.springframework.boot + spring-boot-starter-log4j2 + ${spring-boot.version} + + + + org.aspectj + aspectjweaver + 1.9.4 + + + + org.aspectj + aspectjrt + 1.8.13 + + + + org.assertj + assertj-core + 3.9.1 + + + + + org.apache.rocketmq + rocketmq-client + ${rocketmq.version} + + + + org.projectlombok + lombok + 1.18.12 + + + + com.coderman.utils + coderman-utils + 1.0.4-SNAPSHOT + + + + + org.springframework.cloud + spring-cloud-starter + 2.2.2.RELEASE + + + + + + + + aliyun-releases + 阿里云仓库 + https://maven.aliyun.com/repository/public + + + apache.snapshots.https + Apache Development Snapshot Repository + https://repository.apache.org/content/repositories/snapshots + + false + + + true + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-compiler-plugin + + 8 + 8 + + + + + + diff --git a/codemaker-springcloud/springcloud-api/pom.xml b/codemaker-springcloud/springcloud-api/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..05b24341ab1507011243bd2a8183bf88c731899c --- /dev/null +++ b/codemaker-springcloud/springcloud-api/pom.xml @@ -0,0 +1,63 @@ + + + + + codemaker-springcloud + com.codemaker.springcloud + 1.0-SNAPSHOT + + 4.0.0 + + com.coderman.springcloud + feign-api + 0.0.1-SNAPSHOT + springcloud-api + + http://www.example.com + + + UTF-8 + 1.8 + 1.8 + + + + + junit + junit + 4.11 + test + + + + com.coderman.utils + coderman-utils + + + + org.springframework + spring-web + + + + org.springframework.cloud + spring-cloud-openfeign + 2.2.2.RELEASE + + + org.springframework.cloud + spring-cloud-openfeign-core + 2.2.2.RELEASE + + + + org.projectlombok + lombok + + + + + + + diff --git a/codemaker-springcloud/springcloud-provider/pom.xml b/codemaker-springcloud/springcloud-provider/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..4e1ed826ed622f6393e1b13330082f639b562003 --- /dev/null +++ b/codemaker-springcloud/springcloud-provider/pom.xml @@ -0,0 +1,97 @@ + + + + 4.0.0 + + + codemaker-springcloud + com.codemaker.springcloud + 1.0-SNAPSHOT + + + com.coderman.springcloud + feign-provider + 0.0.1-SNAPSHOT + + springcloud-provider + + http://www.example.com + + + UTF-8 + 1.7 + 1.7 + + + + + junit + junit + 4.11 + test + + + + org.projectlombok + lombok + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework + spring-context + + + + org.springframework + spring-beans + + + + org.springframework + spring-expression + + + + com.coderman.springcloud + feign-api + 0.0.1-SNAPSHOT + + + + org.mapstruct + mapstruct + + + + org.mapstruct + mapstruct-jdk8 + + + + org.mapstruct + mapstruct-processor + + + + com.coderman.utils + coderman-utils + + + org.mybatis + mybatis-spring + 2.0.5 + compile + + + + + + + + diff --git a/doc/baseDB.md b/doc/baseDB.md new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/doc/baseDBandDDD.md b/doc/baseDBandDDD.md new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/doc/baseDBandDDDandInvoke.md b/doc/baseDBandDDDandInvoke.md new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/doc/baseDDD.md b/doc/baseDDD.md new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git "a/doc/img/codeMaker\346\250\241\345\235\227\345\214\205.png" "b/doc/img/codeMaker\346\250\241\345\235\227\345\214\205.png" new file mode 100644 index 0000000000000000000000000000000000000000..44186735b822f178ba6e63f01b488ef6d19b3c47 Binary files /dev/null and "b/doc/img/codeMaker\346\250\241\345\235\227\345\214\205.png" differ diff --git "a/doc/img/\345\244\251\347\224\273-\344\275\216\344\273\243\347\240\201\345\271\263\345\217\260(codeMaker)-v3-\351\242\204\350\247\210\347\211\210.png" "b/doc/img/\345\244\251\347\224\273-\344\275\216\344\273\243\347\240\201\345\271\263\345\217\260(codeMaker)-v3-\351\242\204\350\247\210\347\211\210.png" new file mode 100644 index 0000000000000000000000000000000000000000..8ca161ec72fd762b60ed16ee9376db76c9054c01 Binary files /dev/null and "b/doc/img/\345\244\251\347\224\273-\344\275\216\344\273\243\347\240\201\345\271\263\345\217\260(codeMaker)-v3-\351\242\204\350\247\210\347\211\210.png" differ diff --git "a/doc/img/\345\244\251\347\224\273-\345\277\253\351\200\237\347\224\237\346\210\220java\345\276\256\346\234\215\345\212\241\345\267\245\347\250\213\346\265\201\347\250\213\345\233\276.png" "b/doc/img/\345\244\251\347\224\273-\345\277\253\351\200\237\347\224\237\346\210\220java\345\276\256\346\234\215\345\212\241\345\267\245\347\250\213\346\265\201\347\250\213\345\233\276.png" new file mode 100644 index 0000000000000000000000000000000000000000..d5a8b9054faf5bd484b256d906ff67aef908b2f0 Binary files /dev/null and "b/doc/img/\345\244\251\347\224\273-\345\277\253\351\200\237\347\224\237\346\210\220java\345\276\256\346\234\215\345\212\241\345\267\245\347\250\213\346\265\201\347\250\213\345\233\276.png" differ diff --git "a/doc/img/\345\244\251\347\224\273-\345\277\253\351\200\237\347\224\237\346\210\220springboot\345\276\256\346\234\215\345\212\241\345\267\245\347\250\213\346\265\201\347\250\213\345\233\276.png" "b/doc/img/\345\244\251\347\224\273-\345\277\253\351\200\237\347\224\237\346\210\220springboot\345\276\256\346\234\215\345\212\241\345\267\245\347\250\213\346\265\201\347\250\213\345\233\276.png" new file mode 100644 index 0000000000000000000000000000000000000000..43ac300eacce951dd10deb9a1b21be48b9469a9d Binary files /dev/null and "b/doc/img/\345\244\251\347\224\273-\345\277\253\351\200\237\347\224\237\346\210\220springboot\345\276\256\346\234\215\345\212\241\345\267\245\347\250\213\346\265\201\347\250\213\345\233\276.png" differ diff --git a/todoList b/todoList index d1a664f9e7a85ec79c3a181d6e37ed1692862909..b8715d1d6722a97cf90cef0ef8c56fd00874939c 100644 --- a/todoList +++ b/todoList @@ -32,32 +32,69 @@ 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.2.2 版本(主要支持配置化，组件插件化，模块化架构,去除对coderutils的强依赖) + 1.支持按领域上下文和request,response分包策略，达到动态分包的效果(可全部平铺也可以按上下文分子包)(down) + 2.增加接口按服务维度持久化功能,基于文件(辅助对上下游适配层进行方法生成)，api文件生成-->集中式(这里持久化可能不是最优方案，已通过组件化架构升级解决) + 3.重构包动态引用模块，支持自定义引用包配置化,配置文件配置,支持组件插件化架构(已通过组件化架构升级解决) + 4.支持从plantuml领域文档中导出接口文档(down) + 5.支持动态query查询对象完善动态查询逻辑(down) + 6.增加自定义class类模版组件类，注册其他外部jar包类或者公共业务类，如PageBO,XxxUtils,MybatisConfig或者CommonService等(已通过组件化架构升级解决) + 7.支持业务领域DSL统一语言(读写操作)注册功能，扩展读写场景模式校验 ReadWriteTypeEnum-->基于自定义配置(down) + 8.增加cache类代码元素生成(down) + 9.增加create,response bo-->dto/vo的关联类型推导，辅助完善dto/vo模型 + 10.支持事件发布异步化的代码绘制(产生事件->发布->消费事件)(down) + 11.增加多个配置项支持组件插件化-->具体配置项(down) + 12.去除IClazzAdapter包模块，升级为plantUML文档依赖的可配置包(down) + 13.去除对coderman-utils包的强依赖,将其通过组件化架构改为弱依赖(down) + 14.通过派生类上下文对象提前初始化重构类转换工厂，减少冗余代码(down) + 15.对相对独立的工具类代码进行组件化管理，按场景需要进行动态化配置(down) + 16.删除相对独立的工具类代码生成逻辑，根据16条整体改善(down) + 17.增加cola应用的cola-feign-api模块，支持spring cloud 远程调用(down) + 18.增加codemaker-springcloud应用，来专门支持springcloud技术栈(down) + 19.增加feign类代码元素，与dubbo类似，提供api接口和参数并提供动态生成能力(down) + 20.重构codeMaker模块,增加codemaker-api,codemaker-apiImpl模块开放低代码设计模型,组件扫描,代码元素装饰接口能力 + 21.根据20条的改动整体支持组件化和提供二次开发能力(down) -1.3.0 版本(进行一次整体的架构升级) + + + + + + + 思考总结 + 12.增加多个配置项支持组件插件化 + 13.组件类型:业务服务包，中间件包，自定义封装工具包，自定义工具独立类 + 14.设计思想:兼容并蓄,在codemaker的组件化架构设计中一切业务组件，中间件，脚手架都是组件都是可配置的。 + + + + +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表作为数据库元数据信息的来源 + 5.降低对数据库链接的强依赖，以数据库e-r图或者excel表作为数据库元数据信息的来源(链接默认数据库即可) + 7.自定义代码模板/片段，并融入到代码生成流程中，进一步开放代码生成能力接口 + 8.自定义代码模板/片段，并融入到动态调用时序中 + 9.在代码生成流程中调用时序中增加代码段 + 10.在代码生成流程中调用时序识别范型 + 11.增加配置项相关代码生成 + 12.将数据库sql文件复制到项目工程里 + 13.将plantUMl文档调用时序文档复制到项目工程里 + 14.打通语雀等api文档管理软件 + 15.管理pom依赖,走自动生成,统一maven技术栈 + 16.扩展plantUML生成代码时允许依赖外部代码类(如plantUML类中定义了xxxBO,但是需要显示的继承BaseBO,BaseBO可以不用单独声明class) + + + + 6.支持 基于数据库模式， - 基于e-r图模式， - 基于领域文档模式， - 基于领域文档+数据库模式， - 基于领域文档+数据库/e-r图模式+调用时序文档模式 + 基于e-r图模式或者excel模式(todo)， + 基于动态DDD领域文档模式， + 基于动态DDD领域文档+数据库模式， + 基于动态DDD领域文档+数据库/e-r图模式+调用时序文档模式 1.4 平台化,是否具有平台化的能力 1.持久层存储 diff --git "a/\345\212\250\346\200\201\345\257\274\345\205\245\346\212\200\346\234\257\346\226\207\346\241\243" "b/\345\212\250\346\200\201\345\257\274\345\205\245\346\212\200\346\234\257\346\226\207\346\241\243" new file mode 100644 index 0000000000000000000000000000000000000000..a64fc75682878a967662236c17dc50f8398308dc --- /dev/null +++ "b/\345\212\250\346\200\201\345\257\274\345\205\245\346\212\200\346\234\257\346\226\207\346\241\243" @@ -0,0 +1,20 @@ +1. 场景1 + 只需要导入包，类似PageDTO, + 解决:通过要导入的目标类所在jar进行组件化注册，走组件化装饰，或者通过class-import.properties， + 在动态调用绘制的时候自动进行包导入 + +2. 场景2 + 项目第一次初始化需要导入工具类和一些BaseDAO或者配置类如MybatisConfig + 解决:增加需要导入复制到项目里的工具类配置，如第一次全量，后面删掉配置或者增量即可 + 需要对现有的工具类统一重构 +3. 场景3 + 项目后期迭代不需要导入工具类和一些BaseDAO或者配置类如MybatisConfig + 但是依然要导入并装饰代码类，如BaseEntity,BaseDTO,BaseDAO等等 + 对场景2和场景3的重合部分，如BaseDAO这种直接注册为single-class组件，走组件化装饰，对需要装饰的新代码进行装饰。 + 适用于初始化第一次项目和后期的迭代需求 + +4. 场景4 + 在plantUML中依然存在需要引用BaseDAO,BaseEntity,或者AbstractXXX的地方， + 解决:这里可以借用第一种方法进行包导入注册，对于BaseDAO,BaseEntity本身而言可以通过 + 场景2的方法来解决 + diff --git "a/\350\267\250\347\273\204\344\273\266\344\270\212\344\270\213\346\226\207\351\200\202\351\205\215\346\212\200\346\234\257\346\226\207\346\241\243" "b/\350\267\250\347\273\204\344\273\266\344\270\212\344\270\213\346\226\207\351\200\202\351\205\215\346\212\200\346\234\257\346\226\207\346\241\243" new file mode 100644 index 0000000000000000000000000000000000000000..c22fa96670a35ae692b853f30e22c3685366d308 --- /dev/null +++ "b/\350\267\250\347\273\204\344\273\266\344\270\212\344\270\213\346\226\207\351\200\202\351\205\215\346\212\200\346\234\257\346\226\207\346\241\243" @@ -0,0 +1,20 @@ +1.流程 +领域模型-->适配接口参数模型-->接口调用参数转换 + +1.导出BO +将需要调用下游接口的领域模型参数导出到domain.support.context包下，依然算BO() +领域模型BO本身提供数据转换的方法 +领域模型BO通过factory构建数据转换的方法 +BO与acl.adapter的适配接口参数做转换，构建转换层 +缺点比较多，忽略 + +2.导出DTO +将需要调用下游接口的领域模型参数导出到adapter.dto(复合对象则进行复制) +dto绑定到下游接口参数dto上，同时构建convert转换层(adapter.dto->acl.paramDTO) +由infrast领域实现层负责进行bo->dto的转换， +exportAclKey:CreateUserRequestDTO(a-1,b-2,c-3) + +1.在代码生成第一阶段先把领域模型要传递到下游的相关参数导出到dto +2.在调用时序绘制阶段把convert参数转方法构建出来，如果没有调用时序则不构建 + +