diff --git a/maku-boot-module/maku-module-generator/pom.xml b/maku-boot-module/maku-module-generator/pom.xml new file mode 100644 index 0000000..6c98542 --- /dev/null +++ b/maku-boot-module/maku-module-generator/pom.xml @@ -0,0 +1,20 @@ + + + net.maku + maku-boot-module + ${revision} + + 4.0.0 + maku-module-generator + jar + + + + net.maku + maku-generator-boot-starter + 2.0.2 + + + + \ No newline at end of file diff --git a/maku-boot-module/maku-module-generator/src/main/resources/auth.yml b/maku-boot-module/maku-module-generator/src/main/resources/auth.yml new file mode 100644 index 0000000..a3a6ad7 --- /dev/null +++ b/maku-boot-module/maku-module-generator/src/main/resources/auth.yml @@ -0,0 +1,3 @@ +auth: + ignore_urls: + - /maku-generator/** \ No newline at end of file diff --git a/maku-boot-module/maku-module-generator/src/main/resources/template/config.json b/maku-boot-module/maku-module-generator/src/main/resources/template/config.json new file mode 100644 index 0000000..033aae2 --- /dev/null +++ b/maku-boot-module/maku-module-generator/src/main/resources/template/config.json @@ -0,0 +1,66 @@ +{ + "project": { + "packageName": "net.maku", + "version": "1.0.0", + "backendPath": "D:\\generator\\maku-boot\\maku-server", + "frontendPath": "D:\\generator\\maku-admin" + }, + "developer": { + "author": "阿沐", + "email": "babamu@126.com" + }, + "templates": [ + { + "templateName": "java/Controller.java.ftl", + "generatorPath": "${backendPath}/src/main/java/${packagePath}/${moduleName}/controller/${ClassName}Controller.java" + }, + { + "templateName": "java/Service.java.ftl", + "generatorPath": "${backendPath}/src/main/java/${packagePath}/${moduleName}/service/${ClassName}Service.java" + }, + { + "templateName": "java/ServiceImpl.java.ftl", + "generatorPath": "${backendPath}/src/main/java/${packagePath}/${moduleName}/service/impl/${ClassName}ServiceImpl.java" + }, + { + "templateName": "java/Query.java.ftl", + "generatorPath": "${backendPath}/src/main/java/${packagePath}/${moduleName}/query/${ClassName}Query.java" + }, + { + "templateName": "java/Entity.java.ftl", + "generatorPath": "${backendPath}/src/main/java/${packagePath}/${moduleName}/entity/${ClassName}Entity.java" + }, + { + "templateName": "java/VO.java.ftl", + "generatorPath": "${backendPath}/src/main/java/${packagePath}/${moduleName}/vo/${ClassName}VO.java" + }, + { + "templateName": "java/Convert.java.ftl", + "generatorPath": "${backendPath}/src/main/java/${packagePath}/${moduleName}/convert/${ClassName}Convert.java" + }, + { + "templateName": "java/Dao.java.ftl", + "generatorPath": "${backendPath}/src/main/java/${packagePath}/${moduleName}/dao/${ClassName}Dao.java" + }, + { + "templateName": "xml/Dao.xml.ftl", + "generatorPath": "${backendPath}/src/main/resources/mapper/${moduleName}/${ClassName}Dao.xml" + }, + { + "templateName": "sql/menu.sql.ftl", + "generatorPath": "${backendPath}/menu/${functionName}_menu.sql" + }, + { + "templateName": "vue/api.ts.ftl", + "generatorPath": "${frontendPath}/src/api/${moduleName}/${functionName}.ts" + }, + { + "templateName": "vue/index.vue.ftl", + "generatorPath": "${frontendPath}/src/views/${moduleName}/${functionName}/index.vue" + }, + { + "templateName": "vue/add-or-update.vue.ftl", + "generatorPath": "${frontendPath}/src/views/${moduleName}/${functionName}/add-or-update.vue" + } + ] +} \ No newline at end of file diff --git a/maku-boot-module/maku-module-generator/src/main/resources/template/java/Controller.java.ftl b/maku-boot-module/maku-module-generator/src/main/resources/template/java/Controller.java.ftl new file mode 100644 index 0000000..b0e3170 --- /dev/null +++ b/maku-boot-module/maku-module-generator/src/main/resources/template/java/Controller.java.ftl @@ -0,0 +1,76 @@ +package ${package}.${moduleName}.controller; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.AllArgsConstructor; +import ${package}.framework.common.page.PageResult; +import ${package}.framework.common.utils.Result; +import ${package}.${moduleName}.convert.${ClassName}Convert; +import ${package}.${moduleName}.entity.${ClassName}Entity; +import ${package}.${moduleName}.service.${ClassName}Service; +import ${package}.${moduleName}.query.${ClassName}Query; +import ${package}.${moduleName}.vo.${ClassName}VO; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; + +/** +* ${tableComment} +* +* @author ${author} ${email} +* @since ${version} ${date} +*/ +@RestController +@RequestMapping("${moduleName}/${functionName}") +@Tag(name="${tableComment}") +@AllArgsConstructor +public class ${ClassName}Controller { + private final ${ClassName}Service ${className}Service; + + @GetMapping("page") + @Operation(summary = "分页") + @PreAuthorize("hasAuthority('${moduleName}:${functionName}:page')") + public Result> page(@Valid ${ClassName}Query query){ + PageResult<${ClassName}VO> page = ${className}Service.page(query); + + return Result.ok(page); + } + + @GetMapping("{id}") + @Operation(summary = "信息") + @PreAuthorize("hasAuthority('${moduleName}:${functionName}:info')") + public Result<${ClassName}VO> get(@PathVariable("id") Long id){ + ${ClassName}Entity entity = ${className}Service.getById(id); + + return Result.ok(${ClassName}Convert.INSTANCE.convert(entity)); + } + + @PostMapping + @Operation(summary = "保存") + @PreAuthorize("hasAuthority('${moduleName}:${functionName}:save')") + public Result save(@RequestBody ${ClassName}VO vo){ + ${className}Service.save(vo); + + return Result.ok(); + } + + @PutMapping + @Operation(summary = "修改") + @PreAuthorize("hasAuthority('${moduleName}:${functionName}:update')") + public Result update(@RequestBody @Valid ${ClassName}VO vo){ + ${className}Service.update(vo); + + return Result.ok(); + } + + @DeleteMapping + @Operation(summary = "删除") + @PreAuthorize("hasAuthority('${moduleName}:${functionName}:delete')") + public Result delete(@RequestBody List idList){ + ${className}Service.delete(idList); + + return Result.ok(); + } +} \ No newline at end of file diff --git a/maku-boot-module/maku-module-generator/src/main/resources/template/java/Convert.java.ftl b/maku-boot-module/maku-module-generator/src/main/resources/template/java/Convert.java.ftl new file mode 100644 index 0000000..2953197 --- /dev/null +++ b/maku-boot-module/maku-module-generator/src/main/resources/template/java/Convert.java.ftl @@ -0,0 +1,26 @@ +package ${package}.${moduleName}.convert; + +import ${package}.${moduleName}.entity.${ClassName}Entity; +import ${package}.${moduleName}.vo.${ClassName}VO; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +import java.util.List; + +/** +* ${tableComment} +* +* @author ${author} ${email} +* @since ${version} ${date} +*/ +@Mapper +public interface ${ClassName}Convert { + ${ClassName}Convert INSTANCE = Mappers.getMapper(${ClassName}Convert.class); + + ${ClassName}Entity convert(${ClassName}VO vo); + + ${ClassName}VO convert(${ClassName}Entity entity); + + List<${ClassName}VO> convertList(List<${ClassName}Entity> list); + +} \ No newline at end of file diff --git a/maku-boot-module/maku-module-generator/src/main/resources/template/java/Dao.java.ftl b/maku-boot-module/maku-module-generator/src/main/resources/template/java/Dao.java.ftl new file mode 100644 index 0000000..1e947de --- /dev/null +++ b/maku-boot-module/maku-module-generator/src/main/resources/template/java/Dao.java.ftl @@ -0,0 +1,16 @@ +package ${package}.${moduleName}.dao; + +import ${package}.framework.common.dao.BaseDao; +import ${package}.${moduleName}.entity.${ClassName}Entity; +import org.apache.ibatis.annotations.Mapper; + +/** +* ${tableComment} +* +* @author ${author} ${email} +* @since ${version} ${date} +*/ +@Mapper +public interface ${ClassName}Dao extends BaseDao<${ClassName}Entity> { + +} \ No newline at end of file diff --git a/maku-boot-module/maku-module-generator/src/main/resources/template/java/Entity.java.ftl b/maku-boot-module/maku-module-generator/src/main/resources/template/java/Entity.java.ftl new file mode 100644 index 0000000..2a47341 --- /dev/null +++ b/maku-boot-module/maku-module-generator/src/main/resources/template/java/Entity.java.ftl @@ -0,0 +1,46 @@ +package ${package}.${moduleName}.entity; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import com.baomidou.mybatisplus.annotation.*; +<#list importList as i> +import ${i!}; + +<#if baseClass??> +import ${baseClass.packageName}.${baseClass.code}; + + +/** + * ${tableComment} + * + * @author ${author} ${email} + * @since ${version} ${date} + */ +<#if baseClass??>@EqualsAndHashCode(callSuper=false) +@Data +@TableName("${tableName}") +public class ${ClassName}Entity<#if baseClass??> extends ${baseClass.code} { +<#list fieldList as field> +<#if !field.baseField> + <#if field.fieldComment!?length gt 0> + /** + * ${field.fieldComment} + */ + + <#if field.autoFill == "INSERT"> + @TableField(fill = FieldFill.INSERT) + + <#if field.autoFill == "INSERT_UPDATE"> + @TableField(fill = FieldFill.INSERT_UPDATE) + + <#if field.autoFill == "UPDATE"> + @TableField(fill = FieldFill.UPDATE) + + <#if field.primaryPk> + @TableId + + private ${field.attrType} ${field.attrName}; + + + +} \ No newline at end of file diff --git a/maku-boot-module/maku-module-generator/src/main/resources/template/java/Query.java.ftl b/maku-boot-module/maku-module-generator/src/main/resources/template/java/Query.java.ftl new file mode 100644 index 0000000..57d53a5 --- /dev/null +++ b/maku-boot-module/maku-module-generator/src/main/resources/template/java/Query.java.ftl @@ -0,0 +1,29 @@ +package ${package}.${moduleName}.query; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import ${package}.framework.common.query.Query; + +<#list importList as i> +import ${i!}; + + +/** +* ${tableComment}查询 +* +* @author ${author} ${email} +* @since ${version} ${date} +*/ +@Data +@EqualsAndHashCode(callSuper = false) +@Schema(description = "${tableComment}查询") +public class ${ClassName}Query extends Query { +<#list queryList as field> + <#if field.fieldComment!?length gt 0> + @Schema(description = "${field.fieldComment}") + + private ${field.attrType} ${field.attrName}; + + +} \ No newline at end of file diff --git a/maku-boot-module/maku-module-generator/src/main/resources/template/java/Service.java.ftl b/maku-boot-module/maku-module-generator/src/main/resources/template/java/Service.java.ftl new file mode 100644 index 0000000..2b20601 --- /dev/null +++ b/maku-boot-module/maku-module-generator/src/main/resources/template/java/Service.java.ftl @@ -0,0 +1,26 @@ +package ${package}.${moduleName}.service; + +import ${package}.framework.common.page.PageResult; +import ${package}.framework.common.service.BaseService; +import ${package}.${moduleName}.vo.${ClassName}VO; +import ${package}.${moduleName}.query.${ClassName}Query; +import ${package}.${moduleName}.entity.${ClassName}Entity; + +import java.util.List; + +/** + * ${tableComment} + * + * @author ${author} ${email} + * @since ${version} ${date} + */ +public interface ${ClassName}Service extends BaseService<${ClassName}Entity> { + + PageResult<${ClassName}VO> page(${ClassName}Query query); + + void save(${ClassName}VO vo); + + void update(${ClassName}VO vo); + + void delete(List idList); +} \ No newline at end of file diff --git a/maku-boot-module/maku-module-generator/src/main/resources/template/java/ServiceImpl.java.ftl b/maku-boot-module/maku-module-generator/src/main/resources/template/java/ServiceImpl.java.ftl new file mode 100644 index 0000000..d7d5fa4 --- /dev/null +++ b/maku-boot-module/maku-module-generator/src/main/resources/template/java/ServiceImpl.java.ftl @@ -0,0 +1,63 @@ +package ${package}.${moduleName}.service.impl; + +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import lombok.AllArgsConstructor; +import ${package}.framework.common.page.PageResult; +import ${package}.framework.common.service.impl.BaseServiceImpl; +import ${package}.${moduleName}.convert.${ClassName}Convert; +import ${package}.${moduleName}.entity.${ClassName}Entity; +import ${package}.${moduleName}.query.${ClassName}Query; +import ${package}.${moduleName}.vo.${ClassName}VO; +import ${package}.${moduleName}.dao.${ClassName}Dao; +import ${package}.${moduleName}.service.${ClassName}Service; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * ${tableComment} + * + * @author ${author} ${email} + * @since ${version} ${date} + */ +@Service +@AllArgsConstructor +public class ${ClassName}ServiceImpl extends BaseServiceImpl<${ClassName}Dao, ${ClassName}Entity> implements ${ClassName}Service { + + @Override + public PageResult<${ClassName}VO> page(${ClassName}Query query) { + IPage<${ClassName}Entity> page = baseMapper.selectPage(getPage(query), getWrapper(query)); + + return new PageResult<>(${ClassName}Convert.INSTANCE.convertList(page.getRecords()), page.getTotal()); + } + + private LambdaQueryWrapper<${ClassName}Entity> getWrapper(${ClassName}Query query){ + LambdaQueryWrapper<${ClassName}Entity> wrapper = Wrappers.lambdaQuery(); + + return wrapper; + } + + @Override + public void save(${ClassName}VO vo) { + ${ClassName}Entity entity = ${ClassName}Convert.INSTANCE.convert(vo); + + baseMapper.insert(entity); + } + + @Override + public void update(${ClassName}VO vo) { + ${ClassName}Entity entity = ${ClassName}Convert.INSTANCE.convert(vo); + + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(List idList) { + removeByIds(idList); + } + +} \ No newline at end of file diff --git a/maku-boot-module/maku-module-generator/src/main/resources/template/java/VO.java.ftl b/maku-boot-module/maku-module-generator/src/main/resources/template/java/VO.java.ftl new file mode 100644 index 0000000..1e89511 --- /dev/null +++ b/maku-boot-module/maku-module-generator/src/main/resources/template/java/VO.java.ftl @@ -0,0 +1,34 @@ +package ${package}.${moduleName}.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import java.io.Serializable; +import ${package}.framework.common.utils.DateUtils; +<#list importList as i> +import ${i!}; + + +/** +* ${tableComment} +* +* @author ${author} ${email} +* @since ${version} ${date} +*/ +@Data +@Schema(description = "${tableComment}") +public class ${ClassName}VO implements Serializable { + private static final long serialVersionUID = 1L; + +<#list fieldList as field> + <#if field.fieldComment!?length gt 0> + @Schema(description = "${field.fieldComment}") + + <#if field.attrType == 'Date'> + @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) + + private ${field.attrType} ${field.attrName}; + + + +} \ No newline at end of file diff --git a/maku-boot-module/maku-module-generator/src/main/resources/template/sql/menu.sql.ftl b/maku-boot-module/maku-module-generator/src/main/resources/template/sql/menu.sql.ftl new file mode 100644 index 0000000..8b74b2e --- /dev/null +++ b/maku-boot-module/maku-module-generator/src/main/resources/template/sql/menu.sql.ftl @@ -0,0 +1,18 @@ +<#assign dbTime = "now()"> +<#if dbType=="SQLServer"> + <#assign dbTime = "getDate()"> + + +-- 初始化菜单 +INSERT INTO sys_menu (pid, name, url, authority, type, open_style, icon, sort, version, deleted, creator, create_time, updater, update_time) VALUES (1, '${tableComment!}', '${moduleName}/${functionName}/index', NULL, 0, 0, 'icon-menu', 0, 0, 0, 10000, ${dbTime}, 10000, ${dbTime}); + +-- 菜单ID +<#if dbType=="SQLServer"> +DECLARE @menuId int + +set @menuId = @@identity; + +INSERT INTO sys_menu (pid, name, url, authority, type, open_style, icon, sort, version, deleted, creator, create_time, updater, update_time) VALUES ((SELECT @menuId), '查看', '', '${moduleName}:${functionName}:page', 1, 0, '', 0, 0, 0, 10000, ${dbTime}, 10000, ${dbTime}); +INSERT INTO sys_menu (pid, name, url, authority, type, open_style, icon, sort, version, deleted, creator, create_time, updater, update_time) VALUES ((SELECT @menuId), '新增', '', '${moduleName}:${functionName}:save', 1, 0, '', 1, 0, 0, 10000, ${dbTime}, 10000, ${dbTime}); +INSERT INTO sys_menu (pid, name, url, authority, type, open_style, icon, sort, version, deleted, creator, create_time, updater, update_time) VALUES ((SELECT @menuId), '修改', '', '${moduleName}:${functionName}:update,${moduleName}:${functionName}:info', 1, 0, '', 2, 0, 0, 10000, ${dbTime}, 10000, ${dbTime}); +INSERT INTO sys_menu (pid, name, url, authority, type, open_style, icon, sort, version, deleted, creator, create_time, updater, update_time) VALUES ((SELECT @menuId), '删除', '', '${moduleName}:${functionName}:delete', 1, 0, '', 3, 0, 0, 10000, ${dbTime}, 10000, ${dbTime}); diff --git a/maku-boot-module/maku-module-generator/src/main/resources/template/vue/add-or-update.vue.ftl b/maku-boot-module/maku-module-generator/src/main/resources/template/vue/add-or-update.vue.ftl new file mode 100644 index 0000000..6e93f7c --- /dev/null +++ b/maku-boot-module/maku-module-generator/src/main/resources/template/vue/add-or-update.vue.ftl @@ -0,0 +1,138 @@ + + + diff --git a/maku-boot-module/maku-module-generator/src/main/resources/template/vue/api.ts.ftl b/maku-boot-module/maku-module-generator/src/main/resources/template/vue/api.ts.ftl new file mode 100644 index 0000000..d77c283 --- /dev/null +++ b/maku-boot-module/maku-module-generator/src/main/resources/template/vue/api.ts.ftl @@ -0,0 +1,13 @@ +import service from '@/utils/request' + +export const use${FunctionName}Api = (id: number) => { + return service.get('/${moduleName}/${functionName}/' + id) +} + +export const use${FunctionName}SubmitApi = (dataForm: any) => { + if (dataForm.id) { + return service.put('/${moduleName}/${functionName}', dataForm) + } else { + return service.post('/${moduleName}/${functionName}', dataForm) + } +} \ No newline at end of file diff --git a/maku-boot-module/maku-module-generator/src/main/resources/template/vue/index.vue.ftl b/maku-boot-module/maku-module-generator/src/main/resources/template/vue/index.vue.ftl new file mode 100644 index 0000000..322399f --- /dev/null +++ b/maku-boot-module/maku-module-generator/src/main/resources/template/vue/index.vue.ftl @@ -0,0 +1,136 @@ + + + diff --git a/maku-boot-module/maku-module-generator/src/main/resources/template/xml/Dao.xml.ftl b/maku-boot-module/maku-module-generator/src/main/resources/template/xml/Dao.xml.ftl new file mode 100644 index 0000000..2b895c7 --- /dev/null +++ b/maku-boot-module/maku-module-generator/src/main/resources/template/xml/Dao.xml.ftl @@ -0,0 +1,12 @@ + + + + + + + <#list fieldList as field> + + + + + \ No newline at end of file diff --git a/maku-boot-module/pom.xml b/maku-boot-module/pom.xml index d67f8c1..c64d43d 100644 --- a/maku-boot-module/pom.xml +++ b/maku-boot-module/pom.xml @@ -11,6 +11,7 @@ maku-module-quartz maku-module-message + maku-module-generator \ No newline at end of file diff --git a/maku-server/pom.xml b/maku-server/pom.xml index 1da61c6..7d9cbb2 100644 --- a/maku-server/pom.xml +++ b/maku-server/pom.xml @@ -10,7 +10,7 @@ jar - + net.maku maku-boot-system ${revision} @@ -20,16 +20,21 @@ maku-boot-new ${revision} - - - - - - - - - - + + net.maku + maku-module-quartz + ${revision} + + + net.maku + maku-module-generator + ${revision} + + + net.maku + maku-module-message + ${revision} + com.github.xiaoymin knife4j-springdoc-ui