From f156e0a094e235101eafb835c9f561a1b4637751 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 22 三月 2021 13:32:20 +0800
Subject: [PATCH] update pr优化
---
ruoyi-generator/src/main/resources/vm/java/queryBo.java.vm | 8 +++++++-
ruoyi-generator/src/main/resources/vm/java/domain.java.vm | 3 +--
ruoyi-system/pom.xml | 5 +++++
ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm | 6 +++---
ruoyi-generator/src/main/resources/vm/java/vo.java.vm | 1 +
ruoyi-generator/src/main/resources/vm/java/addBo.java.vm | 2 +-
ruoyi-generator/src/main/resources/vm/java/editBo.java.vm | 2 +-
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 2f0770f..bf74560 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 @@
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 @@
@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 6fd4695..b06144c 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.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 a0fac48..e1727ed 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 @@
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 @@
@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 7452cfb..33d7d18 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 @@
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 @@
@Data
@ApiModel("${functionName}鍒嗛〉鏌ヨ瀵硅薄")
public class ${ClassName}QueryBo {
- private static final long serialVersionUID = 1L;
+
/** 鍒嗛〉澶у皬 */
@ApiModelProperty("鍒嗛〉澶у皬")
private Integer pageSize;
@@ -39,4 +42,7 @@
private $column.javaType $column.javaField;
#end
#end
+
+ @TableField(exist = false)
+ private Map<String, Object> 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 6a52f89..cacc204 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 @@
#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<String, Object> params = ${className}.getParams();
+ Map<String, Object> 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 8546f5c..0746f0c 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 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 81eb2a2..b36a702 100644
--- a/ruoyi-system/pom.xml
+++ b/ruoyi-system/pom.xml
@@ -23,6 +23,11 @@
<artifactId>ruoyi-common</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.github.xiaoymin</groupId>
+ <artifactId>knife4j-spring-boot-starter</artifactId>
+ </dependency>
+
</dependencies>
</project>
\ No newline at end of file
--
Gitblit v1.9.3