#else
diff --git a/ruoyi-generator/src/main/resources/vm/html/list.html.vm b/ruoyi-generator/src/main/resources/vm/html/list.html.vm
index b339642b6..3f2b52fe5 100644
--- a/ruoyi-generator/src/main/resources/vm/html/list.html.vm
+++ b/ruoyi-generator/src/main/resources/vm/html/list.html.vm
@@ -72,7 +72,7 @@
var prefix = ctx + "${moduleName}/${classname}";
#foreach($column in $columns)
#if(${column.configInfo} && ${column.configInfo.type} == 'dict')
- var datas = [[${@dict.getType('${column.configInfo.value}')}]];
+ var ${column.attrname}_datas = [[${@dict.getType('${column.configInfo.value}')}]];
#end
#end
@@ -89,7 +89,7 @@
checkbox: true
},
#foreach($column in $columns)
-#if($column.columnName == $primaryKey.columnName)
+#if($column.iskey)
{
field : '${column.attrname}',
title : '${column.columnComment}',
@@ -102,7 +102,7 @@
title : '${column.columnComment}',
sortable: true,
formatter: function(value, row, index) {
- return $.table.selectDictLabel(datas, value);
+ return $.table.selectDictLabel(${column.attrname}_datas, value);
}
},
#else
diff --git a/ruoyi-generator/src/main/resources/vm/java/Mapper.java.vm b/ruoyi-generator/src/main/resources/vm/java/Mapper.java.vm
index 076e413de..ce6234012 100644
--- a/ruoyi-generator/src/main/resources/vm/java/Mapper.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/Mapper.java.vm
@@ -1,7 +1,10 @@
package ${package}.mapper;
import ${package}.domain.${className};
-import java.util.List;
+import java.util.List;
+
+import org.springframework.stereotype.Repository;
+import tk.mybatis.mapper.common.Mapper;
/**
* ${tableComment} 数据层
@@ -9,15 +12,16 @@ import java.util.List;
* @author ${author}
* @date ${datetime}
*/
-public interface ${className}Mapper
+@Repository
+public interface ${className}Mapper extends Mapper<${className}>
{
/**
* 查询${tableComment}信息
*
- * @param ${primaryKey.attrname} ${tableComment}ID
+ * @param ${primaryKey.attrname} ${tableComment}
* @return ${tableComment}信息
*/
- public ${className} select${className}ById(${primaryKey.attrType} ${primaryKey.attrname});
+ ${className} select${className}ById(${primaryKey.attrType} ${primaryKey.attrname});
/**
* 查询${tableComment}列表
@@ -25,7 +29,7 @@ public interface ${className}Mapper
* @param ${classname} ${tableComment}信息
* @return ${tableComment}集合
*/
- public List<${className}> select${className}List(${className} ${classname});
+ List<${className}> select${className}List(${className} ${classname});
/**
* 新增${tableComment}
@@ -33,7 +37,7 @@ public interface ${className}Mapper
* @param ${classname} ${tableComment}信息
* @return 结果
*/
- public int insert${className}(${className} ${classname});
+ int insert${className}(${className} ${classname});
/**
* 修改${tableComment}
@@ -41,7 +45,7 @@ public interface ${className}Mapper
* @param ${classname} ${tableComment}信息
* @return 结果
*/
- public int update${className}(${className} ${classname});
+ int update${className}(${className} ${classname});
/**
* 删除${tableComment}
@@ -49,7 +53,7 @@ public interface ${className}Mapper
* @param ${primaryKey.attrname} ${tableComment}ID
* @return 结果
*/
- public int delete${className}ById(${primaryKey.attrType} ${primaryKey.attrname});
+ int delete${className}ById(${primaryKey.attrType} ${primaryKey.attrname});
/**
* 批量删除${tableComment}
@@ -57,6 +61,6 @@ public interface ${className}Mapper
* @param ${primaryKey.attrname}s 需要删除的数据ID
* @return 结果
*/
- public int delete${className}ByIds(String[] ${primaryKey.attrname}s);
+ int delete${className}ByIds(String[] ${primaryKey.attrname}s);
}
\ No newline at end of file
diff --git a/ruoyi-generator/src/main/resources/vm/java/Service.java.vm b/ruoyi-generator/src/main/resources/vm/java/Service.java.vm
index 7276e6b90..72e2560d8 100644
--- a/ruoyi-generator/src/main/resources/vm/java/Service.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/Service.java.vm
@@ -17,7 +17,7 @@ public interface I${className}Service
* @param ${primaryKey.attrname} ${tableComment}ID
* @return ${tableComment}信息
*/
- public ${className} select${className}ById(${primaryKey.attrType} ${primaryKey.attrname});
+ ${className} select${className}ById(${primaryKey.attrType} ${primaryKey.attrname});
/**
* 查询${tableComment}列表
@@ -25,7 +25,7 @@ public interface I${className}Service
* @param ${classname} ${tableComment}信息
* @return ${tableComment}集合
*/
- public List<${className}> select${className}List(${className} ${classname});
+ List<${className}> select${className}List(${className} ${classname});
/**
* 新增${tableComment}
@@ -33,7 +33,7 @@ public interface I${className}Service
* @param ${classname} ${tableComment}信息
* @return 结果
*/
- public int insert${className}(${className} ${classname});
+ int insert${className}(${className} ${classname});
/**
* 修改${tableComment}
@@ -41,7 +41,7 @@ public interface I${className}Service
* @param ${classname} ${tableComment}信息
* @return 结果
*/
- public int update${className}(${className} ${classname});
+ int update${className}(${className} ${classname});
/**
* 删除${tableComment}信息
@@ -49,6 +49,12 @@ public interface I${className}Service
* @param ids 需要删除的数据ID
* @return 结果
*/
- public int delete${className}ByIds(String ids);
-
+ int delete${className}ByIds(String ids);
+
+
+ /**
+ * 删除${tableComment} 单条信息
+ * @return
+ */
+ int delete${className}ById(${primaryKey.attrType} ${primaryKey.attrname});
}
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 c0df374b1..af4e6fd3b 100644
--- a/ruoyi-generator/src/main/resources/vm/java/ServiceImpl.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/ServiceImpl.java.vm
@@ -1,83 +1,111 @@
package ${package}.service.impl;
import java.util.List;
+
+import com.ruoyi.common.core.page.ExampleUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import ${package}.mapper.${className}Mapper;
import ${package}.domain.${className};
import ${package}.service.I${className}Service;
import com.ruoyi.common.core.text.Convert;
+import tk.mybatis.mapper.entity.Example;
/**
* ${tableComment} 服务层实现
- *
+ *
* @author ${author}
* @date ${datetime}
*/
@Service
-public class ${className}ServiceImpl implements I${className}Service
+public class ${className}ServiceImpl implements I${className}Service
{
@Autowired
private ${className}Mapper ${classname}Mapper;
/**
* 查询${tableComment}信息
- *
+ *
* @param ${primaryKey.attrname} ${tableComment}ID
* @return ${tableComment}信息
*/
@Override
public ${className} select${className}ById(${primaryKey.attrType} ${primaryKey.attrname})
{
- return ${classname}Mapper.select${className}ById(${primaryKey.attrname});
+ return ${classname}Mapper.selectByPrimaryKey(${primaryKey.attrname});
}
-
+
/**
* 查询${tableComment}列表
- *
+ *
* @param ${classname} ${tableComment}信息
* @return ${tableComment}集合
*/
@Override
public List<${className}> select${className}List(${className} ${classname})
{
- return ${classname}Mapper.select${className}List(${classname});
+ Example example = new Example(${className}.class);
+ Example.Criteria criteria = example.createCriteria();
+
+#foreach ($column in $columns)
+#if(${column.attrType} != "Date")
+ ExampleUtils.andEqualTo(criteria, "${column.attrname}", ${classname}.get${column.attrName}());
+#elseif(${column.attrType} == "Date")
+ ExampleUtils.andBetweenDateToDate(criteria, "${column.attrname}", ${classname}.getParams().get("begin${column.attrName}"),${classname}.getParams().get("end${column.attrName}"));
+#end
+#end
+
+ return ${classname}Mapper.selectByExample(example);
}
-
+
/**
* 新增${tableComment}
- *
+ *
* @param ${classname} ${tableComment}信息
* @return 结果
*/
@Override
public int insert${className}(${className} ${classname})
{
- return ${classname}Mapper.insert${className}(${classname});
+ return ${classname}Mapper.insertSelective(${classname});
}
-
+
/**
* 修改${tableComment}
- *
+ *
* @param ${classname} ${tableComment}信息
* @return 结果
*/
@Override
public int update${className}(${className} ${classname})
{
- return ${classname}Mapper.update${className}(${classname});
+ return ${classname}Mapper.updateByPrimaryKeySelective(${classname});
}
/**
* 删除${tableComment}对象
- *
+ *
* @param ids 需要删除的数据ID
* @return 结果
*/
@Override
public int delete${className}ByIds(String ids)
{
- return ${classname}Mapper.delete${className}ByIds(Convert.toStrArray(ids));
+ Example example = new Example(${className}.class);
+ Example.Criteria criteria = example.createCriteria();
+ criteria.andIn("${primaryKey.attrname}",Convert.toList(ids));
+ return ${classname}Mapper.deleteByExample(example);
}
-
+
+
+ /**
+ * 删除${tableComment} 单条信息
+ * @param ${primaryKey.attrname} 删除的主键ID
+ * @return
+ */
+ @Override
+ public int delete${className}ById(${primaryKey.attrType} ${primaryKey.attrname}){
+ return ${classname}Mapper.deleteByPrimaryKey(${primaryKey.attrname});
+ }
+
}
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 7184ab5a2..c45e27a4c 100644
--- a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
@@ -1,8 +1,13 @@
package ${package}.domain;
+import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Column;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
#foreach ($column in $columns)
#if($column.attrType == 'Date')
import java.util.Date;
@@ -16,32 +21,24 @@ import java.util.Date;
* @author ${author}
* @date ${datetime}
*/
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Table(name = "${tableName}")
public class ${className} extends BaseEntity
{
private static final long serialVersionUID = 1L;
#foreach ($column in $columns)
- /** $column.columnComment */
+
+ /**字段描述 $column.columnComment */
+#if($column.iskey)
+ @Id
+#end
+ @Column(name = "$column.columnName")
private $column.attrType $column.attrname;
#end
-#foreach ($column in $columns)
- public void set${column.attrName}($column.attrType $column.attrname)
- {
- this.$column.attrname = $column.attrname;
- }
- public $column.attrType get${column.attrName}()
- {
- return $column.attrname;
- }
-#end
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-#foreach ($column in $columns)
- .append("${column.attrname}", get${column.attrName}())
-#end
- .toString();
- }
+
}
diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml
index c886bd260..4b1bc4415 100644
--- a/ruoyi-system/pom.xml
+++ b/ruoyi-system/pom.xml
@@ -28,7 +28,9 @@