From 83288b1f415058be982f3d822716fa16b46bda49 Mon Sep 17 00:00:00 2001 From: smallchill Date: Sun, 24 Feb 2019 12:14:38 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20develop=E6=A8=A1=E5=9D=97=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E7=A8=8B=E5=86=85=E4=BB=A3=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E6=88=90=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springblade/test}/CodeGenerator.java | 4 +- .../resources/templates/controller.java.vm | 151 +++++++++++++++ .../test/resources/templates/entity.java.vm | 162 ++++++++++++++++ .../resources/templates/entityDTO.java.vm | 39 ++++ .../test/resources/templates/entityVO.java.vm | 45 +++++ .../test/resources/templates/mapper.java.vm | 47 +++++ .../test/resources/templates/mapper.xml.vm | 44 +++++ .../templates/props/generator.properties | 5 + .../test/resources/templates/saber/api.js.vm | 50 +++++ .../resources/templates/saber/crud.vue.vm | 174 ++++++++++++++++++ .../test/resources/templates/service.java.vm | 46 +++++ .../resources/templates/serviceImpl.java.vm | 48 +++++ .../resources/templates/sword/action.js.vm | 37 ++++ .../test/resources/templates/sword/add.js.vm | 73 ++++++++ .../test/resources/templates/sword/edit.js.vm | 97 ++++++++++ .../test/resources/templates/sword/list.js.vm | 82 +++++++++ .../resources/templates/sword/model.js.vm | 84 +++++++++ .../resources/templates/sword/service.js.vm | 26 +++ .../test/resources/templates/sword/view.js.vm | 74 ++++++++ .../test/resources/templates/wrapper.java.vm | 52 ++++++ 20 files changed, 1339 insertions(+), 1 deletion(-) rename blade-ops/blade-develop/src/{main/java/org/springblade/develop/support => test/java/org/springblade/test}/CodeGenerator.java (96%) create mode 100644 blade-ops/blade-develop/src/test/resources/templates/controller.java.vm create mode 100644 blade-ops/blade-develop/src/test/resources/templates/entity.java.vm create mode 100644 blade-ops/blade-develop/src/test/resources/templates/entityDTO.java.vm create mode 100644 blade-ops/blade-develop/src/test/resources/templates/entityVO.java.vm create mode 100644 blade-ops/blade-develop/src/test/resources/templates/mapper.java.vm create mode 100644 blade-ops/blade-develop/src/test/resources/templates/mapper.xml.vm create mode 100644 blade-ops/blade-develop/src/test/resources/templates/props/generator.properties create mode 100644 blade-ops/blade-develop/src/test/resources/templates/saber/api.js.vm create mode 100644 blade-ops/blade-develop/src/test/resources/templates/saber/crud.vue.vm create mode 100644 blade-ops/blade-develop/src/test/resources/templates/service.java.vm create mode 100644 blade-ops/blade-develop/src/test/resources/templates/serviceImpl.java.vm create mode 100644 blade-ops/blade-develop/src/test/resources/templates/sword/action.js.vm create mode 100644 blade-ops/blade-develop/src/test/resources/templates/sword/add.js.vm create mode 100644 blade-ops/blade-develop/src/test/resources/templates/sword/edit.js.vm create mode 100644 blade-ops/blade-develop/src/test/resources/templates/sword/list.js.vm create mode 100644 blade-ops/blade-develop/src/test/resources/templates/sword/model.js.vm create mode 100644 blade-ops/blade-develop/src/test/resources/templates/sword/service.js.vm create mode 100644 blade-ops/blade-develop/src/test/resources/templates/sword/view.js.vm create mode 100644 blade-ops/blade-develop/src/test/resources/templates/wrapper.java.vm diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/develop/support/CodeGenerator.java b/blade-ops/blade-develop/src/test/java/org/springblade/test/CodeGenerator.java similarity index 96% rename from blade-ops/blade-develop/src/main/java/org/springblade/develop/support/CodeGenerator.java rename to blade-ops/blade-develop/src/test/java/org/springblade/test/CodeGenerator.java index accf4c11..6a91064d 100644 --- a/blade-ops/blade-develop/src/main/java/org/springblade/develop/support/CodeGenerator.java +++ b/blade-ops/blade-develop/src/test/java/org/springblade/test/CodeGenerator.java @@ -14,9 +14,11 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ -package org.springblade.develop.support; +package org.springblade.test; +import org.springblade.develop.support.BladeGenerator; + /** * 代码生成器 * diff --git a/blade-ops/blade-develop/src/test/resources/templates/controller.java.vm b/blade-ops/blade-develop/src/test/resources/templates/controller.java.vm new file mode 100644 index 00000000..6f19caa3 --- /dev/null +++ b/blade-ops/blade-develop/src/test/resources/templates/controller.java.vm @@ -0,0 +1,151 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package $!{package.Controller}; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import javax.validation.Valid; + +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.system.feign.IDictClient; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springframework.web.bind.annotation.*; +#if($!{superEntityClass}) +import org.springframework.web.bind.annotation.RequestParam; +#end +import com.baomidou.mybatisplus.core.metadata.IPage; +import $!{package.Entity}.$!{entity}; +#set($voPackage=$package.Entity.replace("entity","vo")) +import $!{voPackage}.$!{entity}VO; +#set($wrapperPackage=$package.Entity.replace("entity","wrapper")) +import $!{wrapperPackage}.$!{entity}Wrapper; +import $!{package.Service}.$!{table.serviceName}; +#if($!{superControllerClassPackage}) +import $!{superControllerClassPackage}; +#end +#if(!$!{superEntityClass}) +#end +import java.util.List; + +/** + * $!{table.comment} 控制器 + * + * @author $!{author} + * @since $!{date} + */ +@RestController +@AllArgsConstructor +@RequestMapping("#if($!{package.ModuleName})/$!{package.ModuleName}#end/$!{table.entityPath}") +@Api(value = "$!{table.comment}", tags = "$!{table.comment}接口") +#if($!{superControllerClass}) +public class $!{table.controllerName} extends $!{superControllerClass} { +#else +public class $!{table.controllerName} { +#end + + private $!{table.serviceName} $!{table.entityPath}Service; + + private IDictClient dictClient; + + /** + * 详情 + */ + @GetMapping("/detail") + @ApiOperation(value = "详情", notes = "传入$!{table.entityPath}", position = 1) + public R<$!{entity}VO> detail($!{entity} $!{table.entityPath}) { + $!{entity} detail = $!{table.entityPath}Service.getOne(Condition.getQueryWrapper($!{table.entityPath})); + $!{entity}Wrapper $!{table.entityPath}Wrapper = new $!{entity}Wrapper(dictClient); + return R.data($!{table.entityPath}Wrapper.entityVO(detail)); + } + + /** + * 分页 $!{table.comment} + */ + @GetMapping("/list") + @ApiOperation(value = "分页", notes = "传入$!{table.entityPath}", position = 2) + public R> list($!{entity} $!{table.entityPath}, Query query) { + IPage<$!{entity}> pages = $!{table.entityPath}Service.page(Condition.getPage(query), Condition.getQueryWrapper($!{table.entityPath})); + $!{entity}Wrapper $!{table.entityPath}Wrapper = new $!{entity}Wrapper(dictClient); + return R.data($!{table.entityPath}Wrapper.pageVO(pages)); + } + + /** + * 自定义分页 $!{table.comment} + */ + @GetMapping("/page") + @ApiOperation(value = "分页", notes = "传入$!{table.entityPath}", position = 3) + public R> page($!{entity}VO $!{table.entityPath}, Query query) { + IPage<$!{entity}VO> pages = $!{table.entityPath}Service.select$!{entity}Page(Condition.getPage(query), $!{table.entityPath}); + return R.data(pages); + } + + /** + * 新增 $!{table.comment} + */ + @PostMapping("/save") + @ApiOperation(value = "新增", notes = "传入$!{table.entityPath}", position = 4) + public R save(@Valid @RequestBody $!{entity} $!{table.entityPath}) { + return R.status($!{table.entityPath}Service.save($!{table.entityPath})); + } + + /** + * 修改 $!{table.comment} + */ + @PostMapping("/update") + @ApiOperation(value = "修改", notes = "传入$!{table.entityPath}", position = 5) + public R update(@Valid @RequestBody $!{entity} $!{table.entityPath}) { + return R.status($!{table.entityPath}Service.updateById($!{table.entityPath})); + } + + /** + * 新增或修改 $!{table.comment} + */ + @PostMapping("/submit") + @ApiOperation(value = "新增或修改", notes = "传入$!{table.entityPath}", position = 6) + public R submit(@Valid @RequestBody $!{entity} $!{table.entityPath}) { + return R.status($!{table.entityPath}Service.saveOrUpdate($!{table.entityPath})); + } + + #if($!{superEntityClass}) + + /** + * 删除 $!{table.comment} + */ + @PostMapping("/remove") + @ApiOperation(value = "逻辑删除", notes = "传入ids", position = 7) + public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return R.status($!{table.entityPath}Service.deleteLogic(Func.toIntList(ids))); + } + + #else + + /** + * 删除 $!{table.comment} + */ + @PostMapping("/remove") + @ApiOperation(value = "物理删除", notes = "传入ids", position = 7) + public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return R.status($!{table.entityPath}Service.removeByIds(Func.toIntList(ids))); + } + + #end + +} diff --git a/blade-ops/blade-develop/src/test/resources/templates/entity.java.vm b/blade-ops/blade-develop/src/test/resources/templates/entity.java.vm new file mode 100644 index 00000000..e5310870 --- /dev/null +++ b/blade-ops/blade-develop/src/test/resources/templates/entity.java.vm @@ -0,0 +1,162 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package $!{package.Entity}; + +#foreach($pkg in $!{table.importPackages}) +import $!{pkg}; +#end +#if($!{entityLombokModel}) +import lombok.Data; +import lombok.EqualsAndHashCode; +#end +#if($!{swagger2}) +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +#end + +/** + * $!{table.comment}实体类 + * + * @author $!{author} + * @since $!{date} + */ +#if($!{entityLombokModel}) +@Data +#end +#if($!{table.convert}) +@TableName("$!{table.name}") +#end +#if($!{superEntityClass}) +@EqualsAndHashCode(callSuper = true) +#end +#if($!{swagger2}) +@ApiModel(value = "$!{entity}对象", description = #if ("$!{table.comment}"=="")"$!{entity}对象"#else"$!{table.comment}"#end) +#end +#if($!{superEntityClass}) +public class $!{entity} extends $!{superEntityClass}#if($!{activeRecord})<$!{entity}>#end { +#elseif($!{activeRecord}) +@Accessors(chain = true) +public class $!{entity} extends Model<$!{entity}> { +#else +public class $!{entity} implements Serializable { +#end + + private static final long serialVersionUID = 1L; + +## ---------- BEGIN 字段循环遍历 ---------- +#foreach($field in $!{table.fields}) +#if($!{field.keyFlag}) +#set($keyPropertyName=$!{field.propertyName}) +#end +#if("$!field.comment" != "") + /** + * $!{field.comment} + */ + #if($!{swagger2}) + @ApiModelProperty(value = "$!{field.comment}") + #end +#end +#if($!{field.keyFlag}) +## 主键 +#if($!{field.keyIdentityFlag}) + @TableId(value = "$!{field.name}", type = IdType.AUTO) +#elseif(!$null.isNull($!{idType}) && "$!idType" != "") + @TableId(value = "$!{field.name}", type = IdType.$!{idType}) +#elseif($!{field.convert}) + @TableId("$!{field.name}") +#end +## 普通字段 +#elseif($!{field.fill}) +## ----- 存在字段填充设置 ----- +#if($!{field.convert}) + @TableField(value = "$!{field.name}", fill = FieldFill.$!{field.fill}) +#else + @TableField(fill = FieldFill.$!{field.fill}) +#end +#elseif($!{field.convert}) + @TableField("$!{field.name}") +#end +## 乐观锁注解 +#if($!{versionFieldName}==$!{field.name}) + @Version +#end +## 逻辑删除注解 +#if($!{logicDeleteFieldName}==$!{field.name}) + @TableLogic +#end + private $!{field.propertyType} $!{field.propertyName}; + +#end +## ---------- END 字段循环遍历 ---------- + +#if(!$!{entityLombokModel}) +#foreach($field in $!{table.fields}) +#if($!{field.propertyType.equals("boolean")}) +#set($getprefix="is") +#else +#set($getprefix="get") +#end + + public $!{field.propertyType} $!{getprefix}$!{field.capitalName}() { + return $!{field.propertyName}; + } + +#if($!{entityBuilderModel}) + public $!{entity} set$!{field.capitalName}($!{field.propertyType} $!{field.propertyName}) { +#else + public void set$!{field.capitalName}($!{field.propertyType} $!{field.propertyName}) { +#end + this.$!{field.propertyName} = $!{field.propertyName}; +#if($!{entityBuilderModel}) + return this; +#end + } +#end +#end + +#if($!{entityColumnConstant}) +#foreach($field in $!{table.fields}) + public static final String $!{field.name.toUpperCase()} = "$!{field.name}"; + +#end +#end +#if($!{activeRecord}) + @Override + protected Serializable pkVal() { +#if($!{keyPropertyName}) + return this.$!{keyPropertyName}; +#else + return this.id; +#end + } + +#end +#if(!$!{entityLombokModel}) + @Override + public String toString() { + return "$!{entity}{" + +#foreach($field in $!{table.fields}) +#if($!{velocityCount}==1) + "$!{field.propertyName}=" + $!{field.propertyName} + +#else + ", $!{field.propertyName}=" + $!{field.propertyName} + +#end +#end + "}"; + } +#end +} diff --git a/blade-ops/blade-develop/src/test/resources/templates/entityDTO.java.vm b/blade-ops/blade-develop/src/test/resources/templates/entityDTO.java.vm new file mode 100644 index 00000000..205336bb --- /dev/null +++ b/blade-ops/blade-develop/src/test/resources/templates/entityDTO.java.vm @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +#set($dtoPackage=$package.Entity.replace("entity","dto")) +package $!{dtoPackage}; + +import $!{package.Entity}.$!{entity}; +#if($!{entityLombokModel}) +import lombok.Data; +import lombok.EqualsAndHashCode; +#end + +/** + * $!{table.comment}数据传输对象实体类 + * + * @author $!{author} + * @since $!{date} + */ +#if($!{entityLombokModel}) +@Data +@EqualsAndHashCode(callSuper = true) +#end +public class $!{entity}DTO extends $!{entity} { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-ops/blade-develop/src/test/resources/templates/entityVO.java.vm b/blade-ops/blade-develop/src/test/resources/templates/entityVO.java.vm new file mode 100644 index 00000000..effe19ee --- /dev/null +++ b/blade-ops/blade-develop/src/test/resources/templates/entityVO.java.vm @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +#set($voPackage=$package.Entity.replace("entity","vo")) +package $!{voPackage}; + +import $!{package.Entity}.$!{entity}; +#if($!{entityLombokModel}) +import lombok.Data; +import lombok.EqualsAndHashCode; +#end +#if($!{swagger2}) +import io.swagger.annotations.ApiModel; +#end + +/** + * $!{table.comment}视图实体类 + * + * @author $!{author} + * @since $!{date} + */ +#if($!{entityLombokModel}) +@Data +@EqualsAndHashCode(callSuper = true) +#end +#if($!{swagger2}) +@ApiModel(value = "$!{entity}VO对象", description = #if ("$!{table.comment}"=="")"$!{entity}VO对象"#else"$!{table.comment}"#end) +#end +public class $!{entity}VO extends $!{entity} { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-ops/blade-develop/src/test/resources/templates/mapper.java.vm b/blade-ops/blade-develop/src/test/resources/templates/mapper.java.vm new file mode 100644 index 00000000..6a936c05 --- /dev/null +++ b/blade-ops/blade-develop/src/test/resources/templates/mapper.java.vm @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package $!{package.Mapper}; + +import $!{package.Entity}.$!{entity}; +#set($voPackage=$package.Entity.replace("entity","vo")) +import $!{voPackage}.$!{entity}VO; +import $!{superMapperClassPackage}; +import com.baomidou.mybatisplus.core.metadata.IPage; +import java.util.List; + +/** + * $!{table.comment} Mapper 接口 + * + * @author $!{author} + * @since $!{date} + */ +#if($!{kotlin}) +interface $!{table.mapperName} : $!{superMapperClass}<$!{entity}> +#else +public interface $!{table.mapperName} extends $!{superMapperClass}<$!{entity}> { + + /** + * 自定义分页 + * + * @param page + * @param $!{table.entityPath} + * @return + */ + List<$!{entity}VO> select$!{entity}Page(IPage page, $!{entity}VO $!{table.entityPath}); + +} +#end diff --git a/blade-ops/blade-develop/src/test/resources/templates/mapper.xml.vm b/blade-ops/blade-develop/src/test/resources/templates/mapper.xml.vm new file mode 100644 index 00000000..77eb3dc6 --- /dev/null +++ b/blade-ops/blade-develop/src/test/resources/templates/mapper.xml.vm @@ -0,0 +1,44 @@ + + + + +#if($!{enableCache}) + + + +#end +#if($!{baseResultMap}) + + +#foreach($field in $!{table.fields}) +#if($!{field.keyFlag})##生成主键排在第一位 + +#end +#end +#foreach($field in $!{table.commonFields})##生成公共字段 + +#end +#foreach($field in $!{table.fields}) +#if(!$!{field.keyFlag})##生成普通字段 + +#end +#end + + +#end +#if($!{baseColumnList}) + + + select + #foreach($field in $!{table.commonFields}) + #if($!{field.name} == $!{field.propertyName})$!{field.name}#else$!{field.name} AS $!{field.propertyName}#end, + #end + $!{table.fieldNames} + + + + +#end + diff --git a/blade-ops/blade-develop/src/test/resources/templates/props/generator.properties b/blade-ops/blade-develop/src/test/resources/templates/props/generator.properties new file mode 100644 index 00000000..2f9caa73 --- /dev/null +++ b/blade-ops/blade-develop/src/test/resources/templates/props/generator.properties @@ -0,0 +1,5 @@ +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +spring.datasource.url=jdbc:mysql://localhost:3306/bladex?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&serverTimezone=GMT%2B8 +spring.datasource.username=root +spring.datasource.password=root +author=BladeX diff --git a/blade-ops/blade-develop/src/test/resources/templates/saber/api.js.vm b/blade-ops/blade-develop/src/test/resources/templates/saber/api.js.vm new file mode 100644 index 00000000..1c65e554 --- /dev/null +++ b/blade-ops/blade-develop/src/test/resources/templates/saber/api.js.vm @@ -0,0 +1,50 @@ +import request from '@/router/axios'; + +export const getList = (current, size, params) => { + return request({ + url: '/api/$!{cfg.serviceName}/$!{table.entityPath}/list', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} + +export const getDetail = (id) => { + return request({ + url: '/api/$!{cfg.serviceName}/$!{table.entityPath}/detail', + method: 'get', + params: { + id + } + }) +} + +export const remove = (ids) => { + return request({ + url: '/api/$!{cfg.serviceName}/$!{table.entityPath}/remove', + method: 'post', + params: { + ids, + } + }) +} + +export const add = (row) => { + return request({ + url: '/api/$!{cfg.serviceName}/$!{table.entityPath}/submit', + method: 'post', + data: row + }) +} + +export const update = (row) => { + return request({ + url: '/api/$!{cfg.serviceName}/$!{table.entityPath}/submit', + method: 'post', + data: row + }) +} + diff --git a/blade-ops/blade-develop/src/test/resources/templates/saber/crud.vue.vm b/blade-ops/blade-develop/src/test/resources/templates/saber/crud.vue.vm new file mode 100644 index 00000000..616be75e --- /dev/null +++ b/blade-ops/blade-develop/src/test/resources/templates/saber/crud.vue.vm @@ -0,0 +1,174 @@ + + + + + diff --git a/blade-ops/blade-develop/src/test/resources/templates/service.java.vm b/blade-ops/blade-develop/src/test/resources/templates/service.java.vm new file mode 100644 index 00000000..6b501eaa --- /dev/null +++ b/blade-ops/blade-develop/src/test/resources/templates/service.java.vm @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package $!{package.Service}; + +import $!{package.Entity}.$!{entity}; +#set($voPackage=$package.Entity.replace("entity","vo")) +import $!{voPackage}.$!{entity}VO; +import $!{superServiceClassPackage}; +import com.baomidou.mybatisplus.core.metadata.IPage; + +/** + * $!{table.comment} 服务类 + * + * @author $!{author} + * @since $!{date} + */ +#if($!{kotlin}) +interface $!{table.serviceName} : $!{superServiceClass}<$!{entity}> +#else +public interface $!{table.serviceName} extends $!{superServiceClass}<$!{entity}> { + + /** + * 自定义分页 + * + * @param page + * @param $!{table.entityPath} + * @return + */ + IPage<$!{entity}VO> select$!{entity}Page(IPage<$!{entity}VO> page, $!{entity}VO $!{table.entityPath}); + +} +#end diff --git a/blade-ops/blade-develop/src/test/resources/templates/serviceImpl.java.vm b/blade-ops/blade-develop/src/test/resources/templates/serviceImpl.java.vm new file mode 100644 index 00000000..ecfe5986 --- /dev/null +++ b/blade-ops/blade-develop/src/test/resources/templates/serviceImpl.java.vm @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package $!{package.ServiceImpl}; + +import $!{package.Entity}.$!{entity}; +#set($voPackage=$package.Entity.replace("entity","vo")) +import $!{voPackage}.$!{entity}VO; +import $!{package.Mapper}.$!{table.mapperName}; +import $!{package.Service}.$!{table.serviceName}; +import $!{superServiceImplClassPackage}; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.metadata.IPage; + +/** + * $!{table.comment} 服务实现类 + * + * @author $!{author} + * @since $!{date} + */ +@Service +#if($!{kotlin}) +open class $!{table.serviceImplName} : $!{superServiceImplClass}<$!{table.mapperName}, $!{entity}>(), $!{table.serviceName} { + +} +#else +public class $!{table.serviceImplName} extends $!{superServiceImplClass}<$!{table.mapperName}, $!{entity}> implements $!{table.serviceName} { + + @Override + public IPage<$!{entity}VO> select$!{entity}Page(IPage<$!{entity}VO> page, $!{entity}VO $!{table.entityPath}) { + return page.setRecords(baseMapper.select$!{entity}Page(page, $!{table.entityPath})); + } + +} +#end diff --git a/blade-ops/blade-develop/src/test/resources/templates/sword/action.js.vm b/blade-ops/blade-develop/src/test/resources/templates/sword/action.js.vm new file mode 100644 index 00000000..e0eb4768 --- /dev/null +++ b/blade-ops/blade-develop/src/test/resources/templates/sword/action.js.vm @@ -0,0 +1,37 @@ +#set($upperEntityPath=$table.entityPath.toUpperCase()) +export const $!{upperEntityPath}_NAMESPACE = '$!{table.entityPath}'; + +export function $!{upperEntityPath}_LIST(payload) { + return { + type: `${$!{upperEntityPath}_NAMESPACE}/fetchList`, + payload, + }; +} + +export function $!{upperEntityPath}_DETAIL(id) { + return { + type: `${$!{upperEntityPath}_NAMESPACE}/fetchDetail`, + payload: { id }, + }; +} + +export function $!{upperEntityPath}_CLEAR_DETAIL() { + return { + type: `${$!{upperEntityPath}_NAMESPACE}/clearDetail`, + payload: {}, + }; +} + +export function $!{upperEntityPath}_SUBMIT(payload) { + return { + type: `${$!{upperEntityPath}_NAMESPACE}/submit`, + payload, + }; +} + +export function $!{upperEntityPath}_REMOVE(payload) { + return { + type: `${$!{upperEntityPath}_NAMESPACE}/remove`, + payload, + }; +} diff --git a/blade-ops/blade-develop/src/test/resources/templates/sword/add.js.vm b/blade-ops/blade-develop/src/test/resources/templates/sword/add.js.vm new file mode 100644 index 00000000..b1480a42 --- /dev/null +++ b/blade-ops/blade-develop/src/test/resources/templates/sword/add.js.vm @@ -0,0 +1,73 @@ +#set($upperEntityPath=$table.entityPath.toUpperCase()) +import React, { PureComponent } from 'react'; +import { Form, Input, Card, Button } from 'antd'; +import { connect } from 'dva'; +import Panel from '../../../components/Panel'; +import styles from '../../../layouts/Sword.less'; +import { $!{upperEntityPath}_SUBMIT } from '../../../actions/$!{table.entityPath}'; + +const FormItem = Form.Item; + +@connect(({ loading }) => ({ + submitting: loading.effects['$!{table.entityPath}/submit'], +})) +@Form.create() +class $!{entity}Add extends PureComponent { + handleSubmit = e => { + e.preventDefault(); + const { dispatch, form } = this.props; + form.validateFieldsAndScroll((err, values) => { + if (!err) { + dispatch($!{upperEntityPath}_SUBMIT(values)); + } + }); + }; + + render() { + const { + form: { getFieldDecorator }, + submitting, + } = this.props; + + const formItemLayout = { + labelCol: { + xs: { span: 24 }, + sm: { span: 7 }, + }, + wrapperCol: { + xs: { span: 24 }, + sm: { span: 12 }, + md: { span: 10 }, + }, + }; + + const action = ( + + ); + + return ( + +
+ +#foreach($field in $!{table.fields}) + + {getFieldDecorator('$!{field.propertyName}', { + rules: [ + { + required: true, + message: '请输入$!{field.comment}', + }, + ], + })()} + +#end + +
+ + ); + } +} + +export default $!{entity}Add; diff --git a/blade-ops/blade-develop/src/test/resources/templates/sword/edit.js.vm b/blade-ops/blade-develop/src/test/resources/templates/sword/edit.js.vm new file mode 100644 index 00000000..87d9903e --- /dev/null +++ b/blade-ops/blade-develop/src/test/resources/templates/sword/edit.js.vm @@ -0,0 +1,97 @@ +#set($upperEntityPath=$table.entityPath.toUpperCase()) +import React, { PureComponent } from 'react'; +import { Form, Input, Card, Button } from 'antd'; +import { connect } from 'dva'; +import Panel from '../../../components/Panel'; +import styles from '../../../layouts/Sword.less'; +import { $!{upperEntityPath}_DETAIL, $!{upperEntityPath}_SUBMIT } from '../../../actions/$!{table.entityPath}'; + +const FormItem = Form.Item; + +@connect(({ $!{table.entityPath}, loading }) => ({ + $!{table.entityPath}, + submitting: loading.effects['code/submit'], +})) +@Form.create() +class $!{entity}Edit extends PureComponent { + componentWillMount() { + const { + dispatch, + match: { + params: { id }, + }, + } = this.props; + dispatch($!{upperEntityPath}_DETAIL(id)); + } + + handleSubmit = e => { + e.preventDefault(); + const { + dispatch, + match: { + params: { id }, + }, + form, + } = this.props; + form.validateFieldsAndScroll((err, values) => { + if (!err) { + const params = { + id, + ...values, + }; + console.log(params); + dispatch($!{upperEntityPath}_SUBMIT(params)); + } + }); + }; + + render() { + const { + form: { getFieldDecorator }, + $!{table.entityPath}: { detail }, + submitting, + } = this.props; + + const formItemLayout = { + labelCol: { + xs: { span: 24 }, + sm: { span: 7 }, + }, + wrapperCol: { + xs: { span: 24 }, + sm: { span: 12 }, + md: { span: 10 }, + }, + }; + + const action = ( + + ); + + return ( + +
+ +#foreach($field in $!{table.fields}) + + {getFieldDecorator('$!{field.propertyName}', { + rules: [ + { + required: true, + message: '请输入$!{field.comment}', + }, + ], + initialValue: detail.$!{field.propertyName}, + })()} + +#end + +
+ + ); + } +} + +export default $!{entity}Edit; diff --git a/blade-ops/blade-develop/src/test/resources/templates/sword/list.js.vm b/blade-ops/blade-develop/src/test/resources/templates/sword/list.js.vm new file mode 100644 index 00000000..72a6eef1 --- /dev/null +++ b/blade-ops/blade-develop/src/test/resources/templates/sword/list.js.vm @@ -0,0 +1,82 @@ +#set($upperEntityPath=$table.entityPath.toUpperCase()) +import React, { PureComponent } from 'react'; +import { connect } from 'dva'; +import { Button, Col, Form, Input, Row } from 'antd'; +import Panel from '../../../components/Panel'; +import { $!{upperEntityPath}_LIST } from '../../../actions/$!{table.entityPath}'; +import Grid from '../../../components/Sword/Grid'; + +const FormItem = Form.Item; + +@connect(({ $!{table.entityPath}, loading }) => ({ + $!{table.entityPath}, + loading: loading.models.param, +})) +@Form.create() +class $!{entity} extends PureComponent { + // ============ 查询 =============== + handleSearch = params => { + const { dispatch } = this.props; + dispatch($!{upperEntityPath}_LIST(params)); + }; + + // ============ 查询表单 =============== + renderSearchForm = onReset => { + const { form } = this.props; + const { getFieldDecorator } = form; + + return ( + + + + {getFieldDecorator('name')()} + + + +
+ + +
+ + + ); + }; + + render() { + const code = '$!{table.entityPath}'; + + const { + form, + loading, + $!{table.entityPath}: { data }, + } = this.props; + + const columns = [ +#foreach($field in $!{table.fields}) + { + title: '$!{field.comment}', + dataIndex: '$!{field.propertyName}', + }, +#end + ]; + + return ( + + + + ); + } +} +export default $!{entity}; diff --git a/blade-ops/blade-develop/src/test/resources/templates/sword/model.js.vm b/blade-ops/blade-develop/src/test/resources/templates/sword/model.js.vm new file mode 100644 index 00000000..54b40c1d --- /dev/null +++ b/blade-ops/blade-develop/src/test/resources/templates/sword/model.js.vm @@ -0,0 +1,84 @@ +#set($upperEntityPath=$table.entityPath.toUpperCase()) +import { message } from 'antd'; +import router from 'umi/router'; +import { $!{upperEntityPath}_NAMESPACE } from '../actions/$!{table.entityPath}'; +import { list, submit, detail, remove } from '../services/$!{table.entityPath}'; + +export default { + namespace: $!{upperEntityPath}_NAMESPACE, + state: { + data: { + list: [], + pagination: false, + }, + detail: {}, + }, + effects: { + *fetchList({ payload }, { call, put }) { + const response = yield call(list, payload); + if (response.success) { + yield put({ + type: 'saveList', + payload: { + list: response.data, + pagination: false, + }, + }); + } + }, + *fetchDetail({ payload }, { call, put }) { + const response = yield call(detail, payload); + if (response.success) { + yield put({ + type: 'saveDetail', + payload: { + detail: response.data, + }, + }); + } + }, + *clearDetail({ payload }, { put }) { + yield put({ + type: 'removeDetail', + payload: { payload }, + }); + }, + *submit({ payload }, { call }) { + const response = yield call(submit, payload); + if (response.success) { + message.success('提交成功'); + router.push('/$!{cfg.servicePackage}/$!{table.entityPath}'); + } + }, + *remove({ payload }, { call }) { + const { + data: { keys }, + success, + } = payload; + const response = yield call(remove, { ids: keys }); + if (response.success) { + success(); + } + }, + }, + reducers: { + saveList(state, action) { + return { + ...state, + data: action.payload, + }; + }, + saveDetail(state, action) { + return { + ...state, + detail: action.payload.detail, + }; + }, + removeDetail(state) { + return { + ...state, + detail: {}, + }; + }, + }, +}; diff --git a/blade-ops/blade-develop/src/test/resources/templates/sword/service.js.vm b/blade-ops/blade-develop/src/test/resources/templates/sword/service.js.vm new file mode 100644 index 00000000..47b9676d --- /dev/null +++ b/blade-ops/blade-develop/src/test/resources/templates/sword/service.js.vm @@ -0,0 +1,26 @@ +#set($params="$" + "{stringify" + "(params)" + "}") +import { stringify } from 'qs'; +import func from '../utils/Func'; +import request from '../utils/request'; + +export async function list(params) { + return request(`/api/$!{cfg.serviceName}/$!{table.entityPath}/list?$!{params}`); +} + +export async function submit(params) { + return request('/api/$!{cfg.serviceName}/$!{table.entityPath}/submit', { + method: 'POST', + body: params, + }); +} + +export async function detail(params) { + return request(`/api/$!{cfg.serviceName}/$!{table.entityPath}/detail?$!{params}`); +} + +export async function remove(params) { + return request('/api/$!{cfg.serviceName}/$!{table.entityPath}/remove', { + method: 'POST', + body: func.toFormData(params), + }); +} diff --git a/blade-ops/blade-develop/src/test/resources/templates/sword/view.js.vm b/blade-ops/blade-develop/src/test/resources/templates/sword/view.js.vm new file mode 100644 index 00000000..7ad0005b --- /dev/null +++ b/blade-ops/blade-develop/src/test/resources/templates/sword/view.js.vm @@ -0,0 +1,74 @@ +#set($upperEntityPath=$table.entityPath.toUpperCase()) +import React, { PureComponent } from 'react'; +import router from 'umi/router'; +import { Form, Card, Button } from 'antd'; +import { connect } from 'dva'; +import Panel from '../../../components/Panel'; +import styles from '../../../layouts/Sword.less'; +import { $!{upperEntityPath}_DETAIL } from '../../../actions/$!{table.entityPath}'; + +const FormItem = Form.Item; + +@connect(({ $!{table.entityPath} }) => ({ + $!{table.entityPath}, +})) +@Form.create() +class $!{entity}View extends PureComponent { + componentWillMount() { + const { + dispatch, + match: { + params: { id }, + }, + } = this.props; + dispatch($!{upperEntityPath}_DETAIL(id)); + } + + handleEdit = () => { + const { + match: { + params: { id }, + }, + } = this.props; + router.push(`/$!{cfg.servicePackage}/$!{table.entityPath}/edit/$!{id}`); + }; + + render() { + const { + $!{table.entityPath}: { detail }, + } = this.props; + + const formItemLayout = { + labelCol: { + xs: { span: 24 }, + sm: { span: 7 }, + }, + wrapperCol: { + xs: { span: 24 }, + sm: { span: 12 }, + md: { span: 10 }, + }, + }; + + const action = ( + + ); + + return ( + +
+ +#foreach($field in $!{table.fields}) + + {detail.$!{field.propertyName}} + +#end + +
+ + ); + } +} +export default $!{entity}View; diff --git a/blade-ops/blade-develop/src/test/resources/templates/wrapper.java.vm b/blade-ops/blade-develop/src/test/resources/templates/wrapper.java.vm new file mode 100644 index 00000000..0e13af1f --- /dev/null +++ b/blade-ops/blade-develop/src/test/resources/templates/wrapper.java.vm @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +#set($wrapperPackage=$package.Entity.replace("entity","wrapper")) +package $!{wrapperPackage}; + +import lombok.AllArgsConstructor; +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.system.feign.IDictClient; +import $!{package.Entity}.$!{entity}; +#set($voPackage=$package.Entity.replace("entity","vo")) +import $!{voPackage}.$!{entity}VO; + +/** + * $!{table.comment}包装类,返回视图层所需的字段 + * + * @author $!{author} + * @since $!{date} + */ +@AllArgsConstructor +public class $!{entity}Wrapper extends BaseEntityWrapper<$!{entity}, $!{entity}VO> { + + private IDictClient dictClient; + + @Override + public $!{entity}VO entityVO($!{entity} $!{table.entityPath}) { + $!{entity}VO $!{table.entityPath}VO = BeanUtil.copy($!{table.entityPath}, $!{entity}VO.class); + + /*R dict = dictClient.getValue("$!{table.entityPath}" , $!{table.entityPath}VO.getCategory()); + if (dict.isSuccess()) { + String categoryName = dict.getData(); + $!{table.entityPath}VO.setCategoryName(categoryName); + }*/ + + return $!{table.entityPath}VO; + } + +}