diff --git a/hchyun/hchyun-generator/src/main/resources/vm/java/controller.java.vm b/hchyun/hchyun-generator/src/main/resources/vm/java/controller.java.vm index 7e87b05..7392934 100644 --- a/hchyun/hchyun-generator/src/main/resources/vm/java/controller.java.vm +++ b/hchyun/hchyun-generator/src/main/resources/vm/java/controller.java.vm @@ -101,7 +101,7 @@ public class ${ClassName}Controller extends HcyBaseController { @GetMapping(value = "/{${pkColumn.javaField}}") public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) { try { - ServerResult serverResult = ${className}Service.select${ClassName}ById(${pkColumn.javaField}); + ServerResult<${ClassName}> serverResult = ${className}Service.select${ClassName}ById(${pkColumn.javaField}); if (serverResult.isStart()) { return AjaxResult.success(serverResult.getData()); } else { @@ -120,6 +120,22 @@ public class ${ClassName}Controller extends HcyBaseController { @Log(title = "${functionName}", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody ${ClassName} ${className}) { +#foreach ($column in $columns) +#if($column.isRequired == 1) +#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) + #set($AttrName=$column.javaField) +#else + #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) +#end +#if($column.javaType.equals("String")) + if (${className}.get${AttrName}() == null || ${className}.get${AttrName}().equals("")) { +#elseif($column.javaType.equals("Integer")||$column.javaType.equals("Long")) + if (${className}.get${AttrName}() == null || ${className}.get${AttrName}()<0) { +#end + return AjaxResult.error("${column.columnComment}不能为空!"); + } +#end +#end try { ServerResult serverResult = ${className}Service.insert${ClassName}(${className}); if (serverResult.isStart()) { @@ -141,6 +157,23 @@ public class ${ClassName}Controller extends HcyBaseController { @PutMapping public AjaxResult edit(@RequestBody ${ClassName} ${className}) { try { + +#foreach ($column in $columns) +#if($column.isRequired == 1) +#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) + #set($AttrName=$column.javaField) +#else + #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) +#end +#if($column.javaType.equals("String")) + if (${className}.get${AttrName}() == null || ${className}.get${AttrName}().equals("")) { +#elseif($column.javaType.equals("Integer")||$column.javaType.equals("Long")) + if (${className}.get${AttrName}() == null || ${className}.get${AttrName}()<0) { +#end + return AjaxResult.error("${column.columnComment}不能为空!"); + } +#end +#end ServerResult serverResult = ${className}Service.update${ClassName}(${className}); if (serverResult.isStart()) { return AjaxResult.success(); diff --git a/hchyun/hchyun-generator/src/main/resources/vm/java/serviceImpl.java.vm b/hchyun/hchyun-generator/src/main/resources/vm/java/serviceImpl.java.vm index 70a7601..d63497c 100644 --- a/hchyun/hchyun-generator/src/main/resources/vm/java/serviceImpl.java.vm +++ b/hchyun/hchyun-generator/src/main/resources/vm/java/serviceImpl.java.vm @@ -164,7 +164,7 @@ public class ${ClassName}ServiceImpl implements ${ClassName}Service { @Transactional #end @Override - public int delete${ClassName}ByIds(${pkColumn.javaType}[] ${pkColumn.javaField}s) { + public ServerResult delete${ClassName}ByIds(${pkColumn.javaType}[] ${pkColumn.javaField}s) { try { #if($table.sub) ${className}Dao.delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaField}s); @@ -188,7 +188,7 @@ public class ${ClassName}ServiceImpl implements ${ClassName}Service { * @return 结果 */ @Override - public int delete${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField}) { + public ServerResult delete${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField}) { try { #if($table.sub) ${className}Dao.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField}); diff --git a/hchyun/hchyun-test/src/main/java/com/hchyun/test/controller/StuController.java b/hchyun/hchyun-test/src/main/java/com/hchyun/test/controller/StuController.java index d6a3249..24b4fa8 100644 --- a/hchyun/hchyun-test/src/main/java/com/hchyun/test/controller/StuController.java +++ b/hchyun/hchyun-test/src/main/java/com/hchyun/test/controller/StuController.java @@ -2,6 +2,7 @@ package com.hchyun.test.controller; import java.io.Serializable; import java.util.List; +import java.util.regex.Pattern; import com.hchyun.common.constant.ReturnConstants; @@ -25,6 +26,7 @@ import com.hchyun.common.enums.BusinessType; import com.hchyun.test.entity.Stu; import com.hchyun.test.service.StuService; import com.hchyun.common.utils.poi.ExcelUtil; +import com.hchyun.common.core.page.TableDataInfo; /** * 学生Controller @@ -107,6 +109,15 @@ public class StuController extends HcyBaseController { @Log(title = "学生", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody Stu stu) { + if (stu.getName() == null || stu.getName().equals("")) { + return AjaxResult.error("学生姓名不能为空!"); + } + if (stu.getTel() == null || stu.getTel()<0) { + return AjaxResult.error("电话不能为空!"); + } + if (stu.getEmail() == null || stu.getEmail().equals("")) { + return AjaxResult.error("电子邮件不能为空!"); + } try { ServerResult serverResult = stuService.insertStu(stu); if (serverResult.isStart()) { @@ -128,6 +139,16 @@ public class StuController extends HcyBaseController { @PutMapping public AjaxResult edit(@RequestBody Stu stu) { try { + + if (stu.getName() == null || stu.getName().equals("")) { + return AjaxResult.error("学生姓名不能为空!"); + } + if (stu.getTel() == null || stu.getTel()<0) { + return AjaxResult.error("电话不能为空!"); + } + if (stu.getEmail() == null || stu.getEmail().equals("")) { + return AjaxResult.error("电子邮件不能为空!"); + } ServerResult serverResult = stuService.updateStu(stu); if (serverResult.isStart()) { return AjaxResult.success(); diff --git a/hchyun/hchyun-test/src/main/java/com/hchyun/test/entity/Stu.java b/hchyun/hchyun-test/src/main/java/com/hchyun/test/entity/Stu.java index 5ec8d70..61e9720 100644 --- a/hchyun/hchyun-test/src/main/java/com/hchyun/test/entity/Stu.java +++ b/hchyun/hchyun-test/src/main/java/com/hchyun/test/entity/Stu.java @@ -69,7 +69,7 @@ public class Stu extends BaseEntity @Override public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) .append("id", getId()) .append("name", getName()) .append("tel", getTel()) diff --git a/hchyun/hchyun-test/src/main/resources/mapper/test/StuMapper.xml b/hchyun/hchyun-test/src/main/resources/mapper/test/StuMapper.xml index 896149c..8587ea9 100644 --- a/hchyun/hchyun-test/src/main/resources/mapper/test/StuMapper.xml +++ b/hchyun/hchyun-test/src/main/resources/mapper/test/StuMapper.xml @@ -34,15 +34,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into sys_stu - name, + name, tel, - email, + email, create_time, - #{name}, + #{name}, #{tel}, - #{email}, + #{email}, #{createTime}, @@ -50,9 +50,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update sys_stu - name = #{name}, + name = #{name}, tel = #{tel}, - email = #{email}, + email = #{email}, create_time = #{createTime}, where id = #{id}