From 156f38ee226a46827bb49bb88d4d59caddec445b Mon Sep 17 00:00:00 2001 From: clay <20932067@zju.edu.cn> Date: Wed, 16 Jun 2021 23:44:52 +0800 Subject: [PATCH] 12 --- .../com/ebts/generator/dao/ApiClassDao.java | 2 +- .../service/impl/ApiClassServiceImpl.java | 22 ++-- .../main/resources/vm/java/controller.java.vm | 102 +++++++----------- .../resources/vm/java/serviceImpl.java.vm | 16 ++- 4 files changed, 55 insertions(+), 87 deletions(-) diff --git a/ebts/ebts-generator/src/main/java/com/ebts/generator/dao/ApiClassDao.java b/ebts/ebts-generator/src/main/java/com/ebts/generator/dao/ApiClassDao.java index ced8775..396c151 100644 --- a/ebts/ebts-generator/src/main/java/com/ebts/generator/dao/ApiClassDao.java +++ b/ebts/ebts-generator/src/main/java/com/ebts/generator/dao/ApiClassDao.java @@ -59,5 +59,5 @@ public interface ApiClassDao { * @param ids 需要删除的数据ID * @return 结果 */ - public int deleteApiclassByIds(Long[] ids); + int deleteApiclassByIds(Long[] ids); } diff --git a/ebts/ebts-generator/src/main/java/com/ebts/generator/service/impl/ApiClassServiceImpl.java b/ebts/ebts-generator/src/main/java/com/ebts/generator/service/impl/ApiClassServiceImpl.java index 2ec1ab6..e7e36c1 100644 --- a/ebts/ebts-generator/src/main/java/com/ebts/generator/service/impl/ApiClassServiceImpl.java +++ b/ebts/ebts-generator/src/main/java/com/ebts/generator/service/impl/ApiClassServiceImpl.java @@ -38,9 +38,9 @@ public class ApiClassServiceImpl implements ApiClassService { try { ApiClass apiclass = apiclassDao.selectApiclassById(id); if (apiclass != null) { - return new GenServerResult(true, apiclass); + return new GenServerResult<>(true, apiclass); } else { - return new GenServerResult(false, GenReturnConstants.RESULT_EMPTY); + return new GenServerResult<>(false, GenReturnConstants.RESULT_EMPTY); } } catch (RuntimeException e) { logger.error(e.getMessage()); @@ -59,9 +59,9 @@ public class ApiClassServiceImpl implements ApiClassService { try { List apiClassList = apiclassDao.selectApiclassList(apiclass); if (apiClassList.size() > 0) { - return new GenServerResult>(true, apiClassList); + return new GenServerResult<>(true, apiClassList); } else { - return new GenServerResult>(false, GenReturnConstants.RESULT_EMPTY); + return new GenServerResult<>(false, GenReturnConstants.RESULT_EMPTY); } } catch (RuntimeException e) { logger.error(e.getMessage()); @@ -83,7 +83,7 @@ public class ApiClassServiceImpl implements ApiClassService { if (renewal > 0) { return new GenServerResult(true, renewal); } else { - return new GenServerResult(false, GenReturnConstants.SYS_FAILL); + return new GenServerResult(false, GenReturnConstants.OP_ERROR); } } catch (RuntimeException e) { logger.error(e.getMessage()); @@ -103,9 +103,9 @@ public class ApiClassServiceImpl implements ApiClassService { apiclass.setUpdateBy(GenSecurityUtils.getUserId()); Integer renewal = apiclassDao.updateApiclass(apiclass); if (renewal > 0) { - return new GenServerResult(true, renewal); + return new GenServerResult<>(true, renewal); } else { - return new GenServerResult(false, GenReturnConstants.SYS_FAILL); + return new GenServerResult<>(false, GenReturnConstants.OP_ERROR); } } catch (RuntimeException e) { logger.error(e.getMessage()); @@ -124,9 +124,9 @@ public class ApiClassServiceImpl implements ApiClassService { try { Integer renewal = apiclassDao.deleteApiclassByIds(ids); if (renewal > 0) { - return new GenServerResult(true, renewal); + return new GenServerResult<>(true, renewal); } else { - return new GenServerResult(false, GenReturnConstants.SYS_FAILL); + return new GenServerResult<>(false, GenReturnConstants.OP_ERROR); } } catch (RuntimeException e) { logger.error(e.getMessage()); @@ -145,9 +145,9 @@ public class ApiClassServiceImpl implements ApiClassService { try { Integer renewal = apiclassDao.deleteApiclassById(id); if (renewal > 0) { - return new GenServerResult(true, renewal); + return new GenServerResult<>(true, renewal); } else { - return new GenServerResult(false, GenReturnConstants.SYS_FAILL); + return new GenServerResult<>(false, GenReturnConstants.OP_ERROR); } } catch (RuntimeException e) { logger.error(e.getMessage()); 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 c815ec8..9f8b5d5 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 @@ -61,21 +61,16 @@ public class ${ClassName}Controller extends EBTSController { @PreAuthorize("@ebts.hasPermi('${permissionPrefix}:list')") @PostMapping("/list") public Serializable list(@Validated @RequestBody ${ClassName} ${className}) { - try { - startPage(${className}.getPageInfo()); - ServerResult> genServerResult = ${className}Service.select${ClassName}List(${className}); - if (genServerResult.isStart()) { + startPage(${className}.getPageInfo()); + ServerResult> genServerResult = ${className}Service.select${ClassName}List(${className}); + if (genServerResult.isStart()) { #if($table.crud || $table.sub || $tplCategory.equals("rel")) - return getDataTable(genServerResult.getData()); + return getDataTable(genServerResult.getData()); #elseif($table.tree) - return AjaxResult.success(genServerResult.getData()); + return AjaxResult.success(genServerResult.getData()); #end - } else { - return AjaxResult.info(genServerResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - throw new EBTSException(ReturnConstants.SYS_ERROR,e); + } else { + return AjaxResult.info(genServerResult.getMsg()); } } @@ -87,17 +82,12 @@ public class ${ClassName}Controller extends EBTSController { @Log(title = "${functionName}", businessType = BusinessType.EXPORT) @PostMapping("/export") public AjaxResult export(@Validated @RequestBody ${ClassName} ${className}) { - try { - ServerResult> genServerResult = ${className}Service.select${ClassName}List(${className}); - ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}. class); - if (genServerResult.isStart()) { - return util.exportExcel(genServerResult.getData(), "${businessName}"); - } else { - return AjaxResult.error(genServerResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - throw new EBTSException(ReturnConstants.SYS_ERROR,e); + ServerResult> genServerResult = ${className}Service.select${ClassName}List(${className}); + ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}. class); + if (genServerResult.isStart()) { + return util.exportExcel(genServerResult.getData(), "${businessName}"); + } else { + return AjaxResult.error(genServerResult.getMsg()); } } @@ -109,16 +99,11 @@ public class ${ClassName}Controller extends EBTSController { @PreAuthorize("@ebts.hasPermi('${permissionPrefix}:query')") @GetMapping(value = "/{${pkColumn.javaField}}") public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) { - try { - ServerResult<${ClassName}> genServerResult = ${className}Service.select${ClassName}ById(${pkColumn.javaField}); - if (genServerResult.isStart()) { - return AjaxResult.success(genServerResult.getData()); - } else { - return AjaxResult.info(genServerResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - throw new EBTSException(ReturnConstants.SYS_ERROR,e); + ServerResult<${ClassName}> genServerResult = ${className}Service.select${ClassName}ById(${pkColumn.javaField}); + if (genServerResult.isStart()) { + return AjaxResult.success(genServerResult.getData()); + } else { + return AjaxResult.info(genServerResult.getMsg()); } } @@ -131,16 +116,11 @@ public class ${ClassName}Controller extends EBTSController { @Log(title = "${functionName}", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@Validated @RequestBody ${ClassName} ${className}) { - try { - ServerResult genServerResult = ${className}Service.insert${ClassName}(${className}); - if (genServerResult.isStart()) { - return AjaxResult.success(); - } else { - return AjaxResult.error(genServerResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - throw new EBTSException(ReturnConstants.SYS_ERROR,e); + ServerResult genServerResult = ${className}Service.insert${ClassName}(${className}); + if (genServerResult.isStart()) { + return AjaxResult.success(); + } else { + return AjaxResult.error(genServerResult.getMsg()); } } @@ -153,16 +133,11 @@ public class ${ClassName}Controller extends EBTSController { @Log(title = "${functionName}", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@Validated @RequestBody ${ClassName} ${className}) { - try { - ServerResult genServerResult = ${className}Service.update${ClassName}(${className}); - if (genServerResult.isStart()) { - return AjaxResult.success(); - } else { - return AjaxResult.error(genServerResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - throw new EBTSException(ReturnConstants.SYS_ERROR,e); + ServerResult genServerResult = ${className}Service.update${ClassName}(${className}); + if (genServerResult.isStart()) { + return AjaxResult.success(); + } else { + return AjaxResult.error(genServerResult.getMsg()); } } @@ -175,19 +150,14 @@ public class ${ClassName}Controller extends EBTSController { @Log(title = "${functionName}", businessType = BusinessType.DELETE) @DeleteMapping("/{${pkColumn.javaField}s}") public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) { - try { - if (${pkColumn.javaField}s.length<0){ - return AjaxResult.error("id不能为空!"); - } - ServerResult genServerResult = ${className}Service.delete${ClassName}ByIds(${pkColumn.javaField}s); - if (genServerResult.isStart()) { - return AjaxResult.success(); - } else { - return AjaxResult.error(genServerResult.getMsg()); - } - }catch (RuntimeException e){ - logger.error(e.getMessage()); - throw new EBTSException(ReturnConstants.SYS_ERROR,e); + if (${pkColumn.javaField}s.length<0){ + return AjaxResult.error("id不能为空!"); + } + ServerResult genServerResult = ${className}Service.delete${ClassName}ByIds(${pkColumn.javaField}s); + if (genServerResult.isStart()) { + return AjaxResult.success(); + } else { + return AjaxResult.error(genServerResult.getMsg()); } } } 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 2ef5b79..368f921 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 @@ -3,6 +3,7 @@ package ${packageName}.service.impl; import java.util.List; import com.ebts.common.constant.ReturnConstants; +import com.ebts.common.exception.EbtsException; #foreach ($column in $columns) #if($column.javaField == 'createTime' || $column.javaField == 'updateTime') import com.ebts.common.utils.DateUtils; @@ -56,7 +57,7 @@ public class ${ClassName}ServiceImpl implements ${ClassName}Service { } }catch (RuntimeException e){ logger.error(e.getMessage()); - return new ServerResult<${ClassName}>(false,ReturnConstants.DB_EX); + throw new EbtsException(ReturnConstants.OP_ERROR,e); } } @@ -77,7 +78,7 @@ public class ${ClassName}ServiceImpl implements ${ClassName}Service { } }catch (RuntimeException e){ logger.error(e.getMessage()); - return new ServerResult<>(false,ReturnConstants.DB_EX); + throw new EbtsException(ReturnConstants.OP_ERROR,e); } } @@ -113,7 +114,7 @@ public class ${ClassName}ServiceImpl implements ${ClassName}Service { } }catch (RuntimeException e){ logger.error(e.getMessage()); - return new ServerResult<>(false,ReturnConstants.DB_EX); + throw new EbtsException(ReturnConstants.OP_ERROR,e); } } @@ -148,7 +149,7 @@ public class ${ClassName}ServiceImpl implements ${ClassName}Service { } }catch (RuntimeException e){ logger.error(e.getMessage()); - return new ServerResult<>(false,ReturnConstants.DB_EX); + throw new EbtsException(ReturnConstants.OP_ERROR,e); } } @@ -175,11 +176,8 @@ public class ${ClassName}ServiceImpl implements ${ClassName}Service { return new ServerResult<>(false,ReturnConstants.SYS_FAILL); } }catch (RuntimeException e){ -#if($table.sub) - TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); -#end logger.error(e.getMessage()); - return new ServerResult<>(false,ReturnConstants.DB_EX); + throw new EbtsException(ReturnConstants.OP_ERROR,e); } } @@ -204,7 +202,7 @@ public class ${ClassName}ServiceImpl implements ${ClassName}Service { } }catch (RuntimeException e){ logger.error(e.getMessage()); - return new ServerResult<>(false,ReturnConstants.DB_EX); + throw new EbtsException(ReturnConstants.OP_ERROR,e); } } #if($table.sub)