hhyykk/RuoYi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

若依2.2版本发布

Browse Source
This commit is contained in:
RuoYi
2018-07-22 23:05:50 +08:00
parent 9e8d80a699
commit cc9c67cdfb
115 changed files with 1579 additions and 1216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/main/resources/templates/vm/java/Controller.java.vm
View File

@@ -4,7 +4,7 @@ import java.util.List;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
@@ -56,41 +56,45 @@ public class ${className}Controller extends BaseController
/**
* 新增${tableComment}
*/
@RequiresPermissions("${moduleName}:${classname}:add")
@Log(title = "${tableComment}", action = BusinessType.INSERT)
@GetMapping("/add")
public String add()
{
return prefix + "/add";
}
/**
* 新增保存${tableComment}
*/
@RequiresPermissions("${moduleName}:${classname}:add")
@Log(title = "${tableComment}", action = BusinessType.INSERT)
@PostMapping("/add")
@ResponseBody
public AjaxResult addSave(${className} ${classname})
{
return toAjax(${classname}Service.insert${className}(${classname}));
}
/**
* 修改${tableComment}
*/
@RequiresPermissions("${moduleName}:${classname}:edit")
@Log(title = "${tableComment}", action = BusinessType.UPDATE)
@GetMapping("/edit/{${primaryKey.attrname}}")
public String edit(@PathVariable("${primaryKey.attrname}") ${primaryKey.attrType} ${primaryKey.attrname}, Model model)
public String edit(@PathVariable("${primaryKey.attrname}") ${primaryKey.attrType} ${primaryKey.attrname}, ModelMap mmap)
{
${className} ${classname} = ${classname}Service.select${className}ById(${primaryKey.attrname});
model.addAttribute("${classname}", ${classname});
mmap.put("${classname}", ${classname});
return prefix + "/edit";
}
/**
* 保存${tableComment}
* 修改保存${tableComment}
*/
@RequiresPermissions("${moduleName}:${classname}:save")
@Log(title = "${tableComment}", action = BusinessType.SAVE)
@PostMapping("/save")
@RequiresPermissions("${moduleName}:${classname}:edit")
@Log(title = "${tableComment}", action = BusinessType.UPDATE)
@PostMapping("/edit")
@ResponseBody
public AjaxResult save(${className} ${classname})
{
if (${classname}Service.save${className}(${classname}) > 0)
{
return success();
}
return error();
public AjaxResult editSave(${className} ${classname})
{
return toAjax(${classname}Service.update${className}(${classname}));
}
/**
@@ -101,13 +105,8 @@ public class ${className}Controller extends BaseController
@PostMapping( "/remove")
@ResponseBody
public AjaxResult remove(String ids)
{
int rows = ${classname}Service.delete${className}ByIds(ids);
if (rows > 0)
{
return success();
}
return error();
{
return toAjax(${classname}Service.delete${className}ByIds(ids));
}
}

11
src/main/resources/templates/vm/java/Service.java.vm
View File

@@ -42,16 +42,7 @@ public interface I${className}Service
* @return 结果
*/
public int update${className}(${className} ${classname});
/**
* 保存${tableComment}
*
* @param ${classname} ${tableComment}信息
* @return 结果
*/
public int save${className}(${className} ${classname});
/**
* 删除${tableComment}信息
*

25
src/main/resources/templates/vm/java/ServiceImpl.java.vm
View File

@@ -3,7 +3,6 @@ package ${package}.service;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.common.utils.StringUtils;
import ${package}.mapper.${className}Mapper;
import ${package}.domain.${className};
import ${package}.service.I${className}Service;
@@ -68,29 +67,7 @@ public class ${className}ServiceImpl implements I${className}Service
{
return ${classname}Mapper.update${className}(${classname});
}
/**
* 保存${tableComment}
*
* @param ${classname} ${tableComment}信息
* @return 结果
*/
@Override
public int save${className}(${className} ${classname})
{
${primaryKey.attrType} ${primaryKey.attrname} = ${classname}.get${primaryKey.attrName}();
int rows = 0;
if (StringUtils.isNotNull(${primaryKey.attrname}))
{
rows = ${classname}Mapper.update${className}(${classname});
}
else
{
rows = ${classname}Mapper.insert${className}(${classname});
}
return rows;
}
/**
* 删除${tableComment}对象
*