From 82f1f5d0cf1b51a5d81915e842e01760f404fa74 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 20 十月 2021 13:07:16 +0800
Subject: [PATCH] update 优化xxl-job-admin相关pr代码 增加格式化日志输出与docker镜像
---
ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm | 156 ++++++++++++++++++++++++++-------------------------
1 files changed, 80 insertions(+), 76 deletions(-)
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 6f52b70..b9a45c6 100644
--- a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
@@ -1,15 +1,25 @@
package ${packageName}.service.impl;
+import cn.hutool.core.bean.BeanUtil;
+import com.ruoyi.common.utils.StringUtils;
+#if($table.crud || $table.sub)
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.core.page.PagePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+#end
import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import org.apache.commons.lang3.StringUtils;
-import ${packageName}.mapper.${ClassName}Mapper;
+import ${packageName}.domain.bo.${ClassName}Bo;
+import ${packageName}.domain.vo.${ClassName}Vo;
import ${packageName}.domain.${ClassName};
+import ${packageName}.mapper.${ClassName}Mapper;
import ${packageName}.service.I${ClassName}Service;
import java.util.List;
+import java.util.Map;
+import java.util.Collection;
/**
* ${functionName}Service涓氬姟灞傚鐞�
@@ -18,92 +28,86 @@
* @date ${datetime}
*/
@Service
-public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${ClassName}> implements I${ClassName}Service {
+public class ${ClassName}ServiceImpl extends ServicePlusImpl<${ClassName}Mapper, ${ClassName}, ${ClassName}Vo> implements I${ClassName}Service {
@Override
- public List<${ClassName}> queryList(${ClassName} ${className}) {
+ public ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField}){
+ return getVoById(${pkColumn.javaField});
+ }
+
+#if($table.crud || $table.sub)
+ @Override
+ public TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}Bo bo) {
+ PagePlus<${ClassName}, ${ClassName}Vo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
+ return PageUtils.buildDataInfo(result);
+ }
+#end
+
+ @Override
+ public List<${ClassName}Vo> queryList(${ClassName}Bo bo) {
+ return listVo(buildQueryWrapper(bo));
+ }
+
+ private LambdaQueryWrapper<${ClassName}> buildQueryWrapper(${ClassName}Bo bo) {
+ Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<${ClassName}> lqw = Wrappers.lambdaQuery();
#foreach($column in $columns)
+#if($column.query)
#set($queryType=$column.queryType)
#set($javaField=$column.javaField)
#set($javaType=$column.javaType)
#set($columnName=$column.columnName)
#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#if($column.query)
-#if($column.queryType == "EQ")
-#if($javaType == 'String')
- if (StringUtils.isNotBlank(${className}.get$AttrName())){
- lqw.eq(${ClassName}::get$AttrName ,${className}.get$AttrName());
- }
-#else
- if (${className}.get$AttrName() != null){
- lqw.eq(${ClassName}::get$AttrName ,${className}.get$AttrName());
- }
-#end
-#elseif($queryType == "NE")
-#if($javaType == 'String')
- if (StringUtils.isNotBlank(${className}.get$AttrName())){
- lqw.ne(${ClassName}::get$AttrName ,${className}.get$AttrName());
- }
-#else
- if (${className}.get$AttrName() != null){
- lqw.ne(${ClassName}::get$AttrName ,${className}.get$AttrName());
- }
-#end
-#elseif($queryType == "GT")
-#if($javaType == 'String')
- if (StringUtils.isNotBlank(${className}.get$AttrName())){
- lqw.gt(${ClassName}::get$AttrName ,${className}.get$AttrName());
- }
-#else
- if (${className}.get$AttrName() != null){
- lqw.gt(${ClassName}::get$AttrName ,${className}.get$AttrName());
- }
-#end
-#elseif($queryType == "GTE")
-#if($javaType == 'String')
- if (StringUtils.isNotBlank(${className}.get$AttrName())){
- lqw.ge(${ClassName}::get$AttrName ,${className}.get$AttrName());
- }
-#else
- if (${className}.get$AttrName() != null){
- lqw.ge(${ClassName}::get$AttrName ,${className}.get$AttrName());
- }
-#end
-#elseif($queryType == "LT")
-#if($javaType == 'String')
- if (StringUtils.isNotBlank(${className}.get$AttrName())){
- lqw.lt(${ClassName}::get$AttrName ,${className}.get$AttrName());
- }
-#else
- if (${className}.get$AttrName() != null){
- lqw.lt(${ClassName}::get$AttrName ,${className}.get$AttrName());
- }
-#end
-#elseif($queryType == "LTE")
+#set($mpMethod=$column.queryType.toLowerCase())
+#if($queryType != 'BETWEEN')
#if($javaType == 'String')
- if (StringUtils.isNotBlank(${className}.get$AttrName())){
- lqw.le(${ClassName}::get$AttrName ,${className}.get$AttrName());
- }
+#set($condition='StringUtils.isNotBlank(bo.get'+$AttrName+'())')
#else
- if (${className}.get$AttrName() != null){
- lqw.le(${ClassName}::get$AttrName ,${className}.get$AttrName());
- }
+#set($condition='bo.get'+$AttrName+'() != null')
#end
-#elseif($queryType == "LIKE")
-#if($javaType == 'String')
- if (StringUtils.isNotBlank(${className}.get$AttrName())){
- lqw.like(${ClassName}::get$AttrName ,${className}.get$AttrName());
- }
+ lqw.$mpMethod($condition, ${ClassName}::get$AttrName, bo.get$AttrName());
#else
- if (${className}.get$AttrName() != null){
- lqw.like(${ClassName}::get$AttrName ,${className}.get$AttrName());
+ lqw.between(params.get("begin$AttrName") != null && params.get("end$AttrName") != null,
+ ${ClassName}::get$AttrName ,params.get("begin$AttrName"), params.get("end$AttrName"));
+#end
+#end
+#end
+ return lqw;
+ }
+
+ @Override
+ public Boolean insertByBo(${ClassName}Bo bo) {
+ ${ClassName} add = BeanUtil.toBean(bo, ${ClassName}.class);
+ validEntityBeforeSave(add);
+ boolean flag = save(add);
+#set($pk=$pkColumn.javaField.substring(0,1).toUpperCase() + ${pkColumn.javaField.substring(1)})
+ if (flag) {
+ bo.set$pk(add.get$pk());
}
-#end
-#elseif($queryType == "BETWEEN")
-#end
-#end
-#end
- return this.list(lqw);
+ return flag;
+ }
+
+ @Override
+ public Boolean updateByBo(${ClassName}Bo bo) {
+ ${ClassName} update = BeanUtil.toBean(bo, ${ClassName}.class);
+ validEntityBeforeSave(update);
+ return updateById(update);
+ }
+
+ /**
+ * 淇濆瓨鍓嶇殑鏁版嵁鏍￠獙
+ *
+ * @param entity 瀹炰綋绫绘暟鎹�
+ */
+ private void validEntityBeforeSave(${ClassName} entity){
+ //TODO 鍋氫竴浜涙暟鎹牎楠�,濡傚敮涓�绾︽潫
+ }
+
+ @Override
+ public Boolean deleteWithValidByIds(Collection<${pkColumn.javaType}> ids, Boolean isValid) {
+ if(isValid){
+ //TODO 鍋氫竴浜涗笟鍔′笂鐨勬牎楠�,鍒ゆ柇鏄惁闇�瑕佹牎楠�
+ }
+ return removeByIds(ids);
}
}
--
Gitblit v1.9.3