55import com .softdev .system .generator .util .CodeGeneratorTool ;
66import com .softdev .system .generator .util .FreemarkerTool ;
77import freemarker .template .TemplateException ;
8+ import lombok .extern .slf4j .Slf4j ;
89import org .apache .commons .lang3 .StringUtils ;
9- import org .slf4j .Logger ;
10- import org .slf4j .LoggerFactory ;
1110import org .springframework .beans .factory .annotation .Autowired ;
1211import org .springframework .stereotype .Controller ;
1312import org .springframework .web .bind .annotation .RequestMapping ;
13+ import org .springframework .web .bind .annotation .RequestParam ;
1414import org .springframework .web .bind .annotation .ResponseBody ;
1515
1616import java .io .IOException ;
2222 * @author zhengk/moshow
2323 */
2424@ Controller
25+ @ Slf4j
2526public class IndexController {
26- private static final Logger logger = LoggerFactory .getLogger (IndexController .class );
2727
2828 @ Autowired
2929 private FreemarkerTool freemarkerTool ;
@@ -35,16 +35,17 @@ public String index() {
3535
3636 @ RequestMapping ("/genCode" )
3737 @ ResponseBody
38- public ReturnT <Map <String , String >> codeGenerate (String tableSql ,String authorName ,String packageName ) {
38+ public ReturnT <Map <String , String >> codeGenerate (String tableSql ,
39+ //2019-2-10 liutf 修改为@RequestParam参数校验
40+ @ RequestParam (required = false , defaultValue = "大狼狗" ) String authorName ,
41+ @ RequestParam (required = false , defaultValue = "com.softdev.system" )String packageName
42+ ) {
3943
40- if (StringUtils .isBlank (authorName )) authorName ="大狼狗" ;
41-
42- if (StringUtils .isBlank (packageName )) packageName ="com.softdev.system" ;
4344
4445 try {
4546
4647 if (StringUtils .isBlank (tableSql )) {
47- return new ReturnT <Map < String , String > >(ReturnT .FAIL_CODE , "表结构信息不可为空" );
48+ return new ReturnT <>(ReturnT .FAIL_CODE , "表结构信息不可为空" );
4849 }
4950
5051 // parse table
@@ -60,31 +61,30 @@ public ReturnT<Map<String, String>> codeGenerate(String tableSql,String authorNa
6061 Map <String , String > result = new HashMap <String , String >();
6162
6263 //UI
63- result .put ("swaggerui" , freemarkerTool .processString ("xxl-code-generator/swagger-ui.ftl" , params ));
64- result .put ("elementui" , freemarkerTool .processString ("xxl-code-generator/element-ui.ftl" , params ));
65- result .put ("bootstrap" , freemarkerTool .processString ("xxl-code-generator/bootstrap.ftl" , params ));
66-
64+ result .put ("swagger-ui" , freemarkerTool .processString ("code-generator/ui/swagger-ui.ftl" , params ));
65+ result .put ("element-ui" , freemarkerTool .processString ("code-generator/ui/element-ui.ftl" , params ));
66+ result .put ("bootstrap-ui" , freemarkerTool .processString ("code-generator/ui/bootstrap-ui.ftl" , params ));
6767 //mybatis old
68- result .put ("controller" , freemarkerTool .processString ("xxl- code-generator/controller.ftl" , params ));
69- result .put ("service" , freemarkerTool .processString ("xxl- code-generator/service.ftl" , params ));
70- result .put ("service_impl" , freemarkerTool .processString ("xxl- code-generator/service_impl.ftl" , params ));
71- result .put ("dao" , freemarkerTool .processString ("xxl- code-generator/dao.ftl" , params ));
72- result .put ("mybatis" , freemarkerTool .processString ("xxl- code-generator/mybatis.ftl" , params ));
73- result .put ("model" , freemarkerTool .processString ("xxl- code-generator/model.ftl" , params ));
68+ result .put ("controller" , freemarkerTool .processString ("code-generator/mybatis /controller.ftl" , params ));
69+ result .put ("service" , freemarkerTool .processString ("code-generator/mybatis /service.ftl" , params ));
70+ result .put ("service_impl" , freemarkerTool .processString ("code-generator/mybatis /service_impl.ftl" , params ));
71+ result .put ("dao" , freemarkerTool .processString ("code-generator/mybatis /dao.ftl" , params ));
72+ result .put ("mybatis" , freemarkerTool .processString ("code-generator/mybatis /mybatis.ftl" , params ));
73+ result .put ("model" , freemarkerTool .processString ("code-generator/mybatis /model.ftl" , params ));
7474 //jpa
75- result .put ("entity" , freemarkerTool .processString ("xxl- code-generator/entity.ftl" , params ));
76- result .put ("repository" , freemarkerTool .processString ("xxl- code-generator/repository.ftl" , params ));
77- result .put ("jpacontroller" , freemarkerTool .processString ("xxl- code-generator/jpacontroller.ftl" , params ));
75+ result .put ("entity" , freemarkerTool .processString ("code-generator/jpa /entity.ftl" , params ));
76+ result .put ("repository" , freemarkerTool .processString ("code-generator/jpa /repository.ftl" , params ));
77+ result .put ("jpacontroller" , freemarkerTool .processString ("code-generator/jpa /jpacontroller.ftl" , params ));
7878 //jdbc template
79- result .put ("jtdao" , freemarkerTool .processString ("xxl- code-generator/jtdao.ftl" , params ));
80- result .put ("jtdaoimpl" , freemarkerTool .processString ("xxl- code-generator/jtdaoimpl.ftl" , params ));
79+ result .put ("jtdao" , freemarkerTool .processString ("code-generator/jdbc-template /jtdao.ftl" , params ));
80+ result .put ("jtdaoimpl" , freemarkerTool .processString ("code-generator/jdbc-template /jtdaoimpl.ftl" , params ));
8181 //beetsql
82- result .put ("beetlmd" , freemarkerTool .processString ("xxl- code-generator/beetlmd.ftl" , params ));
83- result .put ("beetlentity" , freemarkerTool .processString ("xxl- code-generator/beetlentity.ftl" , params ));
84- result .put ("beetlcontroller" , freemarkerTool .processString ("xxl- code-generator/beetlcontroller.ftl" , params ));
82+ result .put ("beetlmd" , freemarkerTool .processString ("code-generator/beetlsql /beetlmd.ftl" , params ));
83+ result .put ("beetlentity" , freemarkerTool .processString ("code-generator/beetlsql /beetlentity.ftl" , params ));
84+ result .put ("beetlcontroller" , freemarkerTool .processString ("code-generator/beetlsql /beetlcontroller.ftl" , params ));
8585 //mybatis plus
86- result .put ("pluscontroller" , freemarkerTool .processString ("xxl- code-generator/pluscontroller.ftl" , params ));
87- result .put ("plusmapper" , freemarkerTool .processString ("xxl- code-generator/plusmapper.ftl" , params ));
86+ result .put ("pluscontroller" , freemarkerTool .processString ("code-generator/mybatis-plus /pluscontroller.ftl" , params ));
87+ result .put ("plusmapper" , freemarkerTool .processString ("code-generator/mybatis-plus /plusmapper.ftl" , params ));
8888
8989 // 计算,生成代码行数
9090 int lineNum = 0 ;
@@ -93,13 +93,13 @@ public ReturnT<Map<String, String>> codeGenerate(String tableSql,String authorNa
9393 lineNum += StringUtils .countMatches (item .getValue (), "\n " );
9494 }
9595 }
96- logger .info ("生成代码行数:{}" , lineNum );
96+ log .info ("生成代码行数:{}" , lineNum );
9797 //测试环境可自行开启
98- //logger .info("生成代码数据:{}", result);
99- return new ReturnT <Map < String , String > >(result );
98+ //log .info("生成代码数据:{}", result);
99+ return new ReturnT <>(result );
100100 } catch (IOException | TemplateException e ) {
101- logger .error (e .getMessage (), e );
102- return new ReturnT <Map < String , String > >(ReturnT .FAIL_CODE , "表结构解析失败" +e .getMessage ());
101+ log .error (e .getMessage (), e );
102+ return new ReturnT <>(ReturnT .FAIL_CODE , "表结构解析失败" +e .getMessage ());
103103 }
104104
105105 }
0 commit comments