diff --git a/src/main/java/cn/lihongjie/coal/Codegen.java b/src/main/java/cn/lihongjie/coal/Codegen.java index 762285e9..83cb15f7 100644 --- a/src/main/java/cn/lihongjie/coal/Codegen.java +++ b/src/main/java/cn/lihongjie/coal/Codegen.java @@ -260,15 +260,17 @@ public class Codegen { // 生成controller - TypeSpec controller = TypeSpec.classBuilder(StringUtils.capitalize(moduleName) + "Controller") + TypeSpec.Builder controllerBuilder = TypeSpec.classBuilder(StringUtils.capitalize(moduleName) + "Controller") .addModifiers(Modifier.PUBLIC) .addAnnotation(RestController.class) .addAnnotation(AnnotationSpec.builder(RequestMapping.class).addMember("value", "$S", "/" + lModuleName).build()) .addAnnotation(AnnotationSpec.builder(SysLog.class).addMember("module", "$S", StringUtils.defaultIfBlank(moduleCNName, "")).build()) - .addAnnotation(Slf4j.class) - .addAnnotation(orgMode ? OrgScope.class : Slf4j.class) + .addAnnotation(Slf4j.class); - .addField(FieldSpec.builder(ClassName.get(servicePackage, service.name), "service", Modifier.PRIVATE).addAnnotation(Autowired.class).build()) + if(orgMode) { + controllerBuilder.addAnnotation(OrgScope.class); + } + controllerBuilder.addField(FieldSpec.builder(ClassName.get(servicePackage, service.name), "service", Modifier.PRIVATE).addAnnotation(Autowired.class).build()) .addMethod(MethodSpec.methodBuilder("create") .addModifiers(Modifier.PUBLIC) .returns(ClassName.get(dtoPackage, dto.name)) @@ -332,10 +334,11 @@ public class Codegen { """, ClassName.get(Page.class), ClassName.get(entityPackage, entity.name), ClassName.get(PageRequest.class), ClassName.get(Sort.class)) .build() ) - .build(); + ; - JavaFile.builder(controllerPackage, controller) + + JavaFile.builder(controllerPackage, controllerBuilder.build()) .build() .writeTo(DIRECTORY);