Ver código fonte

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/resources/template/Controller.java.vm
sx 1 ano atrás
pai
commit
6cb07ce506
1 arquivos alterados com 3 adições e 5 exclusões
  1. 3 5
      src/main/resources/template/Controller.java.vm

+ 3 - 5
src/main/resources/template/Controller.java.vm

@@ -47,7 +47,6 @@ public class ${className}Controller extends BaseController {
      */
     @GetMapping("/page")
     @ApiOperation("分页")
-    //@RequiresPermissions("${moduleName}:${pathName}:page")
     public ApiResponse<Pagination<${className}VO>> page(${className}PagePO request) {
 
         Pagination<${className}VO> result = ${classname}Service.page(request);
@@ -59,7 +58,7 @@ public class ${className}Controller extends BaseController {
      */
     @GetMapping("/getById/{id}")
     @ApiOperation("信息")
-//    @RequiresPermissions("${moduleName}:${pathName}:info")
+
     public ApiResponse<${className}VO> getById(@PathVariable("id") Long id) {
 
 		${className}VO result = ${classname}Service.getById(id);
@@ -87,9 +86,8 @@ public class ${className}Controller extends BaseController {
     @PutMapping("/update")
     @ApiOperation("修改")
     @RequiresPermissions("${moduleName}:${pathName}:update")
-    @OperationLog(tag = "${comments}管理",remark = "修改${comments}信息")
-    @OperationLogPro(tag = "${comments}管理",remark = "修改${comments}信息",operationType= OperationType.UPDATE,entityType= ${className}Entity.class)
     @DuplicateSubmit
+    @OperationLogPro(tag = "${comments}管理",remark = "修改${comments}信息",operationType= OperationType.UPDATE,entityType= "T(${package}.${moduleName}.biz.entity.${className}Entity)")
     @Transactional(rollbackFor = Exception.class)
     public ApiResponse<R> update(@RequestBody @Validated ${className}UpdatePO request) {
 
@@ -103,7 +101,7 @@ public class ${className}Controller extends BaseController {
     @DeleteMapping("/delete")
     @ApiOperation("删除")
     @RequiresPermissions("${moduleName}:${pathName}:delete")
-    @OperationLogPro(tag = "${comments}管理",remark = "删除${comments}信息",operationType= OperationType.UPDATE,entityType= ${className}Entity.class)
+    @OperationLogPro(tag = "${comments}管理",remark = "删除${comments}信息",operationType= OperationType.DELETE,entityType= "T(${package}.${moduleName}.biz.entity.${className}Entity)")
     @DuplicateSubmit
     @Transactional(rollbackFor = Exception.class)
     public ApiResponse<R> delete(@RequestBody Long[] ids) {