From eb5f3e8884d0dc04cb4cba20ca25136920f91201 Mon Sep 17 00:00:00 2001 From: "20932067@zju.edu.cn" Date: Fri, 22 Jan 2021 21:01:14 +0800 Subject: [PATCH] 11 --- hchyun-ui/src/views/test/stu/index.vue | 330 +++++++++--------- .../hchyun/common/core/entity/BaseEntity.java | 15 + .../resources/vm/java/serviceImpl.java.vm | 10 +- .../src/main/resources/vm/vue/index.vue.vm | 4 +- .../main/java/com/hchyun/test/entity/Stu.java | 3 + .../test/service/impl/StuServiceImpl.java | 4 + .../main/resources/mapper/test/StuMapper.xml | 18 +- 7 files changed, 209 insertions(+), 175 deletions(-) diff --git a/hchyun-ui/src/views/test/stu/index.vue b/hchyun-ui/src/views/test/stu/index.vue index 7a73e5a..314e874 100644 --- a/hchyun-ui/src/views/test/stu/index.vue +++ b/hchyun-ui/src/views/test/stu/index.vue @@ -55,8 +55,7 @@ size="mini" @click="handleAdd" v-hasPermi="['test:stu:add']" - >新增 - + >新增 修改 - + >修改 删除 - + >删除 导出 - + >导出 - - - - - + + + + + - + - + - + - +
@@ -154,173 +148,173 @@ diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/BaseEntity.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/BaseEntity.java index f7e3acd..d502122 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/BaseEntity.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/BaseEntity.java @@ -5,6 +5,7 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; +import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -48,6 +49,11 @@ public class BaseEntity implements Serializable { */ private String remark; + /** + * 参数 + */ + private String parameter; + /** * 开始时间 */ @@ -65,6 +71,15 @@ public class BaseEntity implements Serializable { */ private Map params; + public void setParameter(String parameter) { + if (parameter != null || parameter.equals("")) { + this.parameter = parameter; + JSONObject jsonObject = JSONObject.parseObject(parameter); + params = new HashMap<>(); + params.put("",jsonObject.get("")); + } + } + public String getSearchValue() { return searchValue; } 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 d63497c..59a7087 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 @@ -9,6 +9,10 @@ import com.hchyun.common.constant.ReturnConstants; import com.hchyun.common.utils.DateUtils; #break #end +#if($column.javaField == 'updateBy' || $column.javaField == 'createBy') +import com.hchyun.common.utils.SecurityUtils; +#break +#end #end import com.hchyun.common.utils.ServerResult; import org.slf4j.Logger; @@ -97,7 +101,7 @@ public class ${ClassName}ServiceImpl implements ${ClassName}Service { ${className}.setCreateTime(DateUtils.getNowDate()); #end #if($column.javaField == 'createBy') - ${className}.setCreateBy(SecurityUtils.getUserId()); + ${className}.setCreateBy(SecurityUtils.getUserId()); #end #end #if($table.sub) @@ -134,8 +138,8 @@ public class ${ClassName}ServiceImpl implements ${ClassName}Service { #if($column.javaField == 'updateTime') ${className}.setUpdateTime(DateUtils.getNowDate()); #end -#if($column.javaField == 'createBy') - ${className}.setCreateBy(SecurityUtils.getUserId()); +#if($column.javaField == 'updateBy') + ${className}.setUpdateBy(SecurityUtils.getUserId()); #end #end #if($table.sub) diff --git a/hchyun/hchyun-generator/src/main/resources/vm/vue/index.vue.vm b/hchyun/hchyun-generator/src/main/resources/vm/vue/index.vue.vm index 79789d6..67770cd 100644 --- a/hchyun/hchyun-generator/src/main/resources/vm/vue/index.vue.vm +++ b/hchyun/hchyun-generator/src/main/resources/vm/vue/index.vue.vm @@ -399,7 +399,7 @@ export default { pageNum: 1, pageSize: 10, #foreach ($column in $columns) -#if($column.query) +#if($column.query && $column.htmlType != "datetime" && $column.queryType != "BETWEEN") $column.javaField: null#if($velocityCount != $columns.size()),#end #end @@ -488,6 +488,7 @@ export default { reset() { this.form = { #foreach ($column in $columns) +#if($column.htmlType != "datetime" && $column.queryType != "BETWEEN") #if($column.htmlType == "radio") $column.javaField: #if($column.javaType == "Integer" || $column.javaType == "Long")0#else"0"#end#if($velocityCount != $columns.size()),#end @@ -497,6 +498,7 @@ export default { #else $column.javaField: null#if($velocityCount != $columns.size()),#end +#end #end #end }; 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 61e9720..86b35e6 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 @@ -75,6 +75,9 @@ public class Stu extends BaseEntity .append("tel", getTel()) .append("email", getEmail()) .append("createTime", getCreateTime()) + .append("createBy", getCreateBy()) + .append("updateTime", getUpdateTime()) + .append("updateBy", getUpdateBy()) .toString(); } } diff --git a/hchyun/hchyun-test/src/main/java/com/hchyun/test/service/impl/StuServiceImpl.java b/hchyun/hchyun-test/src/main/java/com/hchyun/test/service/impl/StuServiceImpl.java index 0f59c57..7f412ba 100644 --- a/hchyun/hchyun-test/src/main/java/com/hchyun/test/service/impl/StuServiceImpl.java +++ b/hchyun/hchyun-test/src/main/java/com/hchyun/test/service/impl/StuServiceImpl.java @@ -5,6 +5,7 @@ import java.util.List; import com.hchyun.common.constant.ReturnConstants; import com.hchyun.common.utils.DateUtils; +import com.hchyun.common.utils.SecurityUtils; import com.hchyun.common.utils.ServerResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -79,6 +80,7 @@ public class StuServiceImpl implements StuService { public ServerResult insertStu(Stu stu) { try { stu.setCreateTime(DateUtils.getNowDate()); + stu.setCreateBy(SecurityUtils.getUserId()); Integer renewal = stuDao.insertStu(stu); if (renewal >0){ return new ServerResult(true,renewal); @@ -100,6 +102,8 @@ public class StuServiceImpl implements StuService { @Override public ServerResult updateStu(Stu stu) { try { + stu.setUpdateTime(DateUtils.getNowDate()); + stu.setUpdateBy(SecurityUtils.getUserId()); Integer renewal = stuDao.updateStu(stu); if (renewal >0){ return new ServerResult(true,renewal); 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 8587ea9..ed1778c 100644 --- a/hchyun/hchyun-test/src/main/resources/mapper/test/StuMapper.xml +++ b/hchyun/hchyun-test/src/main/resources/mapper/test/StuMapper.xml @@ -10,18 +10,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + - select id, name, tel, email, create_time from sys_stu + select id, name, tel, email, create_time, create_by, update_time, update_by from sys_stu @@ -38,12 +41,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" tel, email, create_time, + create_by, + update_time, + update_by, #{name}, #{tel}, #{email}, #{createTime}, + #{createBy}, + #{updateTime}, + #{updateBy}, @@ -54,6 +63,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" tel = #{tel}, email = #{email}, create_time = #{createTime}, + create_by = #{createBy}, + update_time = #{updateTime}, + update_by = #{updateBy}, where id = #{id}