From 98f667ce3e2333f200d9313dae1c4443925fc9c1 Mon Sep 17 00:00:00 2001 From: "20932067@zju.edu.cn" Date: Tue, 1 Jun 2021 15:13:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ebts/ebts-admin/src/main/resources/application.yml | 4 ++-- .../src/main/resources/vm/java/controller.java.vm | 6 +++--- .../src/main/resources/vm/java/entity.java.vm | 3 ++- .../src/main/resources/vm/java/serviceImpl.java.vm | 10 +++++----- .../ebts-generator/src/main/resources/vm/js/api.js.vm | 4 ++-- .../src/main/resources/vm/vue/index.vue.vm | 11 ++++++++--- 6 files changed, 22 insertions(+), 16 deletions(-) diff --git a/ebts/ebts-admin/src/main/resources/application.yml b/ebts/ebts-admin/src/main/resources/application.yml index 3798374..0d83220 100644 --- a/ebts/ebts-admin/src/main/resources/application.yml +++ b/ebts/ebts-admin/src/main/resources/application.yml @@ -87,8 +87,8 @@ spring: redis: # 地址 # host: 114.215.82.135 -# host: 127.0.0.1 - host: 13.70.28.14 + host: 127.0.0.1 +# host: 13.70.28.14 # 端口，默认为6379 port: 6379 # 密码 diff --git a/ebts/ebts-generator/src/main/resources/vm/java/controller.java.vm b/ebts/ebts-generator/src/main/resources/vm/java/controller.java.vm index cf6a9e3..bf65387 100644 --- a/ebts/ebts-generator/src/main/resources/vm/java/controller.java.vm +++ b/ebts/ebts-generator/src/main/resources/vm/java/controller.java.vm @@ -46,7 +46,7 @@ import org.springframework.validation.annotation.Validated; @Api(value = "${functionName}管理",tags = "${functionName}管理") @RestController @RequestMapping("/${moduleName}/${businessName}") -public class ${ClassName}Controller extends HcyBaseController { +public class ${ClassName}Controller extends EBTSController { protected final Logger logger = LoggerFactory.getLogger(${ClassName}Controller.class); @Autowired @@ -57,7 +57,7 @@ public class ${ClassName}Controller extends HcyBaseController { */ @ApiOperation("查询${functionName}列表") @PreAuthorize("@ebts.hasPermi('${permissionPrefix}:list')") - @PutMapping("/list") + @PostMapping("/list") public Serializable list(@Validated @RequestBody ${ClassName} ${className}) { try { startPage(${className}.getPageInfo()); @@ -83,7 +83,7 @@ public class ${ClassName}Controller extends HcyBaseController { @ApiOperation("导出${functionName}列表") @PreAuthorize("@ebts.hasPermi('${permissionPrefix}:export')") @Log(title = "${functionName}", businessType = BusinessType.EXPORT) - @PutMapping("/export") + @PostMapping("/export") public AjaxResult export(@Validated @RequestBody ${ClassName} ${className}) { try { ServerResult> genServerResult = ${className}Service.select${ClassName}List(${className}); diff --git a/ebts/ebts-generator/src/main/resources/vm/java/entity.java.vm b/ebts/ebts-generator/src/main/resources/vm/java/entity.java.vm index 4f1dcf9..367295a 100644 --- a/ebts/ebts-generator/src/main/resources/vm/java/entity.java.vm +++ b/ebts/ebts-generator/src/main/resources/vm/java/entity.java.vm @@ -17,7 +17,8 @@ import com.ebts.common.core.entity.${Entity}; import com.ebts.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; /** * ${functionName}对象 ${tableName} diff --git a/ebts/ebts-generator/src/main/resources/vm/java/serviceImpl.java.vm b/ebts/ebts-generator/src/main/resources/vm/java/serviceImpl.java.vm index bd926dc..2ef5b79 100644 --- a/ebts/ebts-generator/src/main/resources/vm/java/serviceImpl.java.vm +++ b/ebts/ebts-generator/src/main/resources/vm/java/serviceImpl.java.vm @@ -50,9 +50,9 @@ public class ${ClassName}ServiceImpl implements ${ClassName}Service { try { ${ClassName} ${className} = ${className}Dao.select${ClassName}ById(${pkColumn.javaField}); if (${className} != null){ - return new ServerResult<${ClassName}>(true,${className}); + return new ServerResult<>(true,${className}); }else { - return new ServerResult<${ClassName}>(false, ReturnConstants.RESULT_EMPTY); + return new ServerResult<>(false, ReturnConstants.RESULT_EMPTY); } }catch (RuntimeException e){ logger.error(e.getMessage()); @@ -71,13 +71,13 @@ public class ${ClassName}ServiceImpl implements ${ClassName}Service { try { List<${ClassName}> ${className}List = ${className}Dao.select${ClassName}List(${className}); if (${className}List.size()>0){ - return new ServerResult>(true,${className}List); + return new ServerResult<>(true,${className}List); }else { - return new ServerResult>(false,ReturnConstants.RESULT_EMPTY); + return new ServerResult<>(false,ReturnConstants.RESULT_EMPTY); } }catch (RuntimeException e){ logger.error(e.getMessage()); - return new ServerResult>(false,ReturnConstants.DB_EX); + return new ServerResult<>(false,ReturnConstants.DB_EX); } } diff --git a/ebts/ebts-generator/src/main/resources/vm/js/api.js.vm b/ebts/ebts-generator/src/main/resources/vm/js/api.js.vm index 7fec2a3..366a327 100644 --- a/ebts/ebts-generator/src/main/resources/vm/js/api.js.vm +++ b/ebts/ebts-generator/src/main/resources/vm/js/api.js.vm @@ -5,7 +5,7 @@ import request from '@/utils/request' export function list${BusinessName}(data) { return request({ url: '/${moduleName}/${businessName}/list', - method: 'put', + method: 'post', data: data }) } @@ -14,7 +14,7 @@ export function list${BusinessName}(data) { export function export${BusinessName}(data) { return request({ url: '/${moduleName}/${businessName}/export', - method: 'put', + method: 'post', data: data }) } diff --git a/ebts/ebts-generator/src/main/resources/vm/vue/index.vue.vm b/ebts/ebts-generator/src/main/resources/vm/vue/index.vue.vm index ad78af4..1ef7391 100644 --- a/ebts/ebts-generator/src/main/resources/vm/vue/index.vue.vm +++ b/ebts/ebts-generator/src/main/resources/vm/vue/index.vue.vm @@ -183,6 +183,11 @@ + + + #foreach($column in $columns) #set($javaField=$column.javaField) #set($parentheseIndex=$column.columnComment.indexOf("（")) @@ -191,7 +196,7 @@ #else #set($comment=$column.columnComment) #end -#if($column.pk) +#if($column.pk && "" != $column.pk) #elseif($column.list && $column.htmlType == "datetime") @@ -252,8 +257,8 @@