CaiXiang/SPC
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of http://git.picaiba.com/why/ym

Browse Source 
 Conflicts:
	ym-gateway/pom.xml
This commit is contained in:
caixiang
2022-06-22 09:14:41 +08:00
parent 342f843f2c 2bf099ee6d
commit 3b7b592a16
21 changed files with 332 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ym-generator/src/main/java/com/cnbm/generator/build/CodeGenerator.java
View File

@@ -48,8 +48,8 @@ public class CodeGenerator {
})
.packageConfig(builder -> {
//设置父包名
builder.parent("com.cnbm")
.moduleName("generator")
builder.parent("com.cnbm.generator")
.moduleName("code")
.service("service")
.serviceImpl("service.impl")
.entity("entity")

4
ym-generator/src/main/java/com/cnbm/generator/engine/EnhanceVelocityTemplateEngine.java
View File

@@ -24,10 +24,10 @@ public class EnhanceVelocityTemplateEngine extends VelocityTemplateEngine {
customFile.forEach((key, value) -> {
String fileName = "";
if ("DTO".equals(key)) {
fileName = String.format((path+ File.separator +"src/main/java/com/cnbm/generator"+ File.separator + "dto" + File.separator + entityName + "%s" + ".java"), key);
fileName = String.format((path+ File.separator +"src/main/java/com/cnbm/generator/code"+ File.separator + "dto" + File.separator + entityName + "%s" + ".java"), key);
}
if ("Excel".equals(key)) {
fileName = String.format((path+ File.separator +"src/main/java/com/cnbm/generator"+ File.separator + "excel" + File.separator + entityName + "%s" + ".java"), key);
fileName = String.format((path+ File.separator +"src/main/java/com/cnbm/generator/code"+ File.separator + "excel" + File.separator + entityName + "%s" + ".java"), key);
}
this.outputFile(new File(fileName), objectMap, value);
});

8
ym-generator/src/main/resources/templates/controller.java.vm
View File

@@ -43,10 +43,10 @@ public class ${table.controllerName} {
@GetMapping("page")
@ApiOperation("分页")
@ApiImplicitParams({
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType="String") ,
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataType="String")
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) ,
@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) ,
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) ,
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class)
})
@PreAuthorize("@ex.hasAuthority('${package.ModuleName}:${table.entityPath}:page')")
public Result<PageData<${entity}DTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){