Skip to content

Commit

Permalink
|2021.08.07|新增当前模板保持功能,重新生成代码后依然会保持在当前选择模板。<br>新增renren-fast模板。|
Browse files Browse the repository at this point in the history
|2021.08.05|解决 update 方法语法错误;调整部分语句避免sonarLint告警(感谢@Henry586的PR);<br>add swagger-yml.ftl(感谢@fuuqiu的PR);<br>支持common-mapper&修复entity和plusentity的swagger引包错误(感谢@chentianming11的PR)|
  • Loading branch information
moshowgame committed Aug 7, 2021
1 parent 6aa41d5 commit 45d380c
Show file tree
Hide file tree
Showing 14 changed files with 496 additions and 23 deletions.
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
>generate to many popular templates by ddl-sql/insert-sql/simple json<br>
> 可通过`建表SQL语句``INSERT语句`或者`简单JSON`生成`JPA/JdbcTemplate/Mybatis/MybatisPlus/BeetlSQL/CommonMapper`相关模板代码.
>
>thanks for your using and feedback,I'm inspired by the 600PV every day and github more than 700 stars <br>
> 感谢大家的使用和反馈,每天六百的PV和获得超过七百多的星星是我前进和继续做下去的动力
>thanks for your using and feedback,I'm inspired by the 600PV every day and github more than 900 stars <br>
> 感谢大家的使用和反馈,每天六百的PV和获得超过九百多的星星是我前进和继续做下去的动力
>
>hope everyone can keep good balance on work and life , stay health and safety , be smooth on work as well<br>
> 愿大家可以维持生活和工作平衡,保持健康和安全,祝大家工作顺利!
Expand Down Expand Up @@ -60,6 +60,8 @@ Thanks for `JetBrains` providing us the `Licenses for Open Source Development`
# Update Logs
|更新日期|更新内容|
|:----|:----|
|2021.08.07|新增当前模板保持功能,重新生成代码后依然会保持在当前选择模板。<br>新增renren-fast模板。|
|2021.08.05|解决 update 方法语法错误;调整部分语句避免sonarLint告警(感谢@Henry586的PR);<br>add swagger-yml.ftl(感谢@fuuqiu的PR);<br>支持common-mapper&修复entity和plusentity的swagger引包错误(感谢@chentianming11的PR)|
|2021.03.24|修复Mybatis.XML中缺失test=关键字问题。(感谢@BWHN/YUEHUI的反馈)。|
|2021.01.18|OEM信息优化,支持多配置文件模式,支持在application*.yml自定义信息,以及切换local/cdn模式。|
|2021.01.17|生成后自动trim掉前后空格输出。<br>完善ReadMe文档。<br>优化云CDN引入部分。<br>优化returnUtil部分。<br>表明前缀选项(感谢@wwlg的建议)。 <br>是否带字段注释设置(感谢@fengpojian的建议)。<br>优化Mybatis的''!=判断(感谢@zhongsb的建议)。<br>Mybatis-Plus增加Service层(感谢@yf466532479的建议)。 |
Expand Down
2 changes: 1 addition & 1 deletion generator-web/src/main/resources/application-bejson.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ spring:
#mvc:
# static-path-pattern: /statics/**
OEM:
version: 3.1
version: 3.2
header: SQL转Java JPA、MYBATIS实现类代码生成平台
keywords: sql转实体类,sql转DAO,SQL转service,SQL转JPA实现,SQL转MYBATIS实现
title: JAVA在线代码生成
Expand Down
2 changes: 1 addition & 1 deletion generator-web/src/main/resources/application-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ spring:
#mvc:
# static-path-pattern: /statics/**
OEM:
version: 3.1
version: 3.2
header: SQL转Java JPA、MYBATIS实现类代码生成平台
keywords: sql转实体类,sql转DAO,SQL转service,SQL转JPA实现,SQL转MYBATIS实现
title: JAVA代码生成平台
Expand Down
2 changes: 1 addition & 1 deletion generator-web/src/main/resources/application-devtools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ spring:
#mvc:
# static-path-pattern: /statics/**
OEM:
version: 3.1
version: 3.2
header: SQL转Java JPA、MYBATIS实现类代码生成平台
keywords: sql转实体类,sql转DAO,SQL转service,SQL转JPA实现,SQL转MYBATIS实现
title: JAVA在线代码生成
Expand Down
16 changes: 10 additions & 6 deletions generator-web/src/main/resources/statics/js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ const vm = new Vue({
},
templates:[{}],
historicalData:[],
currentSelect:'plusentity',
outputStr: "${(value.outputStr)!!}",
outputJson: {}
},
Expand All @@ -69,10 +70,13 @@ const vm = new Vue({
setOutputModel: function (event) {
const targetModel = event.target.innerText.trim();
console.log(targetModel);
vm.outputStr=vm.outputJson[targetModel];
$.outputArea.setValue(vm.outputStr.trim());
//console.log(vm.outputStr);
$.outputArea.setSize('auto', 'auto');
vm.currentSelect = targetModel ;
if(vm.outputStr.length>30){
vm.outputStr=vm.outputJson[targetModel];
$.outputArea.setValue(vm.outputStr.trim());
//console.log(vm.outputStr);
$.outputArea.setSize('auto', 'auto');
}
},
//switch HistoricalData
switchHistoricalData: function (event) {
Expand All @@ -86,7 +90,7 @@ const vm = new Vue({
}else{
alert("浏览器不支持sessionStorage");
}
vm.outputStr=vm.outputJson["plusentity"].trim();
vm.outputStr=vm.outputJson[vm.currentSelect].trim();
$.outputArea.setValue(vm.outputStr);
//console.log(vm.outputStr);
$.outputArea.setSize('auto', 'auto');
Expand Down Expand Up @@ -122,7 +126,7 @@ const vm = new Vue({
//console.log(res.outputJson);
vm.outputJson=res.outputJson;
// console.log(vm.outputJson["bootstrap-ui"]);
vm.outputStr=vm.outputJson["plusentity"].trim();
vm.outputStr=vm.outputJson[vm.currentSelect].trim();
//console.log(vm.outputJson["bootstrap-ui"]);
//console.log(vm.outputStr);
$.outputArea.setValue(vm.outputStr);
Expand Down
64 changes: 52 additions & 12 deletions generator-web/src/main/resources/template.json
Original file line number Diff line number Diff line change
Expand Up @@ -177,17 +177,57 @@
},

{
"group": "common-mapper",
"templates": [{
"id": "74",
"name": "tkentity",
"description": "tkentity"
"group": "common-mapper",
"templates": [{
"id": "81",
"name": "tkentity",
"description": "tkentity"
},
{
"id": "82",
"name": "tkmapper",
"description": "tkmapper"
}
]
},
{
"id": "75",
"name": "tkmapper",
"description": "tkmapper"
}
]
}

{
"group": "renren-fast",
"templates": [{
"id": "91",
"name": "menu-sql",
"description": "menu-sql"
},
{
"id": "92",
"name": "vue-list",
"description": "vue-list"
},
{
"id": "93",
"name": "vue-edit",
"description": "vue-edit"
},
{
"id": "94",
"name": "rr-controller",
"description": "rr-controller"
},
{
"id": "95",
"name": "rr-dao",
"description": "rr-dao"
},
{
"id": "96",
"name": "rr-daoxml",
"description": "rr-daoxml"
},
{
"id": "97",
"name": "rr-service",
"description": "rr-service"
}
]
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
-- 菜单SQL
INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
VALUES ('1', '${classInfo.classComment}', 'generator/${classInfo.className?uncap_first}', NULL, '1', 'config', '6');

-- 按钮父菜单ID
set @parentId = @@identity;

-- 菜单对应按钮SQL
INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
SELECT @parentId, '查看', null, 'generator:${classInfo.className?uncap_first}:list,generator:${classInfo.className?uncap_first}:info', '2', null, '6';
INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
SELECT @parentId, '新增', null, 'generator:${classInfo.className?uncap_first}:save', '2', null, '6';
INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
SELECT @parentId, '修改', null, 'generator:${classInfo.className?uncap_first}:update', '2', null, '6';
INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
SELECT @parentId, '删除', null, 'generator:${classInfo.className?uncap_first}:delete', '2', null, '6';

Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
<#if isWithPackage?exists && isWithPackage==true>package ${packageName}.controller;</#if>
<#if isAutoImport?exists && isAutoImport==true>
import java.util.Arrays;
import java.util.Map;

import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import ${packageName}.entity.${classInfo.className}Entity;
import ${packageName}.service.${classInfo.className}Service;
import ${packageName}.common.utils.PageUtils;
import ${packageName}.common.utils.R;
</#if>


/**
* @description ${classInfo.classComment}控制器
* @author ${authorName}
* @date ${.now?string('yyyy-MM-dd')}
*/
@RestController
@RequestMapping("generator/${classInfo.className?uncap_first}")
public class ${classInfo.className}Controller {

@Autowired
private ${classInfo.className}Service ${classInfo.className?uncap_first}Service;

/**
* 列表
*/
@RequestMapping("/list")
@RequiresPermissions("generator:${classInfo.className?uncap_first}:list")
public R list(@RequestParam Map<String, Object> params){
PageUtils page = ${classInfo.className?uncap_first}Service.queryPage(params);

return R.ok().put("page", page);
}


/**
* 信息
*/
@RequestMapping("/info/{${classInfo.className?uncap_first}Id}")
@RequiresPermissions("generator:${classInfo.className?uncap_first}:info")
public R info(@PathVariable("${classInfo.className?uncap_first}Id") int ${classInfo.className?uncap_first}Id){
${classInfo.className}Entity ${classInfo.className?uncap_first} = ${classInfo.className?uncap_first}Service.getById(${classInfo.className?uncap_first}Id);

return R.ok().put("${classInfo.className?uncap_first}", ${classInfo.className?uncap_first});
}

/**
* 保存
*/
@RequestMapping("/save")
@RequiresPermissions("generator:${classInfo.className?uncap_first}:save")
public R save(@RequestBody ${classInfo.className}Entity ${classInfo.className?uncap_first}){
${classInfo.className?uncap_first}Service.save(${classInfo.className?uncap_first});

return R.ok();
}

/**
* 修改
*/
@RequestMapping("/update")
@RequiresPermissions("generator:${classInfo.className?uncap_first}:update")
public R update(@RequestBody ${classInfo.className}Entity ${classInfo.className?uncap_first}){
${classInfo.className?uncap_first}Service.updateById(${classInfo.className?uncap_first});

return R.ok();
}

/**
* 删除
*/
@RequestMapping("/delete")
@RequiresPermissions("generator:${classInfo.className?uncap_first}:delete")
public R delete(@RequestBody int[] ${classInfo.className?uncap_first}Ids){
${classInfo.className?uncap_first}Service.removeByIds(Arrays.asList(${classInfo.className?uncap_first}Ids));

return R.ok();
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<#if isWithPackage?exists && isWithPackage==true>package ${packageName}.mapper;</#if>
<#if isAutoImport?exists && isAutoImport==true>
import ${packageName}.entity.${classInfo.className}Entity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
</#if>
/**
* @description ${classInfo.classComment}Mapper
* @author ${authorName}
* @date ${.now?string('yyyy-MM-dd')}
*/
@Mapper
public interface ${classInfo.className}Dao extends BaseMapper<${classInfo.className}Entity> {

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">

<mapper namespace="${packageName}.dao.${classInfo.className}Dao">

<!-- 可根据自己的需求,是否要使用 -->
<resultMap type="${packageName}.entity.${classInfo.className}Entity" id="${classInfo.className}Map">
<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
<#list classInfo.fieldList as fieldItem >
<result property="${fieldItem.fieldName}" column="${fieldItem.fieldName}"/>
</#list>
</#if>
</resultMap>

</mapper>
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<#if isWithPackage?exists && isWithPackage==true>package ${packageName}.service;</#if>
<#if isAutoImport?exists && isAutoImport==true>
import org.springframework.stereotype.Service;
import java.util.Map;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import ${packageName}.common.utils.PageUtils;
import ${packageName}.common.utils.Query;

import ${packageName}.dao.${classInfo.className}Dao;
import ${packageName}.entity.${classInfo.className}Entity;
</#if>

@Service("${classInfo.className?uncap_first}Service")
public class ${classInfo.className}Service extends ServiceImpl<${classInfo.className}Dao, ${classInfo.className}Entity> {

@Override
public PageUtils queryPage(Map<String, Object> params) {
IPage<${classInfo.className}Entity> page = this.page(
new Query<${classInfo.className}Entity>().getPage(params),
new QueryWrapper<${classInfo.className}Entity>()
);

return new PageUtils(page);
}

}
Loading

0 comments on commit 45d380c

Please sign in to comment.