Skip to content

Commit a10a330

Browse files
moshowgamemoshowgame
committed
表明前缀选项(感谢@wwlg的建议)。 是否带字段注释设置(感谢@fengpojian的建议)。优化Mybatis的''!=判断(感谢@zhongsb的建议)。 Mybatis-Plus增加Service层(感谢@yf466532479的建议)。
1 parent f5359f8 commit a10a330

File tree

14 files changed

+139
-106
lines changed

14 files changed

+139
-106
lines changed

‎README.md‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,24 @@
2020
> #支持`MySQL`、Oracle、PgSQL三大主流数据库
2121
>
2222
>generate to many popular templates by ddl-sql/insert-sql/simple json<br>
23-
>可通过`建表SQL语句`或`INSERT语句`或者`简单JSON`生成`JPA/JdbcTemplate/Mybatis/MybatisPlus/BeetlSQL`相关模板代码.
23+
> 可通过`建表SQL语句`或`INSERT语句`或者`简单JSON`生成`JPA/JdbcTemplate/Mybatis/MybatisPlus/BeetlSQL`相关模板代码.
2424
>
2525
>thanks for your using and feedback,I'm inspired by the 600PV every day and github more than 700 stars <br>
26-
> 感谢大家的使用和反馈，每天六百的PV和获得超过七百多的星星是我前进和继续做下去的动力。
26+
> 感谢大家的使用和反馈，每天六百的PV和获得超过七百多的星星是我前进和继续做下去的动力。
2727
>
2828
>hope everyone can keep good balance on work and life , stay health and safety , be smooth on work as well<br>
29-
> 愿大家可以维持生活和工作平衡，保持健康和安全，祝大家工作顺利！
29+
> 愿大家可以维持生活和工作平衡，保持健康和安全，祝大家工作顺利！
3030
3131
# Tips or Features
32-
- 支持DDL SQL/INSERT SQL/SIMPLE JSON生成模式
33-
- 自动记忆最近生成的内容，最多保留9个
32+
- 支持DDL SQL/INSERT SQL/SIMPLE JSON三种生成模式
33+
- `自动记忆`最近生成的内容，最多保留9个
3434
- 提供众多`通用模板`，易于使用，复制粘贴加简单修改即可完成CRUD操作
3535
- 支持`特殊字符`模板(`#`请用`井`代替;`$`请用`￥`代替)
3636
- `Util集合`提供一些基本对象的使用方法供方便COPY，如对应的CRUD SQL语句、setMap、getMap、get属性等等
37-
- 关于`类名注释`，根据`comment=(mysql)`或者`comment on table(pgsql/oracle)`生成
37+
- 关于`类名注释`，可根据`comment=(mysql)`或者`comment on table(pgsql/oracle)`生成
3838
- 可设置是否`自动引包`(java中的import)及`引入包路径`(java类中的package)，建议取消并配合IDEA的自动引包更智能(Settings→Editor→General→Auto Import,勾选Add unambiguous imports on the fly以及Optimize imports on the fly)。
3939
- 可设置`表名前缀`，例如sys_user前缀为sys_之后可以正确生成user类
40+
- 可切换`header.html`中的include文件为`header-local.html`(本地模式)/`header-CDN.html`(云CDN模式)
4041

4142
# Url
4243

@@ -58,10 +59,10 @@ Thanks for `JetBrains` providing us the `Licenses for Open Source Development`
5859
# Update Logs
5960
|更新日期|更新内容|
6061
|:----|:----|
61-
|2021.01.17|生成后自动trim掉前后空格输出。完善ReadMe文档。|
62+
|2021.01.17|生成后自动trim掉前后空格输出。<br>完善ReadMe文档。<br>优化云CDN引入部分。<br>优化returnUtil部分。<br>表明前缀选项(感谢@wwlg的建议)。 <br>是否带字段注释设置(感谢@fengpojian的建议)。<br>优化Mybatis的''!=判断(感谢@zhongsb的建议)。<br>Mybatis-Plus增加Service层(感谢@yf466532479的建议)。 |
6263
|2021.01.16|全新3.0版本：<br>一、前端半vue半js化，更多动态加载项。<br>二、支持更多生成设置，优化生成场景。<br>三、js导入支持本地/CDN模式，支持断网环境轻松使用。|
6364
|2020.10.22|1.tinyint多加一个Short类型转换（感谢@wttHero的建议）|
64-
|2020.10.20|1.修复mapper2 insert代码问题（感谢@mXiaoWan的PR）<br>2.优化对fulltext/index关键字的处理（感谢@WEGFan的反馈）。<br>3.新增日期类型的转换选择（感谢@qingkediguo的建议）。<br>4.新增是否包装类型的转换选择。|
65+
|2020.10.20|1.修复mapper2 insert代码问题（感谢@mXiaoWan的PR）<br>2.优化对fulltext/index关键字的处理（感谢@WEGFan的反馈）。<br>3.新增日期类型的转换选择（感谢@qingkediguo的建议）。<br>4.新增是否包装类型的转换选择(感谢@gzlicanyi的建议)。|
6566
|2020.06.28|优化Util下的BeanUtil，支持更多map.put的操作。整合CRUD模板到SQL(CRUD)模板。|
6667
|2020.06.21|修复FreemarkerUtil的Path问题导致JAR包运行时无法获取template的问题。|
6768
|2020.05.25|1.一些fix,关于封装工具类以及layui模板优化等.<br> 2.优化表备注的获取逻辑.<br> 3.生成时间格式改为yyyy-MM-dd,移除具体的时间,只保留日期|

‎generator-web/src/main/resources/template.json‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,16 @@
130130
},
131131
{
132132
"id": "61",
133+
"name": "plusservice",
134+
"description": "plusservice"
135+
},
136+
{
137+
"id": "62",
133138
"name": "plusmapper",
134139
"description": "plusmapper"
135140
},
136141
{
137-
"id": "62",
142+
"id": "63",
138143
"name": "plusentity",
139144
"description": "plusentity"
140145
}

‎generator-web/src/main/resources/templates/code-generator/beetlsql/beetlcontroller.ftl‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ public class ${classInfo.className}Controller {
2727
${classInfo.className} ${classInfo.className?uncap_first}=sqlManager.unique(${classInfo.className}.class,${classInfo.className?uncap_first}.getId());
2828
if(${classInfo.className?uncap_first}!=null){
2929
sqlManager.updateById(${classInfo.className?uncap_first});
30-
return ${returnUtil}.success("编辑成功");
30+
return ${returnUtilSuccess}("编辑成功");
3131
}else{
3232
sqlManager.insert(${classInfo.className?uncap_first});
33-
return ${returnUtil}.error("保存成功");
33+
return ${returnUtilFailure}("保存成功");
3434
}
3535
}
3636

@@ -42,9 +42,9 @@ public class ${classInfo.className}Controller {
4242
${classInfo.className} ${classInfo.className?uncap_first}=sqlManager.unique(${classInfo.className}.class,id);
4343
if(${classInfo.className?uncap_first}!=null){
4444
sqlManager.deleteById(id);
45-
return ${returnUtil}.success("删除成功");
45+
return ${returnUtilSuccess}("删除成功");
4646
}else{
47-
return ${returnUtil}.error("没有找到该对象");
47+
return ${returnUtilFailure}("没有找到该对象");
4848
}
4949
}
5050

@@ -55,9 +55,9 @@ public class ${classInfo.className}Controller {
5555
public Object find(int id){
5656
${classInfo.className} ${classInfo.className?uncap_first}=sqlManager.unique(${classInfo.className}.class,id);
5757
if(${classInfo.className?uncap_first}!=null){
58-
return ${returnUtil}.success(${classInfo.className?uncap_first});
58+
return ${returnUtilSuccess}(${classInfo.className?uncap_first});
5959
}else{
60-
return ${returnUtil}.error("没有找到该对象");
60+
return ${returnUtilFailure}("没有找到该对象");
6161
}
6262
}
6363

@@ -69,7 +69,7 @@ public class ${classInfo.className}Controller {
6969
@RequestParam(required = false, defaultValue = "0") int pageNumber,
7070
@RequestParam(required = false, defaultValue = "10") int pageSize) {
7171
List<${classInfo.className}> list = sqlManager.query(${classInfo.className}.class).select();
72-
return ${returnUtil}.success(list);
72+
return ${returnUtilSuccess}(list);
7373
}
7474

7575
}

‎generator-web/src/main/resources/templates/code-generator/jpa/jpacontroller.ftl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ public class ${classInfo.className}Controller {
4242
Optional<${classInfo.className}> ${classInfo.className?uncap_first}=${classInfo.className?uncap_first}Repository.findById(id);
4343
if(${classInfo.className?uncap_first}.isPresent()){
4444
${classInfo.className?uncap_first}Repository.deleteById(id);
45-
return ${returnUtil}.success("删除成功");
45+
return ${returnUtilSuccess}("删除成功");
4646
}else{
47-
return ${returnUtil}.error("没有找到该对象");
47+
return ${returnUtilFailure}("没有找到该对象");
4848
}
4949
}
5050

@@ -55,9 +55,9 @@ public class ${classInfo.className}Controller {
5555
public Object find(int id){
5656
Optional<${classInfo.className}> ${classInfo.className?uncap_first}=${classInfo.className?uncap_first}Repository.findById(id);
5757
if(${classInfo.className?uncap_first}.isPresent()){
58-
return ${returnUtil}.success(${classInfo.className?uncap_first}.get());
58+
return ${returnUtilSuccess}(${classInfo.className?uncap_first}.get());
5959
}else{
60-
return ${returnUtil}.error("没有找到该对象");
60+
return ${returnUtilFailure}("没有找到该对象");
6161
}
6262
}
6363

‎generator-web/src/main/resources/templates/code-generator/mybatis-plus/pluscontroller.ftl‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import java.util.List;
1818
import java.util.Map;
1919
</#if>
2020
/**
21-
* @description ${classInfo.classComment}
21+
* @description ${classInfo.classComment}控制器
2222
* @author ${authorName}
2323
* @date ${.now?string('yyyy-MM-dd')}
2424
*/
@@ -42,12 +42,12 @@ public class ${classInfo.className}Controller {
4242
${classInfo.className?uncap_first}Mapper.updateById(${classInfo.className?uncap_first});
4343
}else{
4444
if(${classInfo.className?uncap_first}Mapper.selectOne(new QueryWrapper<${classInfo.className}>().eq("${classInfo.className?uncap_first}_name",${classInfo.className?uncap_first}.get${classInfo.className}Name()))!=null){
45-
return ${returnUtil}.ERROR("保存失败，名字重复");
45+
return ${returnUtilFailure}("保存失败，名字重复");
4646
}
4747
${classInfo.className?uncap_first}.setCreateTime(new Date());
4848
${classInfo.className?uncap_first}Mapper.insert(${classInfo.className?uncap_first});
4949
}
50-
return ${returnUtil}.SUCCESS("保存成功");
50+
return ${returnUtilSuccess}("保存成功");
5151
}
5252

5353
/**
@@ -58,9 +58,9 @@ public class ${classInfo.className}Controller {
5858
${classInfo.className} ${classInfo.className?uncap_first} = ${classInfo.className?uncap_first}Mapper.selectOne(new QueryWrapper<${classInfo.className}>().eq("${classInfo.className?uncap_first}_id",id));
5959
if(${classInfo.className?uncap_first}!=null){
6060
${classInfo.className?uncap_first}Mapper.deleteById(id);
61-
return ${returnUtil}.SUCCESS("删除成功");
61+
return ${returnUtilSuccess}("删除成功");
6262
}else{
63-
return ${returnUtil}.ERROR("没有找到该对象");
63+
return ${returnUtilFailure}("没有找到该对象");
6464
}
6565
}
6666

@@ -71,9 +71,9 @@ public class ${classInfo.className}Controller {
7171
public Object find(int id){
7272
${classInfo.className} ${classInfo.className?uncap_first} = ${classInfo.className?uncap_first}Mapper.selectOne(new QueryWrapper<${classInfo.className}>().eq("${classInfo.className?uncap_first}_id",id));
7373
if(${classInfo.className?uncap_first}!=null){
74-
return ${returnUtil}.SUCCESS(${classInfo.className?uncap_first});
74+
return ${returnUtilSuccess}(${classInfo.className?uncap_first});
7575
}else{
76-
return ${returnUtil}.ERROR("没有找到该对象");
76+
return ${returnUtilFailure}("没有找到该对象");
7777
}
7878
}
7979

@@ -101,8 +101,8 @@ public class ${classInfo.className}Controller {
101101
/**
102102
* 手工分页查询(按需使用)
103103
*/
104-
@PostMapping("/list2")
105-
public ReturnT list2(String searchParams,
104+
/*@PostMapping("/list2")
105+
public Object list2(String searchParams,
106106
@RequestParam(required = false, defaultValue = "0") int page,
107107
@RequestParam(required = false, defaultValue = "10") int limit) {
108108
log.info("searchParams:"+ JSON.toJSONString(searchParams));
@@ -116,8 +116,8 @@ public class ${classInfo.className}Controller {
116116
List<${classInfo.className}> itemList = ${classInfo.className?uncap_first}Mapper.pageAll(queryParamDTO,(page - 1)* limit,limit);
117117
Integer itemCount = ${classInfo.className?uncap_first}Mapper.countAll(queryParamDTO);
118118
//返回结果
119-
return ReturnT.PAGE(itemList,itemCount);
120-
}
119+
return ${returnUtilSuccess}.PAGE(itemList,itemCount);
120+
}*/
121121
@GetMapping("/list")
122122
public ModelAndView listPage(){
123123
return new ModelAndView("${classInfo.className?uncap_first}-list");
@@ -139,11 +139,11 @@ public class ${classInfo.className}Controller {
139139
${classInfo.className?uncap_first}.setUpdateTime(new Date());
140140
${classInfo.className?uncap_first}.setStatus(status);
141141
${classInfo.className?uncap_first}Mapper.updateById(${classInfo.className?uncap_first});
142-
return ReturnT.SUCCESS((status==1)?"已发布":"已暂停");
142+
return ${returnUtilSuccess}((status==1)?"已发布":"已暂停");
143143
}else if(status.equals(${classInfo.className?uncap_first}.getStatus())){
144-
return ReturnT.SUCCESS("状态不正确");
144+
return ${returnUtilFailure}("状态不正确");
145145
}else{
146-
return ReturnT.ERROR();
146+
return ${returnUtilFailure}();
147147
}
148148
}
149149

@@ -152,7 +152,7 @@ public class ${classInfo.className}Controller {
152152
*/
153153
@PostMapping("/execute")
154154
public Object execute(){
155-
return ReturnT.SUCCESS();
155+
return ${returnUtilSuccess};
156156
}
157157
}
158158
}

‎generator-web/src/main/resources/templates/code-generator/mybatis-plus/plusmapper.ftl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import ${packageName}.entity.${classInfo.className};
77
import java.util.List;
88
</#if>
99
/**
10-
* @description ${classInfo.classComment}
10+
* @description ${classInfo.classComment}Mapper
1111
* @author ${authorName}
1212
* @date ${.now?string('yyyy-MM-dd')}
1313
*/

‎generator-web/src/main/resources/templates/code-generator/mybatis-plus/plusservice.ftl‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<#if isWithPackage?exists && isWithPackage==true>package ${packageName}.service;</#if>
2+
<#if isAutoImport?exists && isAutoImport==true>
3+
import org.springframework.stereotype.Service;
4+
import com.baomidou.mybatisplus.extension.service.IService;
5+
</#if>
6+
/**
7+
* @description ${classInfo.classComment}服务层
8+
* @author ${authorName}
9+
* @date ${.now?string('yyyy-MM-dd')}
10+
*/
11+
@Service
12+
public interface ${classInfo.className}Service extends IService<${classInfo.className}> {
13+
14+
15+
16+
}

‎generator-web/src/main/resources/templates/code-generator/mybatis/controller.ftl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class ${classInfo.className}Controller {
2828
* @date ${.now?string('yyyy/MM/dd')}
2929
**/
3030
@RequestMapping("/insert")
31-
public ReturnT<String> insert(${classInfo.className} ${classInfo.className?uncap_first}){
31+
public Object insert(${classInfo.className} ${classInfo.className?uncap_first}){
3232
return ${classInfo.className?uncap_first}Service.insert(${classInfo.className?uncap_first});
3333
}
3434

@@ -58,7 +58,7 @@ public class ${classInfo.className}Controller {
5858
* @date ${.now?string('yyyy/MM/dd')}
5959
**/
6060
@RequestMapping("/load")
61-
public ReturnT<String> load(int id){
61+
public Object load(int id){
6262
return ${classInfo.className?uncap_first}Service.load(id);
6363
}
6464

‎generator-web/src/main/resources/templates/code-generator/mybatis/mybatis.ftl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
2626
<#list classInfo.fieldList as fieldItem >
2727
<#if fieldItem.columnName != "id" >
28-
${r"<if test ='null != "}${fieldItem.fieldName}${r"'>"}
28+
<if "null != ${fieldItem.fieldName} and '' != ${fieldItem.fieldName}">
2929
${fieldItem.columnName}<#if fieldItem_has_next>,</#if>
3030
${r"</if>"}
3131
</#if>
@@ -41,7 +41,7 @@
4141
NOW()<#if fieldItem_has_next>,</#if>
4242
${r"</if>"}
4343
<#else>-->
44-
${r"<if test ='null != "}${fieldItem.fieldName}${r"'>"}
44+
<if "null != ${fieldItem.fieldName} and '' != ${fieldItem.fieldName}">
4545
${r"#{"}${fieldItem.fieldName}${r"}"}<#if fieldItem_has_next>,</#if>
4646
${r"</if>"}
4747
<#--</#if>-->
@@ -61,7 +61,7 @@
6161
<set>
6262
<#list classInfo.fieldList as fieldItem >
6363
<#if fieldItem.columnName != "id" && fieldItem.columnName != "AddTime" && fieldItem.columnName != "UpdateTime" >
64-
${r"<if test ='null != "}${fieldItem.fieldName}${r"'>"}${fieldItem.columnName} = ${r"#{"}${fieldItem.fieldName}${r"}"}<#if fieldItem_has_next>,</#if>${r"</if>"}
64+
<if "null != ${fieldItem.fieldName} and '' != ${fieldItem.fieldName}">${fieldItem.columnName} = ${r"#{"}${fieldItem.fieldName}${r"}"}<#if fieldItem_has_next>,</#if>${r"</if>"}
6565
</#if>
6666
</#list>
6767
</set>

‎generator-web/src/main/resources/templates/code-generator/mybatis/service.ftl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ public interface ${classInfo.className}Service {
1111
/**
1212
* 新增
1313
*/
14-
public ReturnT<String> insert(${classInfo.className} ${classInfo.className?uncap_first});
14+
public Object insert(${classInfo.className} ${classInfo.className?uncap_first});
1515

1616
/**
1717
* 删除
1818
*/
19-
public ReturnT<String> delete(int id);
19+
public Object delete(int id);
2020

2121
/**
2222
* 更新
2323
*/
24-
public ReturnT<String> update(${classInfo.className} ${classInfo.className?uncap_first});
24+
public Object update(${classInfo.className} ${classInfo.className?uncap_first});
2525

2626
/**
2727
* 根据主键 id 查询

0 commit comments

Comments
 (0)