From 31cb0ab1202c873d935be18925b789ea5521c9ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=91=E5=B9=B4=E6=A2=A6=E4=B8=8E=E7=A0=96?= <2847127106@qq.com> Date: Wed, 21 Aug 2024 19:58:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/muyu/gen/controller/GenController.java | 14 +++++++++----- .../gen/service/GenTableColumnServiceImpl.java | 4 ++-- .../com/muyu/gen/service/GenTableServiceImpl.java | 6 +++--- src/main/resources/vm/java/controller.java.vm | 4 ++-- src/main/resources/vm/java/serviceImpl.java.vm | 4 ++-- 5 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/muyu/gen/controller/GenController.java b/src/main/java/com/muyu/gen/controller/GenController.java index e4b203b..b79d70c 100644 --- a/src/main/java/com/muyu/gen/controller/GenController.java +++ b/src/main/java/com/muyu/gen/controller/GenController.java @@ -13,10 +13,11 @@ import com.muyu.gen.service.IGenTableColumnService; import com.muyu.gen.service.IGenTableService; import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.io.IOUtils; -import org.springframework.beans.factory.annotation.Autowired; + import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; import java.io.IOException; import java.util.HashMap; import java.util.List; @@ -31,10 +32,13 @@ import java.util.Map; @RestController public class GenController extends BaseController { - @Autowired + @Resource private IGenTableService genTableService; - @Autowired + @Resource + private HttpServletResponse response; + + @Resource private IGenTableColumnService genTableColumnService; /** @@ -149,7 +153,7 @@ public class GenController extends BaseController @RequiresPermissions("tool:gen:code") @Log(title = "代码生成", businessType = BusinessType.GENCODE) @GetMapping("/download/{tableName}") - public void download(HttpServletResponse response, @PathVariable("tableName") String tableName) throws IOException + public void download(@PathVariable("tableName") String tableName) throws IOException { byte[] data = genTableService.downloadCode(tableName); genCode(response, data); @@ -185,7 +189,7 @@ public class GenController extends BaseController @RequiresPermissions("tool:gen:code") @Log(title = "代码生成", businessType = BusinessType.GENCODE) @GetMapping("/batchGenCode") - public void batchGenCode(HttpServletResponse response, String tables) throws IOException + public void batchGenCode(@RequestParam("tables") String tables) throws IOException { String[] tableNames = Convert.toStrArray(tables); byte[] data = genTableService.downloadCode(tableNames); diff --git a/src/main/java/com/muyu/gen/service/GenTableColumnServiceImpl.java b/src/main/java/com/muyu/gen/service/GenTableColumnServiceImpl.java index db8d840..210910f 100644 --- a/src/main/java/com/muyu/gen/service/GenTableColumnServiceImpl.java +++ b/src/main/java/com/muyu/gen/service/GenTableColumnServiceImpl.java @@ -3,7 +3,7 @@ package com.muyu.gen.service; import com.muyu.common.core.text.Convert; import com.muyu.gen.domain.GenTableColumn; import com.muyu.gen.mapper.GenTableColumnMapper; -import org.springframework.beans.factory.annotation.Autowired; + import javax.annotation.Resource; import org.springframework.stereotype.Service; import java.util.List; @@ -16,7 +16,7 @@ import java.util.List; @Service public class GenTableColumnServiceImpl implements IGenTableColumnService { - @Autowired + @Resource private GenTableColumnMapper genTableColumnMapper; /** diff --git a/src/main/java/com/muyu/gen/service/GenTableServiceImpl.java b/src/main/java/com/muyu/gen/service/GenTableServiceImpl.java index 7f0a03a..61ffdf3 100644 --- a/src/main/java/com/muyu/gen/service/GenTableServiceImpl.java +++ b/src/main/java/com/muyu/gen/service/GenTableServiceImpl.java @@ -22,7 +22,7 @@ import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; + import javax.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -48,10 +48,10 @@ public class GenTableServiceImpl implements IGenTableService { private static final Logger log = LoggerFactory.getLogger(GenTableServiceImpl.class); - @Autowired + @Resource private GenTableMapper genTableMapper; - @Autowired + @Resource private GenTableColumnMapper genTableColumnMapper; /** diff --git a/src/main/resources/vm/java/controller.java.vm b/src/main/resources/vm/java/controller.java.vm index 1df5be0..562bbdc 100644 --- a/src/main/resources/vm/java/controller.java.vm +++ b/src/main/resources/vm/java/controller.java.vm @@ -3,7 +3,7 @@ package ${packageName}.controller; import java.util.List; import java.io.IOException; import jakarta.servlet.http.HttpServletResponse; -import org.springframework.beans.factory.annotation.Autowired; + import javax.annotation.Resource; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; @@ -35,7 +35,7 @@ import com.muyu.common.core.web.page.TableDataInfo; @RequestMapping("/${businessName}") public class ${ClassName}Controller extends BaseController { - @Autowired + @Resource private I${ClassName}Service ${className}Service; /** diff --git a/src/main/resources/vm/java/serviceImpl.java.vm b/src/main/resources/vm/java/serviceImpl.java.vm index dd1d574..8cefcf6 100644 --- a/src/main/resources/vm/java/serviceImpl.java.vm +++ b/src/main/resources/vm/java/serviceImpl.java.vm @@ -7,7 +7,7 @@ import com.muyu.common.core.utils.DateUtils; #break #end #end -import org.springframework.beans.factory.annotation.Autowired; + import javax.annotation.Resource; import org.springframework.stereotype.Service; #if($table.sub) import java.util.ArrayList; @@ -28,7 +28,7 @@ import ${packageName}.service.I${ClassName}Service; @Service public class ${ClassName}ServiceImpl implements ${ClassName}Service { - @Autowired + @Resource private ${ClassName}Mapper ${className}Mapper; /**