clay
/
ebts
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

12

This commit is contained in:
clay 2021-06-16 23:44:52 +08:00
parent e43009db73
commit 156f38ee22
4 changed files with 55 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ebts/ebts-generator/src/main/java/com/ebts/generator/dao/ApiClassDao.java
View File

@ -59,5 +59,5 @@ public interface ApiClassDao {
* @param ids 需要删除的数据ID * @param ids 需要删除的数据ID
* @return 结果 * @return 结果
*/ */
public int deleteApiclassByIds(Long[] ids); int deleteApiclassByIds(Long[] ids);
} }

22
ebts/ebts-generator/src/main/java/com/ebts/generator/service/impl/ApiClassServiceImpl.java
View File

@ -38,9 +38,9 @@ public class ApiClassServiceImpl implements ApiClassService {
try { try {
ApiClass apiclass = apiclassDao.selectApiclassById(id); ApiClass apiclass = apiclassDao.selectApiclassById(id);
if (apiclass != null) { if (apiclass != null) {
return new GenServerResult<ApiClass>(true, apiclass); return new GenServerResult<>(true, apiclass);
} else { } else {
return new GenServerResult<ApiClass>(false, GenReturnConstants.RESULT_EMPTY); return new GenServerResult<>(false, GenReturnConstants.RESULT_EMPTY);
} }
} catch (RuntimeException e) { } catch (RuntimeException e) {
logger.error(e.getMessage()); logger.error(e.getMessage());
@ -59,9 +59,9 @@ public class ApiClassServiceImpl implements ApiClassService {
try { try {
List<ApiClass> apiClassList = apiclassDao.selectApiclassList(apiclass); List<ApiClass> apiClassList = apiclassDao.selectApiclassList(apiclass);
if (apiClassList.size() > 0) { if (apiClassList.size() > 0) {
return new GenServerResult<List<ApiClass>>(true, apiClassList); return new GenServerResult<>(true, apiClassList);
} else { } else {
return new GenServerResult<List<ApiClass>>(false, GenReturnConstants.RESULT_EMPTY); return new GenServerResult<>(false, GenReturnConstants.RESULT_EMPTY);
} }
} catch (RuntimeException e) { } catch (RuntimeException e) {
logger.error(e.getMessage()); logger.error(e.getMessage());
@ -83,7 +83,7 @@ public class ApiClassServiceImpl implements ApiClassService {
if (renewal > 0) { if (renewal > 0) {
return new GenServerResult<Integer>(true, renewal); return new GenServerResult<Integer>(true, renewal);
} else { } else {
return new GenServerResult<Integer>(false, GenReturnConstants.SYS_FAILL); return new GenServerResult<Integer>(false, GenReturnConstants.OP_ERROR);
} }
} catch (RuntimeException e) { } catch (RuntimeException e) {
logger.error(e.getMessage()); logger.error(e.getMessage());
@ -103,9 +103,9 @@ public class ApiClassServiceImpl implements ApiClassService {
apiclass.setUpdateBy(GenSecurityUtils.getUserId()); apiclass.setUpdateBy(GenSecurityUtils.getUserId());
Integer renewal = apiclassDao.updateApiclass(apiclass); Integer renewal = apiclassDao.updateApiclass(apiclass);
if (renewal > 0) { if (renewal > 0) {
return new GenServerResult<Integer>(true, renewal); return new GenServerResult<>(true, renewal);
} else { } else {
return new GenServerResult<Integer>(false, GenReturnConstants.SYS_FAILL); return new GenServerResult<>(false, GenReturnConstants.OP_ERROR);
} }
} catch (RuntimeException e) { } catch (RuntimeException e) {
logger.error(e.getMessage()); logger.error(e.getMessage());
@ -124,9 +124,9 @@ public class ApiClassServiceImpl implements ApiClassService {
try { try {
Integer renewal = apiclassDao.deleteApiclassByIds(ids); Integer renewal = apiclassDao.deleteApiclassByIds(ids);
if (renewal > 0) { if (renewal > 0) {
return new GenServerResult<Integer>(true, renewal); return new GenServerResult<>(true, renewal);
} else { } else {
return new GenServerResult<Integer>(false, GenReturnConstants.SYS_FAILL); return new GenServerResult<>(false, GenReturnConstants.OP_ERROR);
} }
} catch (RuntimeException e) { } catch (RuntimeException e) {
logger.error(e.getMessage()); logger.error(e.getMessage());
@ -145,9 +145,9 @@ public class ApiClassServiceImpl implements ApiClassService {
try { try {
Integer renewal = apiclassDao.deleteApiclassById(id); Integer renewal = apiclassDao.deleteApiclassById(id);
if (renewal > 0) { if (renewal > 0) {
return new GenServerResult<Integer>(true, renewal); return new GenServerResult<>(true, renewal);
} else { } else {
return new GenServerResult<Integer>(false, GenReturnConstants.SYS_FAILL); return new GenServerResult<>(false, GenReturnConstants.OP_ERROR);
} }
} catch (RuntimeException e) { } catch (RuntimeException e) {
logger.error(e.getMessage()); logger.error(e.getMessage());

102
ebts/ebts-generator/src/main/resources/vm/java/controller.java.vm
View File

@ -61,21 +61,16 @@ public class ${ClassName}Controller extends EBTSController {
@PreAuthorize("@ebts.hasPermi('${permissionPrefix}:list')") @PreAuthorize("@ebts.hasPermi('${permissionPrefix}:list')")
@PostMapping("/list") @PostMapping("/list")
public Serializable list(@Validated @RequestBody ${ClassName} ${className}) { public Serializable list(@Validated @RequestBody ${ClassName} ${className}) {
try { startPage(${className}.getPageInfo());
startPage(${className}.getPageInfo()); ServerResult<List<${ClassName}>> genServerResult = ${className}Service.select${ClassName}List(${className});
ServerResult<List<${ClassName}>> genServerResult = ${className}Service.select${ClassName}List(${className}); if (genServerResult.isStart()) {
if (genServerResult.isStart()) {
#if($table.crud || $table.sub || $tplCategory.equals("rel")) #if($table.crud || $table.sub || $tplCategory.equals("rel"))
return getDataTable(genServerResult.getData()); return getDataTable(genServerResult.getData());
#elseif($table.tree) #elseif($table.tree)
return AjaxResult.success(genServerResult.getData()); return AjaxResult.success(genServerResult.getData());
#end #end
} else { } else {
return AjaxResult.info(genServerResult.getMsg()); return AjaxResult.info(genServerResult.getMsg());
}
} catch (RuntimeException e) {
logger.error(e.getMessage());
throw new EBTSException(ReturnConstants.SYS_ERROR,e);
} }
} }
@ -87,17 +82,12 @@ public class ${ClassName}Controller extends EBTSController {
@Log(title = "${functionName}", businessType = BusinessType.EXPORT) @Log(title = "${functionName}", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public AjaxResult export(@Validated @RequestBody ${ClassName} ${className}) { public AjaxResult export(@Validated @RequestBody ${ClassName} ${className}) {
try { ServerResult<List<${ClassName}>> genServerResult = ${className}Service.select${ClassName}List(${className});
ServerResult<List<${ClassName}>> genServerResult = ${className}Service.select${ClassName}List(${className}); ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}. class);
ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}. class); if (genServerResult.isStart()) {
if (genServerResult.isStart()) { return util.exportExcel(genServerResult.getData(), "${businessName}");
return util.exportExcel(genServerResult.getData(), "${businessName}"); } else {
} else { return AjaxResult.error(genServerResult.getMsg());
return AjaxResult.error(genServerResult.getMsg());
}
} catch (RuntimeException e) {
logger.error(e.getMessage());
throw new EBTSException(ReturnConstants.SYS_ERROR,e);
} }
} }
@ -109,16 +99,11 @@ public class ${ClassName}Controller extends EBTSController {
@PreAuthorize("@ebts.hasPermi('${permissionPrefix}:query')") @PreAuthorize("@ebts.hasPermi('${permissionPrefix}:query')")
@GetMapping(value = "/{${pkColumn.javaField}}") @GetMapping(value = "/{${pkColumn.javaField}}")
public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) { public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) {
try { ServerResult<${ClassName}> genServerResult = ${className}Service.select${ClassName}ById(${pkColumn.javaField});
ServerResult<${ClassName}> genServerResult = ${className}Service.select${ClassName}ById(${pkColumn.javaField}); if (genServerResult.isStart()) {
if (genServerResult.isStart()) { return AjaxResult.success(genServerResult.getData());
return AjaxResult.success(genServerResult.getData()); } else {
} else { return AjaxResult.info(genServerResult.getMsg());
return AjaxResult.info(genServerResult.getMsg());
}
} catch (RuntimeException e) {
logger.error(e.getMessage());
throw new EBTSException(ReturnConstants.SYS_ERROR,e);
} }
} }
@ -131,16 +116,11 @@ public class ${ClassName}Controller extends EBTSController {
@Log(title = "${functionName}", businessType = BusinessType.INSERT) @Log(title = "${functionName}", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@Validated @RequestBody ${ClassName} ${className}) { public AjaxResult add(@Validated @RequestBody ${ClassName} ${className}) {
try { ServerResult<Integer> genServerResult = ${className}Service.insert${ClassName}(${className});
ServerResult<Integer> genServerResult = ${className}Service.insert${ClassName}(${className}); if (genServerResult.isStart()) {
if (genServerResult.isStart()) { return AjaxResult.success();
return AjaxResult.success(); } else {
} else { return AjaxResult.error(genServerResult.getMsg());
return AjaxResult.error(genServerResult.getMsg());
}
} catch (RuntimeException e) {
logger.error(e.getMessage());
throw new EBTSException(ReturnConstants.SYS_ERROR,e);
} }
} }
@ -153,16 +133,11 @@ public class ${ClassName}Controller extends EBTSController {
@Log(title = "${functionName}", businessType = BusinessType.UPDATE) @Log(title = "${functionName}", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@Validated @RequestBody ${ClassName} ${className}) { public AjaxResult edit(@Validated @RequestBody ${ClassName} ${className}) {
try { ServerResult<Integer> genServerResult = ${className}Service.update${ClassName}(${className});
ServerResult<Integer> genServerResult = ${className}Service.update${ClassName}(${className}); if (genServerResult.isStart()) {
if (genServerResult.isStart()) { return AjaxResult.success();
return AjaxResult.success(); } else {
} else { return AjaxResult.error(genServerResult.getMsg());
return AjaxResult.error(genServerResult.getMsg());
}
} catch (RuntimeException e) {
logger.error(e.getMessage());
throw new EBTSException(ReturnConstants.SYS_ERROR,e);
} }
} }
@ -175,19 +150,14 @@ public class ${ClassName}Controller extends EBTSController {
@Log(title = "${functionName}", businessType = BusinessType.DELETE) @Log(title = "${functionName}", businessType = BusinessType.DELETE)
@DeleteMapping("/{${pkColumn.javaField}s}") @DeleteMapping("/{${pkColumn.javaField}s}")
public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) { public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) {
try { if (${pkColumn.javaField}s.length<0){
if (${pkColumn.javaField}s.length<0){ return AjaxResult.error("id不能为空!");
return AjaxResult.error("id不能为空!"); }
} ServerResult<Integer> genServerResult = ${className}Service.delete${ClassName}ByIds(${pkColumn.javaField}s);
ServerResult<Integer> genServerResult = ${className}Service.delete${ClassName}ByIds(${pkColumn.javaField}s); if (genServerResult.isStart()) {
if (genServerResult.isStart()) { return AjaxResult.success();
return AjaxResult.success(); } else {
} else { return AjaxResult.error(genServerResult.getMsg());
return AjaxResult.error(genServerResult.getMsg());
}
}catch (RuntimeException e){
logger.error(e.getMessage());
throw new EBTSException(ReturnConstants.SYS_ERROR,e);
} }
} }
} }

16
ebts/ebts-generator/src/main/resources/vm/java/serviceImpl.java.vm
View File

@ -3,6 +3,7 @@ package ${packageName}.service.impl;
import java.util.List; import java.util.List;
import com.ebts.common.constant.ReturnConstants; import com.ebts.common.constant.ReturnConstants;
import com.ebts.common.exception.EbtsException;
#foreach ($column in $columns) #foreach ($column in $columns)
#if($column.javaField == 'createTime' || $column.javaField == 'updateTime') #if($column.javaField == 'createTime' || $column.javaField == 'updateTime')
import com.ebts.common.utils.DateUtils; import com.ebts.common.utils.DateUtils;
@ -56,7 +57,7 @@ public class ${ClassName}ServiceImpl implements ${ClassName}Service {
} }
}catch (RuntimeException e){ }catch (RuntimeException e){
logger.error(e.getMessage()); 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){ }catch (RuntimeException e){
logger.error(e.getMessage()); 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){ }catch (RuntimeException e){
logger.error(e.getMessage()); 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){ }catch (RuntimeException e){
logger.error(e.getMessage()); 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); return new ServerResult<>(false,ReturnConstants.SYS_FAILL);
} }
}catch (RuntimeException e){ }catch (RuntimeException e){
#if($table.sub)
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
#end
logger.error(e.getMessage()); 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){ }catch (RuntimeException e){
logger.error(e.getMessage()); logger.error(e.getMessage());
return new ServerResult<>(false,ReturnConstants.DB_EX); throw new EbtsException(ReturnConstants.OP_ERROR,e);
} }
} }
#if($table.sub) #if($table.sub)