!6 同步develop分支

* sync -- 同步develop分支
2022-01-18 13:16:15 +00:00
parent a649962696
commit 5676316380
338 changed files with 10957 additions and 9551 deletions
--- a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
@@ -7,7 +7,7 @@ import java.util.concurrent.TimeUnit;
 import lombok.RequiredArgsConstructor;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;
-import org.springframework.security.access.prepost.PreAuthorize;
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
@@ -51,7 +51,7 @@ public class ${ClassName}Controller extends BaseController {
     * 查询${functionName}列表
     */
    @ApiOperation("查询${functionName}列表")
-    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')")
+    @SaCheckPermission("${permissionPrefix}:list")
    @GetMapping("/list")
 #if($table.crud || $table.sub)
    public TableDataInfo<${ClassName}Vo> list(@Validated(QueryGroup.class) ${ClassName}Bo bo, PageQuery pageQuery) {
@@ -68,7 +68,7 @@ public class ${ClassName}Controller extends BaseController {
     * 导出${functionName}列表
     */
    @ApiOperation("导出${functionName}列表")
-    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:export')")
+    @SaCheckPermission("${permissionPrefix}:export")
    @Log(title = "${functionName}", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(@Validated ${ClassName}Bo bo, HttpServletResponse response) {
@@ -80,7 +80,7 @@ public class ${ClassName}Controller extends BaseController {
     * 获取${functionName}详细信息
     */
    @ApiOperation("获取${functionName}详细信息")
-    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:query')")
+    @SaCheckPermission("${permissionPrefix}:query")
    @GetMapping("/{${pkColumn.javaField}}")
    public R<${ClassName}Vo> getInfo(@ApiParam("主键")
                                                  @NotNull(message = "主键不能为空")
@@ -92,7 +92,7 @@ public class ${ClassName}Controller extends BaseController {
     * 新增${functionName}
     */
    @ApiOperation("新增${functionName}")
-    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:add')")
+    @SaCheckPermission("${permissionPrefix}:add")
    @Log(title = "${functionName}", businessType = BusinessType.INSERT)
    @RepeatSubmit()
    @PostMapping()
@@ -104,7 +104,7 @@ public class ${ClassName}Controller extends BaseController {
     * 修改${functionName}
     */
    @ApiOperation("修改${functionName}")
-    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:edit')")
+    @SaCheckPermission("${permissionPrefix}:edit")
    @Log(title = "${functionName}", businessType = BusinessType.UPDATE)
    @RepeatSubmit()
    @PutMapping()
@@ -116,7 +116,7 @@ public class ${ClassName}Controller extends BaseController {
     * 删除${functionName}
     */
    @ApiOperation("删除${functionName}")
-    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:remove')")
+    @SaCheckPermission("${permissionPrefix}:remove")
    @Log(title = "${functionName}" , businessType = BusinessType.DELETE)
    @DeleteMapping("/{${pkColumn.javaField}s}")
    public R<Void> remove(@ApiParam("主键串")
--- 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,8 @@
 package ${packageName}.mapper;

 import ${packageName}.domain.${ClassName};
-import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
+import ${packageName}.domain.vo.${ClassName}Vo;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;

 /**
 * ${functionName}Mapper接口
@@ -9,6 +10,6 @@ import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
 * @author ${author}
 * @date ${datetime}
 */
-public interface ${ClassName}Mapper extends BaseMapperPlus<${ClassName}> {
+public interface ${ClassName}Mapper extends BaseMapperPlus<${ClassName}Mapper, ${ClassName}, ${ClassName}Vo> {

 }
--- a/ruoyi-generator/src/main/resources/vm/java/service.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/service.java.vm
@@ -3,7 +3,6 @@ package ${packageName}.service;
 import ${packageName}.domain.${ClassName};
 import ${packageName}.domain.vo.${ClassName}Vo;
 import ${packageName}.domain.bo.${ClassName}Bo;
-import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
 #if($table.crud || $table.sub)
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.domain.PageQuery;
@@ -18,44 +17,44 @@ import java.util.List;
 * @author ${author}
 * @date ${datetime}
 */
-public interface I${ClassName}Service extends IServicePlus<${ClassName}, ${ClassName}Vo> {
-	/**
-	 * 查询单个
-	 * @return
-	 */
-	${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField});
+public interface I${ClassName}Service {
+    /**
+     * 查询单个
+     * @return
+     */
+    ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField});

 #if($table.crud || $table.sub)
-	/**
-	 * 查询列表
-	 */
+    /**
+     * 查询列表
+     */
    TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}Bo bo, PageQuery pageQuery);
 #end

-	/**
-	 * 查询列表
-	 */
-	List<${ClassName}Vo> queryList(${ClassName}Bo bo);
+    /**
+     * 查询列表
+     */
+    List<${ClassName}Vo> queryList(${ClassName}Bo bo);

-	/**
-	 * 根据新增业务对象插入${functionName}
-	 * @param bo ${functionName}新增业务对象
-	 * @return
-	 */
-	Boolean insertByBo(${ClassName}Bo bo);
+    /**
+     * 根据新增业务对象插入${functionName}
+     * @param bo ${functionName}新增业务对象
+     * @return
+     */
+    Boolean insertByBo(${ClassName}Bo bo);

-	/**
-	 * 根据编辑业务对象修改${functionName}
-	 * @param bo ${functionName}编辑业务对象
-	 * @return
-	 */
-	Boolean updateByBo(${ClassName}Bo bo);
+    /**
+     * 根据编辑业务对象修改${functionName}
+     * @param bo ${functionName}编辑业务对象
+     * @return
+     */
+    Boolean updateByBo(${ClassName}Bo bo);

-	/**
-	 * 校验并删除数据
-	 * @param ids 主键集合
-	 * @param isValid 是否校验,true-删除前校验,false-不校验
-	 * @return
-	 */
-	Boolean deleteWithValidByIds(Collection<${pkColumn.javaType}> ids, Boolean isValid);
+    /**
+     * 校验并删除数据
+     * @param ids 主键集合
+     * @param isValid 是否校验,true-删除前校验,false-不校验
+     * @return
+     */
+    Boolean deleteWithValidByIds(Collection<${pkColumn.javaType}> ids, Boolean isValid);
 }
--- a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
@@ -6,8 +6,8 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.domain.PageQuery;
 #end
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -27,19 +27,22 @@ import java.util.Collection;
 * @author ${author}
 * @date ${datetime}
 */
+@RequiredArgsConstructor
@Service
-public class ${ClassName}ServiceImpl extends ServicePlusImpl<${ClassName}Mapper, ${ClassName}, ${ClassName}Vo> implements I${ClassName}Service {
+public class ${ClassName}ServiceImpl implements I${ClassName}Service {
+
+    private final ${ClassName}Mapper baseMapper;

    @Override
    public ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField}){
-        return getVoById(${pkColumn.javaField});
+        return baseMapper.selectVoById(${pkColumn.javaField});
    }

 #if($table.crud || $table.sub)
    @Override
    public TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}Bo bo, PageQuery pageQuery) {
        LambdaQueryWrapper<${ClassName}> lqw = buildQueryWrapper(bo);
-        Page<${ClassName}Vo> result = pageVo(pageQuery.build(), lqw);
+        Page<${ClassName}Vo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
        return TableDataInfo.build(result);
    }
 #end
@@ -47,7 +50,7 @@ public class ${ClassName}ServiceImpl extends ServicePlusImpl<${ClassName}Mapper,
    @Override
    public List<${ClassName}Vo> queryList(${ClassName}Bo bo) {
        LambdaQueryWrapper<${ClassName}> lqw = buildQueryWrapper(bo);
-        return listVo(lqw);
+        return baseMapper.selectVoList(lqw);
    }

    private LambdaQueryWrapper<${ClassName}> buildQueryWrapper(${ClassName}Bo bo) {
@@ -81,7 +84,7 @@ public class ${ClassName}ServiceImpl extends ServicePlusImpl<${ClassName}Mapper,
    public Boolean insertByBo(${ClassName}Bo bo) {
        ${ClassName} add = BeanUtil.toBean(bo, ${ClassName}.class);
        validEntityBeforeSave(add);
-        boolean flag = save(add);
+        boolean flag = baseMapper.insert(add) > 0;
 #set($pk=$pkColumn.javaField.substring(0,1).toUpperCase() + ${pkColumn.javaField.substring(1)})
        if (flag) {
            bo.set$pk(add.get$pk());
@@ -93,7 +96,7 @@ public class ${ClassName}ServiceImpl extends ServicePlusImpl<${ClassName}Mapper,
    public Boolean updateByBo(${ClassName}Bo bo) {
        ${ClassName} update = BeanUtil.toBean(bo, ${ClassName}.class);
        validEntityBeforeSave(update);
-        return updateById(update);
+        return baseMapper.updateById(update) > 0;
    }

    /**
@@ -110,6 +113,6 @@ public class ${ClassName}ServiceImpl extends ServicePlusImpl<${ClassName}Mapper,
        if(isValid){
            //TODO 做一些业务上的校验,判断是否需要校验
        }
-        return removeByIds(ids);
+        return baseMapper.deleteBatchIds(ids) > 0;
    }
 }
--- a/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
@@ -25,7 +25,7 @@ import java.util.Date;
@ExcelIgnoreUnannotated
 public class ${ClassName}Vo {

-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;

 #foreach ($column in $columns)
 #if($column.isList)
@@ -42,13 +42,13 @@ public class ${ClassName}Vo {
    @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class)
    @ExcelDictFormat(dictType = "${column.dictType}")
 #elseif($parentheseIndex != -1)
-	@ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class)
+    @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class)
    @ExcelDictFormat(readConverterExp = "$column.readConverterExp()")
 #else
-	@ExcelProperty(value = "${comment}")
+    @ExcelProperty(value = "${comment}")
 #end
-	@ApiModelProperty("$column.columnComment")
-	private $column.javaType $column.javaField;
+    @ApiModelProperty("$column.columnComment")
+    private $column.javaType $column.javaField;

 #end
 #end