From d9bd2f5f801347744f27b33536c13039a52fc789 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 07 五月 2025 15:31:09 +0800
Subject: [PATCH] 1.MapperScan 2.代码生成器
---
src/main/resources/vm/java/sub-domain.java.vm | 105 +++++-----
src/main/resources/vm/java/domain.java.vm | 135 +++++++------
src/main/resources/vm/java/serviceImpl.java.vm | 181 ++++++++---------
src/main/java/com/ruoyi/basic/controller/CustomerController.java | 11 -
src/main/java/com/ruoyi/framework/config/ApplicationConfig.java | 2
src/main/resources/vm/java/mapper.java.vm | 68 +++---
src/main/java/com/ruoyi/basic/service/ICustomerService.java | 17
src/main/java/com/ruoyi/RuoYiApplication.java | 5
src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java | 11
src/main/resources/vm/java/service.java.vm | 18
10 files changed, 268 insertions(+), 285 deletions(-)
diff --git a/src/main/java/com/ruoyi/RuoYiApplication.java b/src/main/java/com/ruoyi/RuoYiApplication.java
index 3d51a2e..32a9331 100644
--- a/src/main/java/com/ruoyi/RuoYiApplication.java
+++ b/src/main/java/com/ruoyi/RuoYiApplication.java
@@ -1,19 +1,14 @@
package com.ruoyi;
-import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-
/**
* 鍚姩绋嬪簭
*
* @author ruoyi
*/
@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
-@MapperScan("com.ruoyi.basic.mapper")
public class RuoYiApplication
{
public static void main(String[] args)
diff --git a/src/main/java/com/ruoyi/basic/controller/CustomerController.java b/src/main/java/com/ruoyi/basic/controller/CustomerController.java
index 1c27557..1a81652 100644
--- a/src/main/java/com/ruoyi/basic/controller/CustomerController.java
+++ b/src/main/java/com/ruoyi/basic/controller/CustomerController.java
@@ -6,8 +6,6 @@
import com.ruoyi.basic.pojo.Customer;
import com.ruoyi.basic.service.ICustomerService;
import lombok.AllArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
@@ -34,13 +32,11 @@
@AllArgsConstructor
public class CustomerController extends BaseController
{
- @Autowired
private ICustomerService customerService;
/**
* 鏌ヨ瀹㈡埛妗ｆ鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:customer:list')")
@GetMapping("/list")
public TableDataInfo list(Customer customer)
{
@@ -52,7 +48,6 @@
/**
* 瀵煎嚭瀹㈡埛妗ｆ鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:customer:export')")
@Log(title = "瀹㈡埛妗ｆ", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, Customer customer)
@@ -65,7 +60,6 @@
/**
* 鑾峰彇瀹㈡埛妗ｆ璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('system:customer:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -75,9 +69,8 @@
/**
* 鏂板瀹㈡埛妗ｆ
*/
- @PreAuthorize("@ss.hasPermi('system:customer:add')")
@Log(title = "瀹㈡埛妗ｆ", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping ("/addCustomer")
public AjaxResult add(@RequestBody Customer customer)
{
return toAjax(customerService.insertCustomer(customer));
@@ -86,7 +79,6 @@
/**
* 淇敼瀹㈡埛妗ｆ
*/
- @PreAuthorize("@ss.hasPermi('system:customer:edit')")
@Log(title = "瀹㈡埛妗ｆ", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody Customer customer)
@@ -97,7 +89,6 @@
/**
* 鍒犻櫎瀹㈡埛妗ｆ
*/
- @PreAuthorize("@ss.hasPermi('system:customer:remove')")
@Log(title = "瀹㈡埛妗ｆ", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
diff --git a/src/main/java/com/ruoyi/basic/service/ICustomerService.java b/src/main/java/com/ruoyi/basic/service/ICustomerService.java
index 6e6df82..598506b 100644
--- a/src/main/java/com/ruoyi/basic/service/ICustomerService.java
+++ b/src/main/java/com/ruoyi/basic/service/ICustomerService.java
@@ -7,15 +7,14 @@
/**
* 瀹㈡埛妗ｆService鎺ュ彛
- *
+ *
* @author ruoyi
* @date 2025-05-07
*/
-public interface ICustomerService extends IService<Customer>
-{
+public interface ICustomerService extends IService<Customer> {
/**
* 鏌ヨ瀹㈡埛妗ｆ
- *
+ *
* @param id 瀹㈡埛妗ｆ涓婚敭
* @return 瀹㈡埛妗ｆ
*/
@@ -23,7 +22,7 @@
/**
* 鏌ヨ瀹㈡埛妗ｆ鍒楄〃
- *
+ *
* @param customer 瀹㈡埛妗ｆ
* @return 瀹㈡埛妗ｆ闆嗗悎
*/
@@ -31,7 +30,7 @@
/**
* 鏂板瀹㈡埛妗ｆ
- *
+ *
* @param customer 瀹㈡埛妗ｆ
* @return 缁撴灉
*/
@@ -39,7 +38,7 @@
/**
* 淇敼瀹㈡埛妗ｆ
- *
+ *
* @param customer 瀹㈡埛妗ｆ
* @return 缁撴灉
*/
@@ -47,7 +46,7 @@
/**
* 鎵归噺鍒犻櫎瀹㈡埛妗ｆ
- *
+ *
* @param ids 闇�瑕佸垹闄ょ殑瀹㈡埛妗ｆ涓婚敭闆嗗悎
* @return 缁撴灉
*/
@@ -55,7 +54,7 @@
/**
* 鍒犻櫎瀹㈡埛妗ｆ淇℃伅
- *
+ *
* @param id 瀹㈡埛妗ｆ涓婚敭
* @return 缁撴灉
*/
diff --git a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
index 02cd697..e926f01 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.basic.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.mapper.CustomerMapper;
@@ -31,7 +32,7 @@
*/
@Override
public Customer selectCustomerById(Long id) {
- return customerMapper.selectCustomerById(id);
+ return customerMapper.selectById(id);
}
/**
@@ -42,7 +43,7 @@
*/
@Override
public List<Customer> selectCustomerList(Customer customer) {
- return customerMapper.selectCustomerList(customer);
+ return customerMapper.selectList(new LambdaQueryWrapper<>());
}
/**
@@ -53,7 +54,7 @@
*/
@Override
public int insertCustomer(Customer customer) {
- return customerMapper.insertCustomer(customer);
+ return customerMapper.insert(customer);
}
/**
@@ -64,7 +65,7 @@
*/
@Override
public int updateCustomer(Customer customer) {
- return customerMapper.updateCustomer(customer);
+ return customerMapper.updateById(customer);
}
/**
@@ -86,6 +87,6 @@
*/
@Override
public int deleteCustomerById(Long id) {
- return customerMapper.deleteCustomerById(id);
+ return customerMapper.deleteById(id);
}
}
diff --git a/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java b/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java
index 5a6da11..66a00e7 100644
--- a/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java
+++ b/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java
@@ -16,7 +16,7 @@
// 琛ㄧず閫氳繃aop妗嗘灦鏆撮湶璇ヤ唬鐞嗗璞�,AopContext鑳藉璁块棶
@EnableAspectJAutoProxy(exposeProxy = true)
// 鎸囧畾瑕佹壂鎻忕殑Mapper绫荤殑鍖呯殑璺緞
-@MapperScan("com.ruoyi.project.**.mapper")
+@MapperScan("com.ruoyi.**.mapper")
public class ApplicationConfig
{
/**
diff --git a/src/main/resources/vm/java/domain.java.vm b/src/main/resources/vm/java/domain.java.vm
index c2098c5..c65f933 100644
--- a/src/main/resources/vm/java/domain.java.vm
+++ b/src/main/resources/vm/java/domain.java.vm
@@ -3,103 +3,110 @@
#foreach ($import in $importList)
import ${import};
#end
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.rchuing.sis.common.annotation.Excel;
#if($table.crud || $table.sub)
-import com.ruoyi.framework.web.domain.BaseEntity;
+import com.rchuing.sis.common.core.domain.BaseEntity;
#elseif($table.tree)
-import com.ruoyi.framework.web.domain.TreeEntity;
+import com.fenghuang.common.core.domain.TreeEntity;
#end
/**
* ${functionName}瀵硅薄 ${tableName}
- *
+ *
* @author ${author}
* @date ${datetime}
*/
#if($table.crud || $table.sub)
-#set($Entity="BaseEntity")
+ #set($Entity="BaseEntity")
#elseif($table.tree)
-#set($Entity="TreeEntity")
+ #set($Entity="TreeEntity")
#end
+@TableName(resultMap = "${packageName}.mapper.${ClassName}Mapper.${ClassName}Result")
public class ${ClassName} extends ${Entity}
-{
- private static final long serialVersionUID = 1L;
+ {
+private static final long serialVersionUID = 1L;
#foreach ($column in $columns)
-#if(!$table.isSuperColumn($column.javaField))
+ #if(!$table.isSuperColumn($column.javaField))
/** $column.columnComment */
-#if($column.list)
-#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($parentheseIndex != -1)
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-#elseif($column.javaType == 'Date')
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd")
-#else
- @Excel(name = "${comment}")
-#end
-#end
+ #if($column.list)
+ #set($parentheseIndex=$column.columnComment.indexOf("锛�"))
+ #if($parentheseIndex != -1)
+ #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+ #else
+ #set($comment=$column.columnComment)
+ #end
+ #if($parentheseIndex != -1)
+ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ #elseif($column.javaType == 'Date')
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd")
+ #else
+ @Excel(name = "${comment}")
+ #end
+ #end
+ #if($column.isPk == 1)
+ @TableId(value = "$column.columnName",type = IdType.AUTO)
+ #end
private $column.javaType $column.javaField;
-#end
+ #end
#end
#if($table.sub)
- /** $table.subTable.functionName淇℃伅 */
- private List<${subClassName}> ${subclassName}List;
+/** $table.subTable.functionName淇℃伅 */
+private List<${subClassName}> ${subclassName}List;
#end
#foreach ($column in $columns)
-#if(!$table.isSuperColumn($column.javaField))
-#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
- public void set${AttrName}($column.javaType $column.javaField)
- {
- this.$column.javaField = $column.javaField;
- }
+ #if(!$table.isSuperColumn($column.javaField))
+ #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
+ public void set${AttrName}($column.javaType $column.javaField)
+ {
+ this.$column.javaField = $column.javaField;
+ }
- public $column.javaType get${AttrName}()
- {
- return $column.javaField;
- }
+ public $column.javaType get${AttrName}()
+ {
+ return $column.javaField;
+ }
+ #end
+#end
-#end
-#end
#if($table.sub)
- public List<${subClassName}> get${subClassName}List()
- {
+public List<${subClassName}> get${subClassName}List()
+ {
return ${subclassName}List;
- }
+ }
- public void set${subClassName}List(List<${subClassName}> ${subclassName}List)
- {
+public void set${subClassName}List(List<${subClassName}> ${subclassName}List)
+ {
this.${subclassName}List = ${subclassName}List;
- }
+ }
#end
- @Override
- public String toString() {
+@Override
+public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-#foreach ($column in $columns)
-#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
+ #foreach ($column in $columns)
+ #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
.append("${column.javaField}", get${AttrName}())
-#end
-#if($table.sub)
+ #end
+ #if($table.sub)
.append("${subclassName}List", get${subClassName}List())
-#end
- .toString();
- }
-}
+ #end
+ .toString();
+ }
+ }
diff --git a/src/main/resources/vm/java/mapper.java.vm b/src/main/resources/vm/java/mapper.java.vm
index 6f03179..585c817 100644
--- a/src/main/resources/vm/java/mapper.java.vm
+++ b/src/main/resources/vm/java/mapper.java.vm
@@ -1,6 +1,7 @@
package ${packageName}.mapper;
import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import ${packageName}.domain.${ClassName};
#if($table.sub)
import ${packageName}.domain.${subClassName};
@@ -8,15 +9,14 @@
/**
* ${functionName}Mapper鎺ュ彛
- *
+ *
* @author ${author}
* @date ${datetime}
*/
-public interface ${ClassName}Mapper
-{
+public interface ${ClassName}Mapper extends BaseMapper<${ClassName}> {
/**
* 鏌ヨ${functionName}
- *
+ *
* @param ${pkColumn.javaField} ${functionName}涓婚敭
* @return ${functionName}
*/
@@ -24,7 +24,7 @@
/**
* 鏌ヨ${functionName}鍒楄〃
- *
+ *
* @param ${className} ${functionName}
* @return ${functionName}闆嗗悎
*/
@@ -32,7 +32,7 @@
/**
* 鏂板${functionName}
- *
+ *
* @param ${className} ${functionName}
* @return 缁撴灉
*/
@@ -40,7 +40,7 @@
/**
* 淇敼${functionName}
- *
+ *
* @param ${className} ${functionName}
* @return 缁撴灉
*/
@@ -48,7 +48,7 @@
/**
* 鍒犻櫎${functionName}
- *
+ *
* @param ${pkColumn.javaField} ${functionName}涓婚敭
* @return 缁撴灉
*/
@@ -56,36 +56,36 @@
/**
* 鎵归噺鍒犻櫎${functionName}
- *
+ *
* @param ${pkColumn.javaField}s 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
* @return 缁撴灉
*/
public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
-#if($table.sub)
+ #if($table.sub)
- /**
- * 鎵归噺鍒犻櫎${subTable.functionName}
- *
- * @param ${pkColumn.javaField}s 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
- * @return 缁撴灉
- */
- public int delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
-
- /**
- * 鎵归噺鏂板${subTable.functionName}
- *
- * @param ${subclassName}List ${subTable.functionName}鍒楄〃
- * @return 缁撴灉
- */
- public int batch${subClassName}(List<${subClassName}> ${subclassName}List);
-
+ /**
+ * 鎵归噺鍒犻櫎${subTable.functionName}
+ *
+ * @param ${pkColumn.javaField}s 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
- /**
- * 閫氳繃${functionName}涓婚敭鍒犻櫎${subTable.functionName}淇℃伅
- *
- * @param ${pkColumn.javaField} ${functionName}ID
- * @return 缁撴灉
- */
- public int delete${subClassName}By${subTableFkClassName}(${pkColumn.javaType} ${pkColumn.javaField});
-#end
+ /**
+ * 鎵归噺鏂板${subTable.functionName}
+ *
+ * @param ${subclassName}List ${subTable.functionName}鍒楄〃
+ * @return 缁撴灉
+ */
+ public int batch${subClassName}(List<${subClassName}> ${subclassName}List);
+
+
+ /**
+ * 閫氳繃${functionName}涓婚敭鍒犻櫎${subTable.functionName}淇℃伅
+ *
+ * @param ${pkColumn.javaField} ${functionName}ID
+ * @return 缁撴灉
+ */
+ public int delete${subClassName}By${subTableFkClassName}(${pkColumn.javaType} ${pkColumn.javaField});
+ #end
}
diff --git a/src/main/resources/vm/java/service.java.vm b/src/main/resources/vm/java/service.java.vm
index 250f68c..8df3de8 100644
--- a/src/main/resources/vm/java/service.java.vm
+++ b/src/main/resources/vm/java/service.java.vm
@@ -2,18 +2,18 @@
import java.util.List;
import ${packageName}.domain.${ClassName};
+import com.baomidou.mybatisplus.extension.service.IService;
/**
* ${functionName}Service鎺ュ彛
- *
+ *
* @author ${author}
* @date ${datetime}
*/
-public interface I${ClassName}Service
-{
+public interface I${ClassName}Service extends IService<${ClassName}> {
/**
* 鏌ヨ${functionName}
- *
+ *
* @param ${pkColumn.javaField} ${functionName}涓婚敭
* @return ${functionName}
*/
@@ -21,7 +21,7 @@
/**
* 鏌ヨ${functionName}鍒楄〃
- *
+ *
* @param ${className} ${functionName}
* @return ${functionName}闆嗗悎
*/
@@ -29,7 +29,7 @@
/**
* 鏂板${functionName}
- *
+ *
* @param ${className} ${functionName}
* @return 缁撴灉
*/
@@ -37,7 +37,7 @@
/**
* 淇敼${functionName}
- *
+ *
* @param ${className} ${functionName}
* @return 缁撴灉
*/
@@ -45,7 +45,7 @@
/**
* 鎵归噺鍒犻櫎${functionName}
- *
+ *
* @param ${pkColumn.javaField}s 闇�瑕佸垹闄ょ殑${functionName}涓婚敭闆嗗悎
* @return 缁撴灉
*/
@@ -53,7 +53,7 @@
/**
* 鍒犻櫎${functionName}淇℃伅
- *
+ *
* @param ${pkColumn.javaField} ${functionName}涓婚敭
* @return 缁撴灉
*/
diff --git a/src/main/resources/vm/java/serviceImpl.java.vm b/src/main/resources/vm/java/serviceImpl.java.vm
index 116f6c5..799d027 100644
--- a/src/main/resources/vm/java/serviceImpl.java.vm
+++ b/src/main/resources/vm/java/serviceImpl.java.vm
@@ -1,169 +1,162 @@
package ${packageName}.service.impl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import java.util.List;
-#foreach ($column in $columns)
-#if($column.javaField == 'createTime' || $column.javaField == 'updateTime')
-import com.ruoyi.common.utils.DateUtils;
-#break
-#end
-#end
+ #foreach ($column in $columns)
+ #if($column.javaField == 'createTime' || $column.javaField == 'updateTime')
+ import com.rchuing.common.utils.DateUtils;
+ #break
+ #end
+ #end
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-#if($table.sub)
-import java.util.ArrayList;
-import com.ruoyi.common.utils.StringUtils;
-import org.springframework.transaction.annotation.Transactional;
-import ${packageName}.domain.${subClassName};
-#end
+ #if($table.sub)
+ import java.util.ArrayList;
+ import com.rchuing.common.utils.StringUtils;
+ import org.springframework.transaction.annotation.Transactional;
+ import ${packageName}.domain.${subClassName};
+ #end
import ${packageName}.mapper.${ClassName}Mapper;
import ${packageName}.domain.${ClassName};
import ${packageName}.service.I${ClassName}Service;
/**
* ${functionName}Service涓氬姟灞傚鐞�
- *
+ *
* @author ${author}
* @date ${datetime}
*/
@Service
-public class ${ClassName}ServiceImpl implements I${ClassName}Service
-{
+public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${ClassName}> implements I${ClassName}Service {
@Autowired
private ${ClassName}Mapper ${className}Mapper;
/**
* 鏌ヨ${functionName}
- *
+ *
* @param ${pkColumn.javaField} ${functionName}涓婚敭
* @return ${functionName}
*/
@Override
- public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
- {
+ public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) {
return ${className}Mapper.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
}
/**
* 鏌ヨ${functionName}鍒楄〃
- *
+ *
* @param ${className} ${functionName}
* @return ${functionName}
*/
@Override
- public List<${ClassName}> select${ClassName}List(${ClassName} ${className})
- {
+ public List<${ClassName}> select${ClassName}List(${ClassName} ${className}) {
return ${className}Mapper.select${ClassName}List(${className});
}
/**
* 鏂板${functionName}
- *
+ *
* @param ${className} ${functionName}
* @return 缁撴灉
*/
-#if($table.sub)
- @Transactional
-#end
+ #if($table.sub)
+ @Transactional
+ #end
@Override
- public int insert${ClassName}(${ClassName} ${className})
- {
-#foreach ($column in $columns)
-#if($column.javaField == 'createTime')
- ${className}.setCreateTime(DateUtils.getNowDate());
-#end
-#end
-#if($table.sub)
- int rows = ${className}Mapper.insert${ClassName}(${className});
- insert${subClassName}(${className});
- return rows;
-#else
- return ${className}Mapper.insert${ClassName}(${className});
-#end
+ public int insert${ClassName}(${ClassName} ${className}) {
+ #foreach ($column in $columns)
+ #if($column.javaField == 'createTime')
+ ${className}.setCreateTime(DateUtils.getNowDate());
+ #end
+ #end
+ #if($table.sub)
+ int rows = ${className}Mapper.insert${ClassName}(${className});
+ insert${subClassName}(${className});
+ return rows;
+ #else
+ return ${className}Mapper.insert${ClassName}(${className});
+ #end
}
/**
* 淇敼${functionName}
- *
+ *
* @param ${className} ${functionName}
* @return 缁撴灉
*/
-#if($table.sub)
- @Transactional
-#end
+ #if($table.sub)
+ @Transactional
+ #end
@Override
- public int update${ClassName}(${ClassName} ${className})
- {
-#foreach ($column in $columns)
-#if($column.javaField == 'updateTime')
- ${className}.setUpdateTime(DateUtils.getNowDate());
-#end
-#end
-#if($table.sub)
- ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${className}.get${pkColumn.capJavaField}());
- insert${subClassName}(${className});
-#end
+ public int update${ClassName}(${ClassName} ${className}) {
+ #foreach ($column in $columns)
+ #if($column.javaField == 'updateTime')
+ ${className}.setUpdateTime(DateUtils.getNowDate());
+ #end
+ #end
+ #if($table.sub)
+ ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${className}.get${pkColumn.capJavaField}());
+ insert${subClassName}(${className});
+ #end
return ${className}Mapper.update${ClassName}(${className});
}
/**
* 鎵归噺鍒犻櫎${functionName}
- *
+ *
* @param ${pkColumn.javaField}s 闇�瑕佸垹闄ょ殑${functionName}涓婚敭
* @return 缁撴灉
*/
-#if($table.sub)
- @Transactional
-#end
+ #if($table.sub)
+ @Transactional
+ #end
@Override
- public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s)
- {
-#if($table.sub)
- ${className}Mapper.delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaField}s);
-#end
+ public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s) {
+ #if($table.sub)
+ ${className}Mapper.delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaField}s);
+ #end
return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s);
}
/**
* 鍒犻櫎${functionName}淇℃伅
- *
+ *
* @param ${pkColumn.javaField} ${functionName}涓婚敭
* @return 缁撴灉
*/
-#if($table.sub)
- @Transactional
-#end
+ #if($table.sub)
+ @Transactional
+ #end
@Override
- public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
- {
-#if($table.sub)
- ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField});
-#end
+ public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) {
+ #if($table.sub)
+ ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField});
+ #end
return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
}
-#if($table.sub)
+ #if($table.sub)
- /**
- * 鏂板${subTable.functionName}淇℃伅
- *
- * @param ${className} ${functionName}瀵硅薄
- */
- public void insert${subClassName}(${ClassName} ${className})
- {
- List<${subClassName}> ${subclassName}List = ${className}.get${subClassName}List();
- ${pkColumn.javaType} ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}();
- if (StringUtils.isNotNull(${subclassName}List))
- {
- List<${subClassName}> list = new ArrayList<${subClassName}>();
- for (${subClassName} ${subclassName} : ${subclassName}List)
+ /**
+ * 鏂板${subTable.functionName}淇℃伅
+ *
+ * @param ${className} ${functionName}瀵硅薄
+ */
+ public void insert${subClassName}(${ClassName} ${className}) {
+ List<${subClassName}> ${subclassName}List = ${className}.get${subClassName}List();
+ ${pkColumn.javaType} ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}();
+ if (StringUtils.isNotNull(${subclassName}List))
{
- ${subclassName}.set${subTableFkClassName}(${pkColumn.javaField});
- list.add(${subclassName});
- }
- if (list.size() > 0)
- {
- ${className}Mapper.batch${subClassName}(list);
+ List<${subClassName}> list = new ArrayList<${subClassName}>();
+ for (${subClassName} ${subclassName} : ${subclassName}List)
+ {
+ ${subclassName}.set${subTableFkClassName}(${pkColumn.javaField});
+ list.add(${subclassName});
+ }
+ if (list.size() > 0)
+ {
+ ${className}Mapper.batch${subClassName}(list);
+ }
}
}
- }
-#end
+ #end
}
diff --git a/src/main/resources/vm/java/sub-domain.java.vm b/src/main/resources/vm/java/sub-domain.java.vm
index b2dc2dc..cc64f2c 100644
--- a/src/main/resources/vm/java/sub-domain.java.vm
+++ b/src/main/resources/vm/java/sub-domain.java.vm
@@ -1,76 +1,73 @@
package ${packageName}.domain;
-#foreach ($import in $subImportList)
-import ${import};
-#end
+ #foreach ($import in $subImportList)
+ import ${import};
+ #end
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import com.ruoyi.framework.web.domain.BaseEntity;
+import com.rchuing.common.annotation.Excel;
+import com.rchuing.common.core.domain.BaseEntity;
/**
* ${subTable.functionName}瀵硅薄 ${subTableName}
- *
+ *
* @author ${author}
* @date ${datetime}
*/
-public class ${subClassName} extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
+public class ${subClassName} extends BaseEntity {
+private static final long serialVersionUID = 1L;
#foreach ($column in $subTable.columns)
-#if(!$table.isSuperColumn($column.javaField))
+ #if(!$table.isSuperColumn($column.javaField))
/** $column.columnComment */
-#if($column.list)
-#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($parentheseIndex != -1)
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-#elseif($column.javaType == 'Date')
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd")
-#else
- @Excel(name = "${comment}")
-#end
-#end
+ #if($column.list)
+ #set($parentheseIndex=$column.columnComment.indexOf("锛�"))
+ #if($parentheseIndex != -1)
+ #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+ #else
+ #set($comment=$column.columnComment)
+ #end
+ #if($parentheseIndex != -1)
+ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ #elseif($column.javaType == 'Date')
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd")
+ #else
+ @Excel(name = "${comment}")
+ #end
+ #end
private $column.javaType $column.javaField;
-#end
+ #end
#end
#foreach ($column in $subTable.columns)
-#if(!$table.isSuperColumn($column.javaField))
-#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
- public void set${AttrName}($column.javaType $column.javaField)
- {
- this.$column.javaField = $column.javaField;
- }
+ #if(!$table.isSuperColumn($column.javaField))
+ #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
+ public void set${AttrName}($column.javaType $column.javaField) {
+ this.$column.javaField = $column.javaField;
+ }
- public $column.javaType get${AttrName}()
- {
- return $column.javaField;
- }
-#end
+ public $column.javaType get${AttrName}() {
+ return $column.javaField;
+ }
+ #end
#end
- @Override
- public String toString() {
+@Override
+public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-#foreach ($column in $subTable.columns)
-#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
+ #foreach ($column in $subTable.columns)
+ #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
.append("${column.javaField}", get${AttrName}())
-#end
- .toString();
- }
-}
+ #end
+ .toString();
+ }
+ }
--
Gitblit v1.9.3