diff --git a/ebts/ebts-admin/src/main/java/com/ebts/web/controller/monitor/LogininforController.java b/ebts/ebts-admin/src/main/java/com/ebts/web/controller/monitor/LogininforController.java index 04cb361..8393c1c 100644 --- a/ebts/ebts-admin/src/main/java/com/ebts/web/controller/monitor/LogininforController.java +++ b/ebts/ebts-admin/src/main/java/com/ebts/web/controller/monitor/LogininforController.java @@ -29,7 +29,6 @@ import com.ebts.system.service.LogininforService; @RestController @RequestMapping("/monitor/logininfor") public class LogininforController extends BaseController { - private Logger logger = LoggerFactory.getLogger(LogininforController.class); @Autowired private LogininforService logininforService; @@ -37,52 +36,32 @@ public class LogininforController extends BaseController { @PreAuthorize("@ebts.hasPermi('monitor:logininfor:list')") @GetMapping("/list") public Serializable list(Logininfor logininfor) { - try { - startPage(); - List list = logininforService.selectLogininforList(logininfor); - return getDataTable(list); - }catch (RuntimeException e){ - logger.error(e.getMessage()); - return AjaxResult.error(ReturnConstants.SYS_ERROR); - } + startPage(); + List list = logininforService.selectLogininforList(logininfor); + return getDataTable(list); } @Log(title = "登录日志", businessType = BusinessType.EXPORT) @PreAuthorize("@ebts.hasPermi('monitor:logininfor:export')") @GetMapping("/export") public AjaxResult export(Logininfor logininfor) { - try { - List list = logininforService.selectLogininforList(logininfor); - ExcelUtil util = new ExcelUtil(Logininfor.class); - return util.exportExcel(list, "登录日志"); - }catch (RuntimeException e){ - logger.error(e.getMessage()); - return AjaxResult.error(ReturnConstants.SYS_ERROR); - } + List list = logininforService.selectLogininforList(logininfor); + ExcelUtil util = new ExcelUtil(Logininfor.class); + return util.exportExcel(list, "登录日志"); } @PreAuthorize("@ebts.hasPermi('monitor:logininfor:remove')") @Log(title = "登录日志", businessType = BusinessType.DELETE) @DeleteMapping("/{infoIds}") public AjaxResult remove(@PathVariable Long[] infoIds) { - try { - return toAjax(logininforService.deleteLogininforByIds(infoIds)); - }catch (RuntimeException e){ - logger.error(e.getMessage()); - return AjaxResult.error(ReturnConstants.SYS_ERROR); - } + return toAjax(logininforService.deleteLogininforByIds(infoIds)); } @PreAuthorize("@ebts.hasPermi('monitor:logininfor:remove')") @Log(title = "登录日志", businessType = BusinessType.CLEAN) @DeleteMapping("/clean") public AjaxResult clean() { - try { - logininforService.cleanLogininfor(); - return AjaxResult.success(); - }catch (RuntimeException e){ - logger.error(e.getMessage()); - return AjaxResult.error(ReturnConstants.SYS_ERROR); - } + logininforService.cleanLogininfor(); + return AjaxResult.success(); } } diff --git a/ebts/ebts-admin/src/main/java/com/ebts/web/controller/monitor/OperlogController.java b/ebts/ebts-admin/src/main/java/com/ebts/web/controller/monitor/OperlogController.java index 70152fb..d47a4ae 100644 --- a/ebts/ebts-admin/src/main/java/com/ebts/web/controller/monitor/OperlogController.java +++ b/ebts/ebts-admin/src/main/java/com/ebts/web/controller/monitor/OperlogController.java @@ -29,7 +29,6 @@ import com.ebts.system.service.OperLogService; @RestController @RequestMapping("/monitor/operlog") public class OperlogController extends BaseController { - private Logger logger = LoggerFactory.getLogger(OperlogController.class); @Autowired private OperLogService operLogService; @@ -37,51 +36,31 @@ public class OperlogController extends BaseController { @PreAuthorize("@ebts.hasPermi('monitor:operlog:list')") @GetMapping("/list") public Serializable list(OperLog operLog) { - try { - startPage(); - List list = operLogService.selectOperLogList(operLog); - return getDataTable(list); - }catch (RuntimeException e){ - logger.error(e.getMessage()); - return AjaxResult.error(ReturnConstants.SYS_ERROR); - } + startPage(); + List list = operLogService.selectOperLogList(operLog); + return getDataTable(list); } @Log(title = "操作日志", businessType = BusinessType.EXPORT) @PreAuthorize("@ebts.hasPermi('monitor:operlog:export')") @GetMapping("/export") public AjaxResult export(OperLog operLog) { - try { - List list = operLogService.selectOperLogList(operLog); - ExcelUtil util = new ExcelUtil(OperLog.class); - return util.exportExcel(list, "操作日志"); - }catch (RuntimeException e){ - logger.error(e.getMessage()); - return AjaxResult.error(ReturnConstants.SYS_ERROR); - } + List list = operLogService.selectOperLogList(operLog); + ExcelUtil util = new ExcelUtil(OperLog.class); + return util.exportExcel(list, "操作日志"); } @PreAuthorize("@ebts.hasPermi('monitor:operlog:remove')") @DeleteMapping("/{operIds}") public AjaxResult remove(@PathVariable Long[] operIds) { - try { - return toAjax(operLogService.deleteOperLogByIds(operIds)); - }catch (RuntimeException e){ - logger.error(e.getMessage()); - return AjaxResult.error(ReturnConstants.SYS_ERROR); - } + return toAjax(operLogService.deleteOperLogByIds(operIds)); } @Log(title = "操作日志", businessType = BusinessType.CLEAN) @PreAuthorize("@ebts.hasPermi('monitor:operlog:remove')") @DeleteMapping("/clean") public AjaxResult clean() { - try { - operLogService.cleanOperLog(); - return AjaxResult.success(); - }catch (RuntimeException e){ - logger.error(e.getMessage()); - return AjaxResult.error(ReturnConstants.SYS_ERROR); - } + operLogService.cleanOperLog(); + return AjaxResult.success(); } } diff --git a/ebts/ebts-admin/src/main/java/com/ebts/web/controller/monitor/ServerController.java b/ebts/ebts-admin/src/main/java/com/ebts/web/controller/monitor/ServerController.java index ee687d4..b7d1c53 100644 --- a/ebts/ebts-admin/src/main/java/com/ebts/web/controller/monitor/ServerController.java +++ b/ebts/ebts-admin/src/main/java/com/ebts/web/controller/monitor/ServerController.java @@ -25,13 +25,8 @@ public class ServerController extends BaseController { @PreAuthorize("@ebts.hasPermi('monitor:server:list')") @GetMapping() public AjaxResult getInfo() throws Exception { - try { - Server server = new Server(); - server.copyTo(); - return AjaxResult.success(server); - }catch (RuntimeException e){ - logger.error(e.getMessage()); - return AjaxResult.error(ReturnConstants.SYS_ERROR); - } + Server server = new Server(); + server.copyTo(); + return AjaxResult.success(server); } } diff --git a/ebts/ebts-admin/src/main/java/com/ebts/web/controller/monitor/UserOnlineController.java b/ebts/ebts-admin/src/main/java/com/ebts/web/controller/monitor/UserOnlineController.java index 7573503..9d42c3d 100644 --- a/ebts/ebts-admin/src/main/java/com/ebts/web/controller/monitor/UserOnlineController.java +++ b/ebts/ebts-admin/src/main/java/com/ebts/web/controller/monitor/UserOnlineController.java @@ -70,7 +70,7 @@ public class UserOnlineController extends BaseController { Collections.reverse(userOnlineList); userOnlineList.removeAll(Collections.singleton(null)); return getDataTable(userOnlineList); - }catch (RuntimeException e){ + } catch (RuntimeException e) { logger.error(e.getMessage()); return AjaxResult.error(ReturnConstants.SYS_ERROR); } @@ -83,12 +83,7 @@ public class UserOnlineController extends BaseController { @Log(title = "在线用户", businessType = BusinessType.FORCE) @DeleteMapping("/{tokenId}") public AjaxResult forceLogout(@PathVariable String tokenId) { - try { - redisCache.deleteObject(Constants.LOGIN_TOKEN_KEY + tokenId); - return AjaxResult.success(); - }catch (RuntimeException e){ - logger.error(e.getMessage()); - return AjaxResult.error(ReturnConstants.SYS_ERROR); - } + redisCache.deleteObject(Constants.LOGIN_TOKEN_KEY + tokenId); + return AjaxResult.success(); } } diff --git a/ebts/ebts-admin/src/main/java/com/ebts/web/controller/system/FileController.java b/ebts/ebts-admin/src/main/java/com/ebts/web/controller/system/FileController.java index cdb4cae..f58ecb3 100644 --- a/ebts/ebts-admin/src/main/java/com/ebts/web/controller/system/FileController.java +++ b/ebts/ebts-admin/src/main/java/com/ebts/web/controller/system/FileController.java @@ -61,32 +61,22 @@ public class FileController extends EBTSController { @PreAuthorize("@ebts.hasPermi('system:file:list')") @PutMapping("/list") public Serializable list(@Validated @RequestBody SysFile sysFile) { - try { - startPage(sysFile.getParams()); - ServerResult> serverResult = fileService.selectFileList(sysFile); - if (serverResult.isStart()) { - return getDataTable(serverResult.getData()); - } else { - return AjaxResult.info(serverResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(ReturnConstants.SYS_ERROR); + startPage(sysFile.getParams()); + ServerResult> serverResult = fileService.selectFileList(sysFile); + if (serverResult.isStart()) { + return getDataTable(serverResult.getData()); + } else { + return AjaxResult.info(serverResult.getMsg()); } } @GetMapping("/folder") public AjaxResult getFolder() { - try { - ServerResult> serverResult = fileService.selectFileFolder(); - if (serverResult.isStart()) { - return AjaxResult.success(serverResult.getData()); - } else { - return AjaxResult.error(serverResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(ReturnConstants.SYS_ERROR); + ServerResult> serverResult = fileService.selectFileFolder(); + if (serverResult.isStart()) { + return AjaxResult.success(serverResult.getData()); + } else { + return AjaxResult.error(serverResult.getMsg()); } } @@ -97,17 +87,12 @@ public class FileController extends EBTSController { @Log(title = "文件信息", businessType = BusinessType.EXPORT) @PutMapping("/export") public AjaxResult export(@Validated @RequestBody SysFile sysFile) { - try { - ServerResult> serverResult = fileService.selectFileList(sysFile); - ExcelUtil util = new ExcelUtil(SysFile.class); - if (serverResult.isStart()) { - return util.exportExcel(serverResult.getData(), "file"); - } else { - return AjaxResult.error(serverResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(ReturnConstants.SYS_ERROR); + ServerResult> serverResult = fileService.selectFileList(sysFile); + ExcelUtil util = new ExcelUtil(SysFile.class); + if (serverResult.isStart()) { + return util.exportExcel(serverResult.getData(), "file"); + } else { + return AjaxResult.error(serverResult.getMsg()); } } @@ -117,16 +102,11 @@ public class FileController extends EBTSController { @PreAuthorize("@ebts.hasPermi('system:file:query')") @GetMapping(value = "/{fileId}") public AjaxResult getInfo(@PathVariable("fileId") Long fileId) { - try { - ServerResult serverResult = fileService.selectFileById(fileId); - if (serverResult.isStart()) { - return AjaxResult.success(serverResult.getData()); - } else { - return AjaxResult.info(serverResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(ReturnConstants.SYS_ERROR); + ServerResult serverResult = fileService.selectFileById(fileId); + if (serverResult.isStart()) { + return AjaxResult.success(serverResult.getData()); + } else { + return AjaxResult.info(serverResult.getMsg()); } } @@ -137,30 +117,25 @@ public class FileController extends EBTSController { @Log(title = "文件信息", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody SysFile sysFile) { - try { - if (sysFile.getFileAddr() == null || sysFile.getFileAddr().equals("")) { - return AjaxResult.error("上传文件不能为空!"); - } - if (sysFile.getIsPublic().equals("1") || sysFile.getIsPublic().equals("2")) { - Map modeMap = new HashMap<>(); - ServerResult serverResult = fileService.insertFile(sysFile); - if (serverResult.isStart()) { - if (sysFile.getIsPublic().equals("1")) { - String fileUrl = FtpUtils.getResources() + sysFile.getFileAddr().substring(FtpUtils.getPubfiles().length()) + "/" + sysFile.getMapping(); - modeMap.put("url", fileUrl); - } - String fileUri = sysFile.getFileAddr() + "/" + sysFile.getMapping(); - modeMap.put("uri", fileUri); - return AjaxResult.success(modeMap); - } else { - return AjaxResult.error(serverResult.getMsg()); + if (sysFile.getFileAddr() == null || sysFile.getFileAddr().equals("")) { + return AjaxResult.error("上传文件不能为空!"); + } + if (sysFile.getIsPublic().equals("1") || sysFile.getIsPublic().equals("2")) { + Map modeMap = new HashMap<>(); + ServerResult serverResult = fileService.insertFile(sysFile); + if (serverResult.isStart()) { + if (sysFile.getIsPublic().equals("1")) { + String fileUrl = FtpUtils.getResources() + sysFile.getFileAddr().substring(FtpUtils.getPubfiles().length()) + "/" + sysFile.getMapping(); + modeMap.put("url", fileUrl); } - }else { - return AjaxResult.error("isPublic为空或者状态有误!"); + String fileUri = sysFile.getFileAddr() + "/" + sysFile.getMapping(); + modeMap.put("uri", fileUri); + return AjaxResult.success(modeMap); + } else { + return AjaxResult.error(serverResult.getMsg()); } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(ReturnConstants.SYS_ERROR); + } else { + return AjaxResult.error("isPublic为空或者状态有误!"); } } @@ -171,17 +146,11 @@ public class FileController extends EBTSController { @Log(title = "文件信息", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody SysFile sysFile) { - try { - - ServerResult serverResult = fileService.updateFile(sysFile); - if (serverResult.isStart()) { - return AjaxResult.success(); - } else { - return AjaxResult.error(serverResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(ReturnConstants.SYS_ERROR); + ServerResult serverResult = fileService.updateFile(sysFile); + if (serverResult.isStart()) { + return AjaxResult.success(); + } else { + return AjaxResult.error(serverResult.getMsg()); } } @@ -192,40 +161,25 @@ public class FileController extends EBTSController { @Log(title = "文件信息", businessType = BusinessType.DELETE) @DeleteMapping("/{fileIds}") public AjaxResult remove(@PathVariable Long[] fileIds) { - try { - if (fileIds.length < 0) { - return AjaxResult.error("id不能为空!"); - } - ServerResult serverResult = fileService.deleteFileByIds(fileIds); - if (serverResult.isStart()) { - return AjaxResult.success(); - } else { - return AjaxResult.error(serverResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(ReturnConstants.SYS_ERROR); + if (fileIds.length < 0) { + return AjaxResult.error("id不能为空!"); + } + ServerResult serverResult = fileService.deleteFileByIds(fileIds); + if (serverResult.isStart()) { + return AjaxResult.success(); + } else { + return AjaxResult.error(serverResult.getMsg()); } } @GetMapping("/download/{fileId}") public AjaxResult download(@PathVariable Long fileId, HttpServletRequest request, HttpServletResponse response) { - try { - LoginUser user = tokenService.getFileUser(request); - ServerResult serverResult = fileService.downloadFile(fileId, user); - if (serverResult.isStart()) { - return AjaxResult.success(serverResult.getData().getFileName()); - } else { - return AjaxResult.error(serverResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(ReturnConstants.SYS_ERROR); + LoginUser user = tokenService.getFileUser(request); + ServerResult serverResult = fileService.downloadFile(fileId, user); + if (serverResult.isStart()) { + return AjaxResult.success(serverResult.getData().getFileName()); + } else { + return AjaxResult.error(serverResult.getMsg()); } } - - @GetMapping("/download/api") - public AjaxResult api() { - return AjaxResult.success("8085"); - } } diff --git a/ebts/ebts-admin/src/main/java/com/ebts/web/controller/system/NoticeController.java b/ebts/ebts-admin/src/main/java/com/ebts/web/controller/system/NoticeController.java index ea2028d..e8a9783 100644 --- a/ebts/ebts-admin/src/main/java/com/ebts/web/controller/system/NoticeController.java +++ b/ebts/ebts-admin/src/main/java/com/ebts/web/controller/system/NoticeController.java @@ -39,9 +39,9 @@ public class NoticeController extends BaseController { @PreAuthorize("@ebts.hasPermi('system:notice:list')") @GetMapping("/list") public Serializable list(Notice notice) { - startPage(); - List list = noticeService.selectNoticeList(notice); - return getDataTable(list); + startPage(); + List list = noticeService.selectNoticeList(notice); + return getDataTable(list); } /** @@ -50,7 +50,7 @@ public class NoticeController extends BaseController { @PreAuthorize("@ebts.hasPermi('system:notice:query')") @GetMapping(value = "/{noticeId}") public AjaxResult getInfo(@PathVariable Long noticeId) { - return AjaxResult.success(noticeService.selectNoticeById(noticeId)); + return AjaxResult.success(noticeService.selectNoticeById(noticeId)); } /** @@ -60,8 +60,8 @@ public class NoticeController extends BaseController { @Log(title = "通知公告", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@Validated @RequestBody Notice notice) { - notice.setCreateBy(SecurityUtils.getUserId()); - return toAjax(noticeService.insertNotice(notice)); + notice.setCreateBy(SecurityUtils.getUserId()); + return toAjax(noticeService.insertNotice(notice)); } /** @@ -71,8 +71,8 @@ public class NoticeController extends BaseController { @Log(title = "通知公告", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@Validated @RequestBody Notice notice) { - notice.setUpdateBy(SecurityUtils.getUserId()); - return toAjax(noticeService.updateNotice(notice)); + notice.setUpdateBy(SecurityUtils.getUserId()); + return toAjax(noticeService.updateNotice(notice)); } /** @@ -82,6 +82,6 @@ public class NoticeController extends BaseController { @Log(title = "通知公告", businessType = BusinessType.DELETE) @DeleteMapping("/{noticeIds}") public AjaxResult remove(@PathVariable Long[] noticeIds) { - return toAjax(noticeService.deleteNoticeByIds(noticeIds)); + return toAjax(noticeService.deleteNoticeByIds(noticeIds)); } } diff --git a/ebts/ebts-admin/src/main/java/com/ebts/web/controller/system/RealQueryController.java b/ebts/ebts-admin/src/main/java/com/ebts/web/controller/system/RealQueryController.java index c06631c..0306c46 100644 --- a/ebts/ebts-admin/src/main/java/com/ebts/web/controller/system/RealQueryController.java +++ b/ebts/ebts-admin/src/main/java/com/ebts/web/controller/system/RealQueryController.java @@ -26,75 +26,62 @@ import java.util.Map; @RestController @RequestMapping("/data") public class RealQueryController extends BaseController { - private Logger logger = LoggerFactory.getLogger(RealQueryController.class); @Autowired private RealQueryService realQueryService; /** * 用户导出 + * * @param realUniQuery * @return */ @PreAuthorize("@ebts.hasAnyPermi('data:real:export')") @PutMapping("/real/export") public AjaxResult exportReal(@Validated @RequestBody RealUniQuery realUniQuery) { - try { - ServerResult>> serverResult = realQueryService.RealData(realUniQuery, 1); - if (serverResult.isStart()) { - return new MapExcelUtil().exportExcel(serverResult.getData(), serverResult.getSheetName()); - } else { - return AjaxResult.error(serverResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(ReturnConstants.SYS_ERROR); + ServerResult>> serverResult = realQueryService.RealData(realUniQuery, 1); + if (serverResult.isStart()) { + return new MapExcelUtil().exportExcel(serverResult.getData(), serverResult.getSheetName()); + } else { + return AjaxResult.error(serverResult.getMsg()); } } /** * 获取查询基本信息 + * * @param id * @return */ @PreAuthorize("@ebts.hasPermi('data:real:data')") @GetMapping("/real/{id}") public AjaxResult RealInfo(@PathVariable("id") Long id) { - try { - if (id == null) { - return AjaxResult.error("id不能为空!"); - } - ServerResult> serverResult = realQueryService.RealInfo(id); - if (serverResult.isStart()) { - return AjaxResult.success(serverResult.getData()); - } else { - return AjaxResult.error(serverResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(ReturnConstants.SYS_ERROR); + if (id == null) { + return AjaxResult.error("id不能为空!"); + } + ServerResult> serverResult = realQueryService.RealInfo(id); + if (serverResult.isStart()) { + return AjaxResult.success(serverResult.getData()); + } else { + return AjaxResult.error(serverResult.getMsg()); } } /** * 获取查询数据 + * * @param realUniQuery * @return */ @PreAuthorize("@ebts.hasAnyPermi('data:real:list')") @PutMapping("/real") public Serializable RealData(@Validated @RequestBody RealUniQuery realUniQuery) { - try { - ServerResult>> serverResult = realQueryService.RealData(realUniQuery, 2); - if (serverResult.isStart()) { - return getDataTable(serverResult.getData()); - } else { - return AjaxResult.error(serverResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(ReturnConstants.SYS_ERROR); + ServerResult>> serverResult = realQueryService.RealData(realUniQuery, 2); + if (serverResult.isStart()) { + return getDataTable(serverResult.getData()); + } else { + return AjaxResult.error(serverResult.getMsg()); } } } diff --git a/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/ApiClassController.java b/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/ApiClassController.java index ff0e679..c8e0027 100644 --- a/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/ApiClassController.java +++ b/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/ApiClassController.java @@ -47,16 +47,11 @@ public class ApiClassController extends GenBaseController { @PreAuthorize("@ebts.hasAnyPermi('tool:apiclass:querylist')") @GetMapping("querylist") public AjaxResult queryList() { - try { - GenServerResult> genServerResult = apiClassService.selectApiclassList(new ApiClass()); - if (genServerResult.isStart()) { - return AjaxResult.success(genServerResult.getData()); - } else { - return AjaxResult.error(genServerResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(GenReturnConstants.SYS_ERROR); + GenServerResult> genServerResult = apiClassService.selectApiclassList(new ApiClass()); + if (genServerResult.isStart()) { + return AjaxResult.success(genServerResult.getData()); + } else { + return AjaxResult.error(genServerResult.getMsg()); } } @@ -66,17 +61,12 @@ public class ApiClassController extends GenBaseController { @PreAuthorize("@ebts.hasPermi('tool:apiclass:list')") @GetMapping("/list") public Serializable list(ApiClass apiclass) { - try { - startPage(); - GenServerResult> genServerResult = apiClassService.selectApiclassList(apiclass); - if (genServerResult.isStart()) { - return getDataTable(genServerResult.getData()); - } else { - return AjaxResult.info(genServerResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(GenReturnConstants.SYS_ERROR); + startPage(); + GenServerResult> genServerResult = apiClassService.selectApiclassList(apiclass); + if (genServerResult.isStart()) { + return getDataTable(genServerResult.getData()); + } else { + return AjaxResult.info(genServerResult.getMsg()); } } @@ -87,17 +77,12 @@ public class ApiClassController extends GenBaseController { @Log(title = "接口类名", businessType = GenBusinessType.EXPORT) @GetMapping("/export") public AjaxResult export(ApiClass apiclass) { - try { - GenServerResult> genServerResult = apiClassService.selectApiclassList(apiclass); - GenExcelUtil util = new GenExcelUtil(ApiClass.class); - if (genServerResult.isStart()) { - return util.exportExcel(genServerResult.getData(), "apiclass"); - } else { - return AjaxResult.error(genServerResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(GenReturnConstants.SYS_ERROR); + GenServerResult> genServerResult = apiClassService.selectApiclassList(apiclass); + GenExcelUtil util = new GenExcelUtil(ApiClass.class); + if (genServerResult.isStart()) { + return util.exportExcel(genServerResult.getData(), "apiclass"); + } else { + return AjaxResult.error(genServerResult.getMsg()); } } @@ -107,16 +92,11 @@ public class ApiClassController extends GenBaseController { @PreAuthorize("@ebts.hasPermi('tool:apiclass:query')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { - try { - GenServerResult genServerResult = apiClassService.selectApiclassById(id); - if (genServerResult.isStart()) { - return AjaxResult.success(genServerResult.getData()); - } else { - return AjaxResult.info(genServerResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(GenReturnConstants.SYS_ERROR); + GenServerResult genServerResult = apiClassService.selectApiclassById(id); + if (genServerResult.isStart()) { + return AjaxResult.success(genServerResult.getData()); + } else { + return AjaxResult.info(genServerResult.getMsg()); } } @@ -136,16 +116,11 @@ public class ApiClassController extends GenBaseController { if (apiclass.getcDescribe() == null || apiclass.getcDescribe().equals("")) { return AjaxResult.error("类描述不能为空!"); } - try { - GenServerResult genServerResult = apiClassService.insertApiclass(apiclass); - if (genServerResult.isStart()) { - return AjaxResult.success(); - } else { - return AjaxResult.error(genServerResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(GenReturnConstants.SYS_ERROR); + GenServerResult genServerResult = apiClassService.insertApiclass(apiclass); + if (genServerResult.isStart()) { + return AjaxResult.success(); + } else { + return AjaxResult.error(genServerResult.getMsg()); } } @@ -156,26 +131,20 @@ public class ApiClassController extends GenBaseController { @Log(title = "接口类名", businessType = GenBusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody ApiClass apiclass) { - try { - - if (apiclass.getmId() == null || apiclass.getmId() < 0) { - return AjaxResult.error("模块id不能为空!"); - } - if (apiclass.getcName() == null || apiclass.getcName().equals("")) { - return AjaxResult.error("类名不能为空!"); - } - if (apiclass.getcDescribe() == null || apiclass.getcDescribe().equals("")) { - return AjaxResult.error("类描述不能为空!"); - } - GenServerResult genServerResult = apiClassService.updateApiclass(apiclass); - if (genServerResult.isStart()) { - return AjaxResult.success(); - } else { - return AjaxResult.error(genServerResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(GenReturnConstants.SYS_ERROR); + if (apiclass.getmId() == null || apiclass.getmId() < 0) { + return AjaxResult.error("模块id不能为空!"); + } + if (apiclass.getcName() == null || apiclass.getcName().equals("")) { + return AjaxResult.error("类名不能为空!"); + } + if (apiclass.getcDescribe() == null || apiclass.getcDescribe().equals("")) { + return AjaxResult.error("类描述不能为空!"); + } + GenServerResult genServerResult = apiClassService.updateApiclass(apiclass); + if (genServerResult.isStart()) { + return AjaxResult.success(); + } else { + return AjaxResult.error(genServerResult.getMsg()); } } @@ -186,19 +155,14 @@ public class ApiClassController extends GenBaseController { @Log(title = "接口类名", businessType = GenBusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { - try { - if (ids.length < 0) { - return AjaxResult.error("id不能为空!"); - } - GenServerResult genServerResult = apiClassService.deleteApiclassByIds(ids); - if (genServerResult.isStart()) { - return AjaxResult.success(); - } else { - return AjaxResult.error(genServerResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(GenReturnConstants.SYS_ERROR); + if (ids.length < 0) { + return AjaxResult.error("id不能为空!"); + } + GenServerResult genServerResult = apiClassService.deleteApiclassByIds(ids); + if (genServerResult.isStart()) { + return AjaxResult.success(); + } else { + return AjaxResult.error(genServerResult.getMsg()); } } } diff --git a/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/InterTableController.java b/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/InterTableController.java index 2473d5e..cf44ed9 100644 --- a/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/InterTableController.java +++ b/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/InterTableController.java @@ -49,16 +49,11 @@ public class InterTableController extends GenBaseController { @PreAuthorize("@ebts.hasPermi('generator:intertable:list')") @GetMapping("/list") public Serializable list(InterTable interTable) { - try { - GenServerResult> genServerResult = interTableService.selectInterTableList(interTable); - if (genServerResult.isStart()) { - return AjaxResult.success(genServerResult.getData()); - } else { - return AjaxResult.info(genServerResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(GenReturnConstants.SYS_ERROR); + GenServerResult> genServerResult = interTableService.selectInterTableList(interTable); + if (genServerResult.isStart()) { + return AjaxResult.success(genServerResult.getData()); + } else { + return AjaxResult.info(genServerResult.getMsg()); } } @@ -70,16 +65,11 @@ public class InterTableController extends GenBaseController { @Log(title = "预览代码(工作流)", businessType = GenBusinessType.GENCODE) @GetMapping("/classpreview/{id}") public AjaxResult classPreview(@PathVariable("id") Long id) { - try { - GenServerResult> genServerResult = interTableService.previewCodeCalss(id); - if (genServerResult.isStart()) { - return AjaxResult.success(genServerResult.getData()); - } else { - return AjaxResult.error(genServerResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(GenReturnConstants.SYS_ERROR); + GenServerResult> genServerResult = interTableService.previewCodeCalss(id); + if (genServerResult.isStart()) { + return AjaxResult.success(genServerResult.getData()); + } else { + return AjaxResult.error(genServerResult.getMsg()); } } @@ -90,16 +80,11 @@ public class InterTableController extends GenBaseController { @Log(title = "预览代码(工作台)", businessType = GenBusinessType.GENCODE) @GetMapping("/modulepreview/{id}") public AjaxResult modulePreview(@PathVariable("id") Long id) { - try { - GenServerResult> genServerResult = interTableService.previewCodeMoudle(id); - if (genServerResult.isStart()) { - return AjaxResult.success(genServerResult.getData()); - } else { - return AjaxResult.error(genServerResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(GenReturnConstants.SYS_ERROR); + GenServerResult> genServerResult = interTableService.previewCodeMoudle(id); + if (genServerResult.isStart()) { + return AjaxResult.success(genServerResult.getData()); + } else { + return AjaxResult.error(genServerResult.getMsg()); } } @@ -122,9 +107,9 @@ public class InterTableController extends GenBaseController { } else { return AjaxResult.error(genServerResult.getMsg()); } - } catch (RuntimeException | IOException e) { - logger.error(e.getMessage()); - return AjaxResult.error(GenReturnConstants.SYS_ERROR); + } catch (IOException e) { + e.printStackTrace(); + return AjaxResult.error(); } } @@ -161,16 +146,11 @@ public class InterTableController extends GenBaseController { @Log(title = "接口信息", businessType = GenBusinessType.UPDATE) @PutMapping public AjaxResult edit(@Validated @RequestBody InterTableDto interTableDto) { - try { - GenServerResult genServerResult = interTableService.updateInterTable(interTableDto); - if (genServerResult.isStart()) { - return AjaxResult.success(); - } else { - return AjaxResult.error(genServerResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(GenReturnConstants.SYS_ERROR); + GenServerResult genServerResult = interTableService.updateInterTable(interTableDto); + if (genServerResult.isStart()) { + return AjaxResult.success(); + } else { + return AjaxResult.error(genServerResult.getMsg()); } } diff --git a/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/ModuleController.java b/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/ModuleController.java index 97eea03..3becad4 100644 --- a/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/ModuleController.java +++ b/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/ModuleController.java @@ -48,16 +48,11 @@ public class ModuleController extends GenBaseController { @PreAuthorize("@ebts.hasAnyPermi('tool:module:querylist')") @GetMapping("querylist") public AjaxResult queryList() { - try { - GenServerResult> genServerResult = moduleService.selectModuleList(new Module()); - if (genServerResult.isStart()) { - return AjaxResult.success(genServerResult.getData()); - } else { - return AjaxResult.error(genServerResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(GenReturnConstants.SYS_ERROR); + GenServerResult> genServerResult = moduleService.selectModuleList(new Module()); + if (genServerResult.isStart()) { + return AjaxResult.success(genServerResult.getData()); + } else { + return AjaxResult.error(genServerResult.getMsg()); } } @@ -68,17 +63,12 @@ public class ModuleController extends GenBaseController { @PreAuthorize("@ebts.hasPermi('tool:module:list')") @GetMapping("/list") public Serializable list(Module module) { - try { - startPage(); - GenServerResult> genServerResult = moduleService.selectModuleList(module); - if (genServerResult.isStart()) { - return getDataTable(genServerResult.getData()); - } else { - return AjaxResult.info(genServerResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(GenReturnConstants.SYS_ERROR); + startPage(); + GenServerResult> genServerResult = moduleService.selectModuleList(module); + if (genServerResult.isStart()) { + return getDataTable(genServerResult.getData()); + } else { + return AjaxResult.info(genServerResult.getMsg()); } } @@ -89,17 +79,12 @@ public class ModuleController extends GenBaseController { @Log(title = "模块管理", businessType = GenBusinessType.EXPORT) @GetMapping("/export") public AjaxResult export(Module module) { - try { - GenServerResult> genServerResult = moduleService.selectModuleList(module); - GenExcelUtil util = new GenExcelUtil(Module.class); - if (genServerResult.isStart()) { - return util.exportExcel(genServerResult.getData(), "module"); - } else { - return AjaxResult.error(genServerResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(GenReturnConstants.SYS_ERROR); + GenServerResult> genServerResult = moduleService.selectModuleList(module); + GenExcelUtil util = new GenExcelUtil(Module.class); + if (genServerResult.isStart()) { + return util.exportExcel(genServerResult.getData(), "module"); + } else { + return AjaxResult.error(genServerResult.getMsg()); } } @@ -109,16 +94,11 @@ public class ModuleController extends GenBaseController { @PreAuthorize("@ebts.hasPermi('tool:module:query')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { - try { - GenServerResult genServerResult = moduleService.selectModuleById(id); - if (genServerResult.isStart()) { - return AjaxResult.success(genServerResult.getData()); - } else { - return AjaxResult.info(genServerResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(GenReturnConstants.SYS_ERROR); + GenServerResult genServerResult = moduleService.selectModuleById(id); + if (genServerResult.isStart()) { + return AjaxResult.success(genServerResult.getData()); + } else { + return AjaxResult.info(genServerResult.getMsg()); } } @@ -155,23 +135,17 @@ public class ModuleController extends GenBaseController { @Log(title = "模块管理", businessType = GenBusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody Module module) { - try { - - if (module.getmName() == null || module.getmName().equals("")) { - return AjaxResult.error("模块名称不能为空!"); - } - if (module.getmDescribe() == null || module.getmDescribe().equals("")) { - return AjaxResult.error("模块描述不能为空!"); - } - GenServerResult genServerResult = moduleService.updateModule(module); - if (genServerResult.isStart()) { - return AjaxResult.success(); - } else { - return AjaxResult.error(genServerResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(GenReturnConstants.SYS_ERROR); + if (module.getmName() == null || module.getmName().equals("")) { + return AjaxResult.error("模块名称不能为空!"); + } + if (module.getmDescribe() == null || module.getmDescribe().equals("")) { + return AjaxResult.error("模块描述不能为空!"); + } + GenServerResult genServerResult = moduleService.updateModule(module); + if (genServerResult.isStart()) { + return AjaxResult.success(); + } else { + return AjaxResult.error(genServerResult.getMsg()); } } @@ -182,19 +156,14 @@ public class ModuleController extends GenBaseController { @Log(title = "模块管理", businessType = GenBusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { - try { - if (ids.length < 0) { - return AjaxResult.error("id不能为空!"); - } - GenServerResult genServerResult = moduleService.deleteModuleByIds(ids); - if (genServerResult.isStart()) { - return AjaxResult.success(); - } else { - return AjaxResult.error(genServerResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(GenReturnConstants.SYS_ERROR); + if (ids.length < 0) { + return AjaxResult.error("id不能为空!"); + } + GenServerResult genServerResult = moduleService.deleteModuleByIds(ids); + if (genServerResult.isStart()) { + return AjaxResult.success(); + } else { + return AjaxResult.error(genServerResult.getMsg()); } } } diff --git a/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/QueryController.java b/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/QueryController.java index 96eec10..3f992ad 100644 --- a/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/QueryController.java +++ b/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/QueryController.java @@ -35,121 +35,101 @@ public class QueryController extends GenBaseController { /** * 获取编辑sql的基本信息 + * * @param id * @return */ @PreAuthorize("@ebts.hasPermi('query:list')") @GetMapping("/{id}") public AjaxResult Info(@PathVariable("id") Long id) { - try { - GenServerResult genServerResult = queryService.selectQueryById(id); - if (genServerResult.isStart()) { - UniQuery uniQuery = genServerResult.getData(); - Map modeMap = new HashMap<>(); - List uniCons = uniQuery.getUniCons(); - uniQuery.setUniCons(null); - modeMap.put("info", uniQuery); - modeMap.put("list", uniCons); - return AjaxResult.success(modeMap); - } else { - return AjaxResult.error(genServerResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(GenReturnConstants.SYS_ERROR); + GenServerResult genServerResult = queryService.selectQueryById(id); + if (genServerResult.isStart()) { + UniQuery uniQuery = genServerResult.getData(); + Map modeMap = new HashMap<>(); + List uniCons = uniQuery.getUniCons(); + uniQuery.setUniCons(null); + modeMap.put("info", uniQuery); + modeMap.put("list", uniCons); + return AjaxResult.success(modeMap); + } else { + return AjaxResult.error(genServerResult.getMsg()); } } /** * 更新万能查询编辑信息 info 和查询信息 + * * @param uniQuery * @return */ @PreAuthorize("@ebts.hasPermi('query:edit')") @PutMapping public AjaxResult edit(@Validated @RequestBody UniQuery uniQuery) { - try { - GenServerResult genServerResult = queryService.updateQueryInfo(uniQuery); - if (genServerResult.isStart()) { - return AjaxResult.success(); - } else { - return AjaxResult.error(genServerResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(GenReturnConstants.SYS_ERROR); + GenServerResult genServerResult = queryService.updateQueryInfo(uniQuery); + if (genServerResult.isStart()) { + return AjaxResult.success(); + } else { + return AjaxResult.error(genServerResult.getMsg()); } } /** * 导出预览数据 + * * @param uniQuery * @return */ @PreAuthorize("@ebts.hasAnyPermi('query:export')") @PutMapping("export") public AjaxResult export(@Validated @RequestBody UniQuery uniQuery) { - try { - GenServerResult>> genServerResult = queryService.previewQuery(uniQuery); - if (genServerResult.isStart()) { - return new GenMapExcelUtil().exportExcel(genServerResult.getData(), uniQuery.getUqName()); - } else { - return AjaxResult.error(genServerResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(GenReturnConstants.SYS_ERROR); + GenServerResult>> genServerResult = queryService.previewQuery(uniQuery); + if (genServerResult.isStart()) { + return new GenMapExcelUtil().exportExcel(genServerResult.getData(), uniQuery.getUqName()); + } else { + return AjaxResult.error(genServerResult.getMsg()); } } /** * 返回预览信息 + * * @param uniQuery * @return */ @PreAuthorize("@ebts.hasPermi('query:preview')") @PutMapping("preview") public Serializable Preview(@Validated @RequestBody UniQuery uniQuery) { - try { - startPage(uniQuery); - GenServerResult>> genServerResult = queryService.previewQuery(uniQuery); - if (genServerResult.isStart()) { - return getDataTable(genServerResult.getData()); - } else { - return AjaxResult.error(genServerResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(GenReturnConstants.SYS_ERROR); + startPage(uniQuery); + GenServerResult>> genServerResult = queryService.previewQuery(uniQuery); + if (genServerResult.isStart()) { + return getDataTable(genServerResult.getData()); + } else { + return AjaxResult.error(genServerResult.getMsg()); } } /** * 发布上线 + * * @param uniQuery * @return */ @PreAuthorize("@ebts.hasPermi('query:release')") @PutMapping("/release") public AjaxResult Release(@RequestBody UniQuery uniQuery) { - try { - if (uniQuery.getId() == null) { - return AjaxResult.error("id不能为空!"); - } else { - if (uniQuery.getIsRelease() == 1 || uniQuery.getIsRelease() == 2) { - GenServerResult genServerResult = queryService.Release(uniQuery); - if (genServerResult.isStart()) { - return AjaxResult.success(); - } else { - return AjaxResult.error(genServerResult.getMsg()); - } + if (uniQuery.getId() == null) { + return AjaxResult.error("id不能为空!"); + } else { + if (uniQuery.getIsRelease() == 1 || uniQuery.getIsRelease() == 2) { + GenServerResult genServerResult = queryService.Release(uniQuery); + if (genServerResult.isStart()) { + return AjaxResult.success(); } else { - return AjaxResult.error("状态输入错误!"); + return AjaxResult.error(genServerResult.getMsg()); } + } else { + return AjaxResult.error("状态输入错误!"); } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(GenReturnConstants.SYS_ERROR); } } diff --git a/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/RegularController.java b/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/RegularController.java index 11dad70..7a2793c 100644 --- a/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/RegularController.java +++ b/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/RegularController.java @@ -48,19 +48,15 @@ public class RegularController extends GenBaseController { @PreAuthorize("@ebts.hasPermi('tool:regular:list')") @GetMapping("/list") public Serializable list(Regular regular) { - try { - startPage(); - GenServerResult> genServerResult = regularService.selectRegularList(regular); - if (genServerResult.isStart()) { - return getDataTable(genServerResult.getData()); - } else { - return AjaxResult.info(genServerResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(GenReturnConstants.SYS_ERROR); + startPage(); + GenServerResult> genServerResult = regularService.selectRegularList(regular); + if (genServerResult.isStart()) { + return getDataTable(genServerResult.getData()); + } else { + return AjaxResult.info(genServerResult.getMsg()); } } + /** * 查询校验规则列表 * @@ -69,17 +65,12 @@ public class RegularController extends GenBaseController { @PreAuthorize("@ebts.hasPermi('tool:regular:option')") @GetMapping("/option") public Serializable option() { - try { - startPage(); - GenServerResult> genServerResult = regularService.selectRegularOption(); - if (genServerResult.isStart()) { - return getDataTable(genServerResult.getData()); - } else { - return AjaxResult.info(genServerResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(GenReturnConstants.SYS_ERROR); + startPage(); + GenServerResult> genServerResult = regularService.selectRegularOption(); + if (genServerResult.isStart()) { + return getDataTable(genServerResult.getData()); + } else { + return AjaxResult.info(genServerResult.getMsg()); } } @@ -93,17 +84,12 @@ public class RegularController extends GenBaseController { @Log(title = "校验规则", businessType = GenBusinessType.EXPORT) @GetMapping("/export") public AjaxResult export(Regular regular) { - try { - GenServerResult> genServerResult = regularService.selectRegularList(regular); - GenExcelUtil util = new GenExcelUtil(Regular.class); - if (genServerResult.isStart()) { - return util.exportExcel(genServerResult.getData(), "regular"); - } else { - return AjaxResult.error(genServerResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(GenReturnConstants.SYS_ERROR); + GenServerResult> genServerResult = regularService.selectRegularList(regular); + GenExcelUtil util = new GenExcelUtil(Regular.class); + if (genServerResult.isStart()) { + return util.exportExcel(genServerResult.getData(), "regular"); + } else { + return AjaxResult.error(genServerResult.getMsg()); } } @@ -116,16 +102,11 @@ public class RegularController extends GenBaseController { @PreAuthorize("@ebts.hasPermi('tool:regular:query')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { - try { - GenServerResult genServerResult = regularService.selectRegularById(id); - if (genServerResult.isStart()) { - return AjaxResult.success(genServerResult.getData()); - } else { - return AjaxResult.info(genServerResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(GenReturnConstants.SYS_ERROR); + GenServerResult genServerResult = regularService.selectRegularById(id); + if (genServerResult.isStart()) { + return AjaxResult.success(genServerResult.getData()); + } else { + return AjaxResult.info(genServerResult.getMsg()); } } @@ -139,28 +120,23 @@ public class RegularController extends GenBaseController { @Log(title = "校验规则", businessType = GenBusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody Regular regular) { - try { - if (regular.getName() == null || regular.getName().equals("")) { - return AjaxResult.error("正则名称不能为空!"); - } - if (regular.getRegular() == null || regular.getRegular().equals("")) { - return AjaxResult.error("正则内容不能为空!"); - } - if (regular.getEnable() == null || regular.getEnable() < 0) { - return AjaxResult.error("是否启用不能为空!"); - } - if (!verifyRegular(regular)) { - return AjaxResult.error("正则表达式校验不通过!"); - } - GenServerResult genServerResult = regularService.insertRegular(regular); - if (genServerResult.isStart()) { - return AjaxResult.success(); - } else { - return AjaxResult.error(genServerResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(GenReturnConstants.SYS_ERROR); + if (regular.getName() == null || regular.getName().equals("")) { + return AjaxResult.error("正则名称不能为空!"); + } + if (regular.getRegular() == null || regular.getRegular().equals("")) { + return AjaxResult.error("正则内容不能为空!"); + } + if (regular.getEnable() == null || regular.getEnable() < 0) { + return AjaxResult.error("是否启用不能为空!"); + } + if (!verifyRegular(regular)) { + return AjaxResult.error("正则表达式校验不通过!"); + } + GenServerResult genServerResult = regularService.insertRegular(regular); + if (genServerResult.isStart()) { + return AjaxResult.success(); + } else { + return AjaxResult.error(genServerResult.getMsg()); } } @@ -174,28 +150,23 @@ public class RegularController extends GenBaseController { @Log(title = "校验规则", businessType = GenBusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody Regular regular) { - try { - if (regular.getName() == null || regular.getName().equals("")) { - return AjaxResult.error("正则名称不能为空!"); - } - if (regular.getRegular() == null || regular.getRegular().equals("")) { - return AjaxResult.error("正则内容不能为空!"); - } - if (regular.getEnable() == null || regular.getEnable() < 0) { - return AjaxResult.error("是否启用不能为空!"); - } - if (!verifyRegular(regular)) { - return AjaxResult.error("正则表达式校验不通过!"); - } - GenServerResult genServerResult = regularService.updateRegular(regular); - if (genServerResult.isStart()) { - return AjaxResult.success(); - } else { - return AjaxResult.error(genServerResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(GenReturnConstants.SYS_ERROR); + if (regular.getName() == null || regular.getName().equals("")) { + return AjaxResult.error("正则名称不能为空!"); + } + if (regular.getRegular() == null || regular.getRegular().equals("")) { + return AjaxResult.error("正则内容不能为空!"); + } + if (regular.getEnable() == null || regular.getEnable() < 0) { + return AjaxResult.error("是否启用不能为空!"); + } + if (!verifyRegular(regular)) { + return AjaxResult.error("正则表达式校验不通过!"); + } + GenServerResult genServerResult = regularService.updateRegular(regular); + if (genServerResult.isStart()) { + return AjaxResult.success(); + } else { + return AjaxResult.error(genServerResult.getMsg()); } } @@ -209,19 +180,14 @@ public class RegularController extends GenBaseController { @Log(title = "校验规则", businessType = GenBusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { - try { - if (ids.length == 0) { - return AjaxResult.error("需要删除id数不能为空!"); - } - GenServerResult genServerResult = regularService.deleteRegularByIds(ids); - if (genServerResult.isStart()) { - return AjaxResult.success(); - } else { - return AjaxResult.error(genServerResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(GenReturnConstants.SYS_ERROR); + if (ids.length == 0) { + return AjaxResult.error("需要删除id数不能为空!"); + } + GenServerResult genServerResult = regularService.deleteRegularByIds(ids); + if (genServerResult.isStart()) { + return AjaxResult.success(); + } else { + return AjaxResult.error(genServerResult.getMsg()); } } diff --git a/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/RelController.java b/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/RelController.java index 35e0af2..2a63029 100644 --- a/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/RelController.java +++ b/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/RelController.java @@ -30,75 +30,57 @@ public class RelController { /** * 获取表的基础信息 + * * @return */ @PreAuthorize("@ebts.hasAnyPermi('rel:tableinfo')") @GetMapping("/tableinfo") - public AjaxResult tableinfos(){ - try { - GenServerResult>> genServerResult = relService.tableInfos(); - if (genServerResult.isStart()){ - return AjaxResult.success(genServerResult.getData()); - }else { - return AjaxResult.error(genServerResult.getMsg()); - } - }catch (RuntimeException e){ - logger.error(e.getMessage()); - return AjaxResult.error(); + public AjaxResult tableinfos() { + GenServerResult>> genServerResult = relService.tableInfos(); + if (genServerResult.isStart()) { + return AjaxResult.success(genServerResult.getData()); + } else { + return AjaxResult.error(genServerResult.getMsg()); } } /** * 获取表的字段信息 + * * @param tableName * @param relId * @return */ @PreAuthorize("@ebts.hasAnyPermi('rel:tableinfo')") @GetMapping("/{tableName}/{relId}") - public AjaxResult relColumns(@PathVariable("tableName") String tableName, @PathVariable("relId") Long relId){ - try { - GenServerResult> genServerResult = relService.relColumns(tableName,relId); - if (genServerResult.isStart()){ - return AjaxResult.success(genServerResult.getData()); - }else { - return AjaxResult.error(genServerResult.getMsg()); - } - }catch (RuntimeException e){ - logger.error(e.getMessage()); - return AjaxResult.error(); + public AjaxResult relColumns(@PathVariable("tableName") String tableName, @PathVariable("relId") Long relId) { + GenServerResult> genServerResult = relService.relColumns(tableName, relId); + if (genServerResult.isStart()) { + return AjaxResult.success(genServerResult.getData()); + } else { + return AjaxResult.error(genServerResult.getMsg()); } } @PreAuthorize("@ebts.hasAnyPermi('rel:colums')") @GetMapping("/{tableName}") - public AjaxResult tableColumns(@PathVariable("tableName")String tableName){ - try { - GenServerResult>> genServerResult = relService.tableColumns(tableName); - if (genServerResult.isStart()){ - return AjaxResult.success(genServerResult.getData()); - }else { - return AjaxResult.error(genServerResult.getMsg()); - } - }catch (RuntimeException e){ - logger.error(e.getMessage()); - return AjaxResult.error(); + public AjaxResult tableColumns(@PathVariable("tableName") String tableName) { + GenServerResult>> genServerResult = relService.tableColumns(tableName); + if (genServerResult.isStart()) { + return AjaxResult.success(genServerResult.getData()); + } else { + return AjaxResult.error(genServerResult.getMsg()); } } @PreAuthorize("@ebts.hasAnyPermi('rel:colums')") @GetMapping("/colums/{tableId}") - public AjaxResult relTableByTableId(@PathVariable("tableId")Long tableId){ - try { - GenServerResult> genServerResult = relService.relTableByTableId(tableId); - if (genServerResult.isStart()){ - return AjaxResult.success(genServerResult.getData()); - }else { - return AjaxResult.error(genServerResult.getMsg()); - } - }catch (RuntimeException e){ - logger.error(e.getMessage()); - return AjaxResult.error(); + public AjaxResult relTableByTableId(@PathVariable("tableId") Long tableId) { + GenServerResult> genServerResult = relService.relTableByTableId(tableId); + if (genServerResult.isStart()) { + return AjaxResult.success(genServerResult.getData()); + } else { + return AjaxResult.error(genServerResult.getMsg()); } } diff --git a/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/UniQueryController.java b/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/UniQueryController.java index eef6f50..a54728e 100644 --- a/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/UniQueryController.java +++ b/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/UniQueryController.java @@ -45,17 +45,12 @@ public class UniQueryController extends GenBaseController { @PreAuthorize("@ebts.hasPermi('tool:query:list')") @GetMapping("/list") public Serializable list(UniQuery uniQuery) { - try { - startPage(); - GenServerResult> genServerResult = uniQueryService.selectUniQueryList(uniQuery); - if (genServerResult.isStart()) { - return getDataTable(genServerResult.getData()); - } else { - return AjaxResult.info(genServerResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(GenReturnConstants.SYS_ERROR); + startPage(); + GenServerResult> genServerResult = uniQueryService.selectUniQueryList(uniQuery); + if (genServerResult.isStart()) { + return getDataTable(genServerResult.getData()); + } else { + return AjaxResult.info(genServerResult.getMsg()); } } @@ -66,17 +61,12 @@ public class UniQueryController extends GenBaseController { @Log(title = "万能查询", businessType = GenBusinessType.EXPORT) @GetMapping("/export") public AjaxResult export(UniQuery uniQuery) { - try { - GenServerResult> genServerResult = uniQueryService.selectUniQueryList(uniQuery); - GenExcelUtil util = new GenExcelUtil(UniQuery.class); - if (genServerResult.isStart()) { - return util.exportExcel(genServerResult.getData(), "query"); - } else { - return AjaxResult.error(genServerResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(GenReturnConstants.SYS_ERROR); + GenServerResult> genServerResult = uniQueryService.selectUniQueryList(uniQuery); + GenExcelUtil util = new GenExcelUtil(UniQuery.class); + if (genServerResult.isStart()) { + return util.exportExcel(genServerResult.getData(), "query"); + } else { + return AjaxResult.error(genServerResult.getMsg()); } } @@ -86,16 +76,11 @@ public class UniQueryController extends GenBaseController { @PreAuthorize("@ebts.hasPermi('tool:query:query')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { - try { - GenServerResult genServerResult = uniQueryService.selectUniQueryById(id); - if (genServerResult.isStart()) { - return AjaxResult.success(genServerResult.getData()); - } else { - return AjaxResult.info(genServerResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(GenReturnConstants.SYS_ERROR); + GenServerResult genServerResult = uniQueryService.selectUniQueryById(id); + if (genServerResult.isStart()) { + return AjaxResult.success(genServerResult.getData()); + } else { + return AjaxResult.info(genServerResult.getMsg()); } } @@ -112,16 +97,11 @@ public class UniQueryController extends GenBaseController { if (uniQuery.getUqDescribe() == null || uniQuery.getUqDescribe().equals("")) { return AjaxResult.error("描述不能为空!"); } - try { - GenServerResult genServerResult = uniQueryService.insertUniQuery(uniQuery); - if (genServerResult.isStart()) { - return AjaxResult.success(); - } else { - return AjaxResult.error(genServerResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(GenReturnConstants.SYS_ERROR); + GenServerResult genServerResult = uniQueryService.insertUniQuery(uniQuery); + if (genServerResult.isStart()) { + return AjaxResult.success(); + } else { + return AjaxResult.error(genServerResult.getMsg()); } } @@ -132,23 +112,17 @@ public class UniQueryController extends GenBaseController { @Log(title = "万能查询", businessType = GenBusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody UniQuery uniQuery) { - try { - - if (uniQuery.getUqName() == null || uniQuery.getUqName().equals("")) { - return AjaxResult.error("名称不能为空!"); - } - if (uniQuery.getUqDescribe() == null || uniQuery.getUqDescribe().equals("")) { - return AjaxResult.error("描述不能为空!"); - } - GenServerResult genServerResult = uniQueryService.updateUniQuery(uniQuery); - if (genServerResult.isStart()) { - return AjaxResult.success(); - } else { - return AjaxResult.error(genServerResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(GenReturnConstants.SYS_ERROR); + if (uniQuery.getUqName() == null || uniQuery.getUqName().equals("")) { + return AjaxResult.error("名称不能为空!"); + } + if (uniQuery.getUqDescribe() == null || uniQuery.getUqDescribe().equals("")) { + return AjaxResult.error("描述不能为空!"); + } + GenServerResult genServerResult = uniQueryService.updateUniQuery(uniQuery); + if (genServerResult.isStart()) { + return AjaxResult.success(); + } else { + return AjaxResult.error(genServerResult.getMsg()); } } @@ -159,19 +133,14 @@ public class UniQueryController extends GenBaseController { @Log(title = "万能查询", businessType = GenBusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { - try { - if (ids.length < 0) { - return AjaxResult.error("id不能为空!"); - } - GenServerResult genServerResult = uniQueryService.deleteUniQueryByIds(ids); - if (genServerResult.isStart()) { - return AjaxResult.success(); - } else { - return AjaxResult.error(genServerResult.getMsg()); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - return AjaxResult.error(GenReturnConstants.SYS_ERROR); + if (ids.length < 0) { + return AjaxResult.error("id不能为空!"); + } + GenServerResult genServerResult = uniQueryService.deleteUniQueryByIds(ids); + if (genServerResult.isStart()) { + return AjaxResult.success(); + } else { + return AjaxResult.error(genServerResult.getMsg()); } } } \ No newline at end of file