From f156e0a094e235101eafb835c9f561a1b4637751 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Mon, 22 Mar 2021 13:32:20 +0800 Subject: [PATCH] =?UTF-8?q?update=20pr=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-generator/src/main/resources/vm/java/addBo.java.vm | 2 +- ruoyi-generator/src/main/resources/vm/java/domain.java.vm | 3 +-- ruoyi-generator/src/main/resources/vm/java/editBo.java.vm | 2 +- .../src/main/resources/vm/java/queryBo.java.vm | 8 +++++++- .../src/main/resources/vm/java/serviceImpl.java.vm | 6 +++--- ruoyi-generator/src/main/resources/vm/java/vo.java.vm | 1 + ruoyi-system/pom.xml | 5 +++++ 7 files changed, 19 insertions(+), 8 deletions(-) diff --git a/ruoyi-generator/src/main/resources/vm/java/addBo.java.vm b/ruoyi-generator/src/main/resources/vm/java/addBo.java.vm index 2f0770fe..bf74560c 100644 --- a/ruoyi-generator/src/main/resources/vm/java/addBo.java.vm +++ b/ruoyi-generator/src/main/resources/vm/java/addBo.java.vm @@ -3,6 +3,7 @@ package ${packageName}.bo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; #foreach ($import in $importList) @@ -18,7 +19,6 @@ import ${import}; @Data @ApiModel("${functionName}添加对象") public class ${ClassName}AddBo { - private static final long serialVersionUID = 1L; #foreach ($column in $columns) #if($column.isInsert && $column.isPk!=1) diff --git a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm index 6fd46957..b06144cb 100644 --- a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm +++ b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm @@ -6,9 +6,8 @@ import lombok.NoArgsConstructor; import lombok.experimental.Accessors; import java.io.Serializable; import java.util.Date; -import java.util.Map; -import java.util.HashMap; import java.math.BigDecimal; +import com.ruoyi.common.annotation.Excel; /** * ${functionName}对象 ${tableName} diff --git a/ruoyi-generator/src/main/resources/vm/java/editBo.java.vm b/ruoyi-generator/src/main/resources/vm/java/editBo.java.vm index a0fac483..e1727edf 100644 --- a/ruoyi-generator/src/main/resources/vm/java/editBo.java.vm +++ b/ruoyi-generator/src/main/resources/vm/java/editBo.java.vm @@ -3,6 +3,7 @@ package ${packageName}.bo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; #foreach ($import in $importList) import ${import}; @@ -17,7 +18,6 @@ import ${import}; @Data @ApiModel("${functionName}编辑对象") public class ${ClassName}EditBo { - private static final long serialVersionUID = 1L; #foreach ($column in $columns) #if($column.isEdit) diff --git a/ruoyi-generator/src/main/resources/vm/java/queryBo.java.vm b/ruoyi-generator/src/main/resources/vm/java/queryBo.java.vm index 7452cfbd..33d7d18a 100644 --- a/ruoyi-generator/src/main/resources/vm/java/queryBo.java.vm +++ b/ruoyi-generator/src/main/resources/vm/java/queryBo.java.vm @@ -3,6 +3,9 @@ package ${packageName}.bo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; +import java.util.Map; +import java.util.HashMap; #foreach ($import in $importList) import ${import}; @@ -17,7 +20,7 @@ import ${import}; @Data @ApiModel("${functionName}分页查询对象") public class ${ClassName}QueryBo { - private static final long serialVersionUID = 1L; + /** 分页大小 */ @ApiModelProperty("分页大小") private Integer pageSize; @@ -39,4 +42,7 @@ public class ${ClassName}QueryBo { private $column.javaType $column.javaField; #end #end + + @TableField(exist = false) + private Map params = new HashMap<>(); } diff --git a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm index 6a52f893..cacc204d 100644 --- a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm +++ b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm @@ -1,11 +1,11 @@ package ${packageName}.service.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.StrUtil; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import org.apache.commons.lang3.StringUtils; import ${packageName}.bo.${ClassName}AddBo; import ${packageName}.bo.${ClassName}QueryBo; import ${packageName}.bo.${ClassName}EditBo; @@ -47,13 +47,13 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${C #set($mpMethod=$column.queryType.toLowerCase()) #if($queryType != 'BETWEEN') #if($javaType == 'String') -#set($condition='StringUtils.isNotBlank(bo.get'+$AttrName+'())') +#set($condition='StrUtil.isNotBlank(bo.get'+$AttrName+'())') #else #set($condition='bo.get'+$AttrName+'() != null') #end lqw.$mpMethod($condition, ${ClassName}::get$AttrName, bo.get$AttrName()); #else - Map params = ${className}.getParams(); + Map params = bo.getParams(); if (params.get("begin$AttrName") != null && params.get("end$AttrName") != null) { lqw.between(${ClassName}::get$AttrName ,params.get("begin$AttrName"), params.get("end$AttrName")); } diff --git a/ruoyi-generator/src/main/resources/vm/java/vo.java.vm b/ruoyi-generator/src/main/resources/vm/java/vo.java.vm index 8546f5cf..0746f0cb 100644 --- a/ruoyi-generator/src/main/resources/vm/java/vo.java.vm +++ b/ruoyi-generator/src/main/resources/vm/java/vo.java.vm @@ -8,6 +8,7 @@ import ${import}; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml index 81eb2a28..b36a7021 100644 --- a/ruoyi-system/pom.xml +++ b/ruoyi-system/pom.xml @@ -23,6 +23,11 @@ ruoyi-common + + com.github.xiaoymin + knife4j-spring-boot-starter + + \ No newline at end of file