修改生成模板

game-generator/src/main/resources/vm/java/controller.java.vm

@@ -2,6 +2,8 @@ package ${packageName}.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.game.common.core.domain.R;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -16,8 +18,6 @@ import com.game.common.annotation.Log;
 import com.game.common.core.controller.BaseController;
 import com.game.common.core.domain.AjaxResult;
 import com.game.common.enums.BusinessType;
-import com.game.common.annotation.DataSource;
-import com.game.common.enums.DataSourceType;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import ${packageName}.domain.${ClassName};
@@ -36,7 +36,6 @@ import com.game.common.core.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/${moduleName}/${businessName}")
-@DataSource(DataSourceType.SLAVE)
 @Api(value = "${ClassName}Controller", description = "${functionName}接口", tags = {"${functionName}"})
 public class ${ClassName}Controller extends BaseController
 {
@@ -50,17 +49,17 @@ public class ${ClassName}Controller extends BaseController
     @GetMapping("/list")
     @ApiOperation(value = "查询${functionName}列表", notes = "获取${functionName}列表")
 #if($table.crud || $table.sub)
-    public TableDataInfo list(${ClassName} ${className})
+    public TableDataInfo<${ClassName}> list(${ClassName} ${className})
     {
         startPage();
         List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
         return getDataTable(list);
     }
 #elseif($table.tree)
-    public AjaxResult list(${ClassName} ${className})
+    public R<List<${ClassName}>> list(${ClassName} ${className})
     {
         List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
-        return success(list);
+        return R.ok(list);
     }
 #end
 
@@ -84,9 +83,9 @@ public class ${ClassName}Controller extends BaseController
     @PreAuthorize("@ss.hasPermi('${permissionPrefix}:query')")
     @GetMapping(value = "/{${pkColumn.javaField}}")
     @ApiOperation(value = "获取${functionName}详细信息", notes = "获取${functionName}详细信息")
-    public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField})
+    public R<${ClassName}> getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField})
     {
-        return success(${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}));
+        return R.ok(${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}));
     }
 
     /**
@@ -96,9 +95,9 @@ public class ${ClassName}Controller extends BaseController
     @Log(title = "${functionName}", businessType = BusinessType.INSERT)
     @ApiOperation(value = "新增${functionName}", notes = "新增${functionName}")
     @PostMapping
-    public AjaxResult add(@RequestBody ${ClassName} ${className})
+    public R add(@RequestBody ${ClassName} ${className})
     {
-        return toAjax(${className}Service.insert${ClassName}(${className}));
+        return R.ok(${className}Service.insert${ClassName}(${className}));
     }
 
     /**
@@ -108,9 +107,9 @@ public class ${ClassName}Controller extends BaseController
     @Log(title = "${functionName}", businessType = BusinessType.UPDATE)
     @ApiOperation(value = "修改${functionName}", notes = "修改${functionName}")
     @PutMapping
-    public AjaxResult edit(@RequestBody ${ClassName} ${className})
+    public R edit(@RequestBody ${ClassName} ${className})
     {
-        return toAjax(${className}Service.update${ClassName}(${className}));
+        return R.ok(${className}Service.update${ClassName}(${className}));
     }
 
     /**
@@ -120,8 +119,8 @@ public class ${ClassName}Controller extends BaseController
     @Log(title = "${functionName}", businessType = BusinessType.DELETE)
     @ApiOperation(value = "删除${functionName}", notes = "删除${functionName}")
 	@DeleteMapping("/{${pkColumn.javaField}s}")
-    public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s)
+    public R remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s)
     {
-        return toAjax(${className}Service.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s));
+        return R.ok(${className}Service.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s));
     }
 }

game-generator/src/main/resources/vm/java/serviceImpl.java.vm

@@ -19,6 +19,8 @@ import org.springframework.stereotype.Service;
 import ${packageName}.mapper.${ClassName}Mapper;
 import ${packageName}.domain.${ClassName};
 import ${packageName}.service.I${ClassName}Service;
+import com.game.common.annotation.DataSource;
+import com.game.common.enums.DataSourceType;
 
 /**
  * ${functionName}Service业务层处理
@@ -38,6 +40,7 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${C
      * @return ${functionName}
      */
     @Override
+    @DataSource(DataSourceType.SLAVE)
     public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) {
         return ${className}Mapper.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
     }
@@ -49,6 +52,7 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${C
      * @return ${functionName}
      */
     @Override
+    @DataSource(DataSourceType.SLAVE)
     public List<${ClassName}> select${ClassName}List(${ClassName} ${className}) {
         return ${className}Mapper.select${ClassName}List(${className});
     }
@@ -63,6 +67,7 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${C
         @Transactional
         #end
     @Override
+    @DataSource(DataSourceType.SLAVE)
     public int insert${ClassName}(${ClassName} ${className}) {
         #foreach ($column in $columns)
             #if($column.javaField == 'createTime')
@@ -88,6 +93,7 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${C
         @Transactional
         #end
     @Override
+    @DataSource(DataSourceType.SLAVE)
     public int update${ClassName}(${ClassName} ${className}) {
         #foreach ($column in $columns)
             #if($column.javaField == 'updateTime')
@@ -111,6 +117,7 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${C
         @Transactional
         #end
     @Override
+    @DataSource(DataSourceType.SLAVE)
     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);
@@ -128,6 +135,7 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${C
         @Transactional
         #end
     @Override
+    @DataSource(DataSourceType.SLAVE)
     public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) {
         #if($table.sub)
                 ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField});