清除controller层的try cath

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<Logininfor> list = logininforService.selectLogininforList(logininfor);
         return getDataTable(list);
-        }catch (RuntimeException e){
-            logger.error(e.getMessage());
-            return AjaxResult.error(ReturnConstants.SYS_ERROR);
-        }
     }
 
     @Log(title = "登录日志", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ebts.hasPermi('monitor:logininfor:export')")
     @GetMapping("/export")
     public AjaxResult export(Logininfor logininfor) {
-        try {
         List<Logininfor> list = logininforService.selectLogininforList(logininfor);
         ExcelUtil<Logininfor> util = new ExcelUtil<Logininfor>(Logininfor.class);
         return util.exportExcel(list, "登录日志");
-        }catch (RuntimeException e){
-            logger.error(e.getMessage());
-            return AjaxResult.error(ReturnConstants.SYS_ERROR);
-        }
     }
 
     @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);
-        }
     }
 
     @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);
-        }
     }
 }

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<OperLog> list = operLogService.selectOperLogList(operLog);
         return getDataTable(list);
-        }catch (RuntimeException e){
-            logger.error(e.getMessage());
-            return AjaxResult.error(ReturnConstants.SYS_ERROR);
-        }
     }
 
     @Log(title = "操作日志", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ebts.hasPermi('monitor:operlog:export')")
     @GetMapping("/export")
     public AjaxResult export(OperLog operLog) {
-        try {
         List<OperLog> list = operLogService.selectOperLogList(operLog);
         ExcelUtil<OperLog> util = new ExcelUtil<OperLog>(OperLog.class);
         return util.exportExcel(list, "操作日志");
-        }catch (RuntimeException e){
-            logger.error(e.getMessage());
-            return AjaxResult.error(ReturnConstants.SYS_ERROR);
-        }
     }
 
     @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);
-        }
     }
 
     @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);
-        }
     }
 }

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);
-        }
     }
 }

ebts/ebts-admin/src/main/java/com/ebts/web/controller/monitor/UserOnlineController.java

@@ -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);
-        }
     }
 }

ebts/ebts-admin/src/main/java/com/ebts/web/controller/system/FileController.java

@@ -61,7 +61,6 @@ 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<List<SysFile>> serverResult = fileService.selectFileList(sysFile);
         if (serverResult.isStart()) {
@@ -69,25 +68,16 @@ public class FileController extends EBTSController {
         } else {
             return AjaxResult.info(serverResult.getMsg());
         }
-        } catch (RuntimeException e) {
-            logger.error(e.getMessage());
-            return AjaxResult.error(ReturnConstants.SYS_ERROR);
-        }
     }
 
     @GetMapping("/folder")
     public AjaxResult getFolder() {
-        try {
         ServerResult<List<SysFile>> 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);
-        }
     }
 
     /**
@@ -97,7 +87,6 @@ public class FileController extends EBTSController {
     @Log(title = "文件信息", businessType = BusinessType.EXPORT)
     @PutMapping("/export")
     public AjaxResult export(@Validated @RequestBody SysFile sysFile) {
-        try {
         ServerResult<List<SysFile>> serverResult = fileService.selectFileList(sysFile);
         ExcelUtil<SysFile> util = new ExcelUtil<SysFile>(SysFile.class);
         if (serverResult.isStart()) {
@@ -105,10 +94,6 @@ public class FileController extends EBTSController {
         } else {
             return AjaxResult.error(serverResult.getMsg());
         }
-        } catch (RuntimeException e) {
-            logger.error(e.getMessage());
-            return AjaxResult.error(ReturnConstants.SYS_ERROR);
-        }
     }
 
     /**
@@ -117,17 +102,12 @@ public class FileController extends EBTSController {
     @PreAuthorize("@ebts.hasPermi('system:file:query')")
     @GetMapping(value = "/{fileId}")
     public AjaxResult getInfo(@PathVariable("fileId") Long fileId) {
-        try {
         ServerResult<SysFile> 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);
-        }
     }
 
     /**
@@ -137,7 +117,6 @@ 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("上传文件不能为空!");
         }
@@ -158,10 +137,6 @@ public class FileController extends EBTSController {
         } else {
             return AjaxResult.error("isPublic为空或者状态有误!");
         }
-        } catch (RuntimeException e) {
-            logger.error(e.getMessage());
-            return AjaxResult.error(ReturnConstants.SYS_ERROR);
-        }
     }
 
     /**
@@ -171,18 +146,12 @@ public class FileController extends EBTSController {
     @Log(title = "文件信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody SysFile sysFile) {
-        try {
-
         ServerResult<Integer> 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);
-        }
     }
 
     /**
@@ -192,7 +161,6 @@ 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不能为空!");
         }
@@ -202,15 +170,10 @@ public class FileController extends EBTSController {
         } else {
             return AjaxResult.error(serverResult.getMsg());
         }
-        } catch (RuntimeException e) {
-            logger.error(e.getMessage());
-            return AjaxResult.error(ReturnConstants.SYS_ERROR);
-        }
     }
 
     @GetMapping("/download/{fileId}")
     public AjaxResult download(@PathVariable Long fileId, HttpServletRequest request, HttpServletResponse response) {
-        try {
         LoginUser user = tokenService.getFileUser(request);
         ServerResult<SysFile> serverResult = fileService.downloadFile(fileId, user);
         if (serverResult.isStart()) {
@@ -218,14 +181,5 @@ public class FileController extends EBTSController {
         } else {
             return AjaxResult.error(serverResult.getMsg());
         }
-        } catch (RuntimeException e) {
-            logger.error(e.getMessage());
-            return AjaxResult.error(ReturnConstants.SYS_ERROR);
-        }
-    }
-
-    @GetMapping("/download/api")
-    public AjaxResult api() {
-        return AjaxResult.success("8085");
     }
 }

ebts/ebts-admin/src/main/java/com/ebts/web/controller/system/RealQueryController.java

@@ -26,41 +26,36 @@ 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<List<Map<String, Object>>> 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);
-        }
     }
 
     /**
      * 获取查询基本信息
+     *
      * @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不能为空!");
         }
@@ -70,31 +65,23 @@ public class RealQueryController extends BaseController {
         } else {
             return AjaxResult.error(serverResult.getMsg());
         }
-        } catch (RuntimeException e) {
-            logger.error(e.getMessage());
-            return AjaxResult.error(ReturnConstants.SYS_ERROR);
-        }
     }
 
 
     /**
      * 获取查询数据
+     *
      * @param realUniQuery
      * @return
      */
     @PreAuthorize("@ebts.hasAnyPermi('data:real:list')")
     @PutMapping("/real")
     public Serializable RealData(@Validated @RequestBody RealUniQuery realUniQuery) {
-        try {
         ServerResult<List<Map<String, Object>>> 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);
-        }
     }
 }

ebts/ebts-generator/src/main/java/com/ebts/generator/controller/ApiClassController.java

@@ -47,17 +47,12 @@ public class ApiClassController extends GenBaseController {
     @PreAuthorize("@ebts.hasAnyPermi('tool:apiclass:querylist')")
     @GetMapping("querylist")
     public AjaxResult queryList() {
-        try {
         GenServerResult<List<ApiClass>> 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);
-        }
     }
 
     /**
@@ -66,7 +61,6 @@ public class ApiClassController extends GenBaseController {
     @PreAuthorize("@ebts.hasPermi('tool:apiclass:list')")
     @GetMapping("/list")
     public Serializable list(ApiClass apiclass) {
-        try {
         startPage();
         GenServerResult<List<ApiClass>> genServerResult = apiClassService.selectApiclassList(apiclass);
         if (genServerResult.isStart()) {
@@ -74,10 +68,6 @@ public class ApiClassController extends GenBaseController {
         } else {
             return AjaxResult.info(genServerResult.getMsg());
         }
-        } catch (RuntimeException e) {
-            logger.error(e.getMessage());
-            return AjaxResult.error(GenReturnConstants.SYS_ERROR);
-        }
     }
 
     /**
@@ -87,7 +77,6 @@ public class ApiClassController extends GenBaseController {
     @Log(title = "接口类名", businessType = GenBusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(ApiClass apiclass) {
-        try {
         GenServerResult<List<ApiClass>> genServerResult = apiClassService.selectApiclassList(apiclass);
         GenExcelUtil<ApiClass> util = new GenExcelUtil<ApiClass>(ApiClass.class);
         if (genServerResult.isStart()) {
@@ -95,10 +84,6 @@ public class ApiClassController extends GenBaseController {
         } else {
             return AjaxResult.error(genServerResult.getMsg());
         }
-        } catch (RuntimeException e) {
-            logger.error(e.getMessage());
-            return AjaxResult.error(GenReturnConstants.SYS_ERROR);
-        }
     }
 
     /**
@@ -107,17 +92,12 @@ public class ApiClassController extends GenBaseController {
     @PreAuthorize("@ebts.hasPermi('tool:apiclass:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        try {
         GenServerResult<ApiClass> 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);
-        }
     }
 
     /**
@@ -136,17 +116,12 @@ public class ApiClassController extends GenBaseController {
         if (apiclass.getcDescribe() == null || apiclass.getcDescribe().equals("")) {
             return AjaxResult.error("类描述不能为空!");
         }
-        try {
         GenServerResult<Integer> 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);
-        }
     }
 
     /**
@@ -156,8 +131,6 @@ 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不能为空!");
         }
@@ -173,10 +146,6 @@ public class ApiClassController extends GenBaseController {
         } else {
             return AjaxResult.error(genServerResult.getMsg());
         }
-        } catch (RuntimeException e) {
-            logger.error(e.getMessage());
-            return AjaxResult.error(GenReturnConstants.SYS_ERROR);
-        }
     }
 
     /**
@@ -186,7 +155,6 @@ 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不能为空!");
         }
@@ -196,9 +164,5 @@ public class ApiClassController extends GenBaseController {
         } else {
             return AjaxResult.error(genServerResult.getMsg());
         }
-        } catch (RuntimeException e) {
-            logger.error(e.getMessage());
-            return AjaxResult.error(GenReturnConstants.SYS_ERROR);
-        }
     }
 }

ebts/ebts-generator/src/main/java/com/ebts/generator/controller/InterTableController.java

@@ -49,17 +49,12 @@ public class InterTableController extends GenBaseController {
     @PreAuthorize("@ebts.hasPermi('generator:intertable:list')")
     @GetMapping("/list")
     public Serializable list(InterTable interTable) {
-        try {
         GenServerResult<Map<String, Object>> 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);
-        }
     }
 
     /**
@@ -70,17 +65,12 @@ public class InterTableController extends GenBaseController {
     @Log(title = "预览代码(工作流)", businessType = GenBusinessType.GENCODE)
     @GetMapping("/classpreview/{id}")
     public AjaxResult classPreview(@PathVariable("id") Long id) {
-        try {
         GenServerResult<Map<String, String>> 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);
-        }
     }
 
     /**
@@ -90,17 +80,12 @@ public class InterTableController extends GenBaseController {
     @Log(title = "预览代码(工作台)", businessType = GenBusinessType.GENCODE)
     @GetMapping("/modulepreview/{id}")
     public AjaxResult modulePreview(@PathVariable("id") Long id) {
-        try {
         GenServerResult<Map<String, Object>> 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);
-        }
     }
 
 
@@ -122,9 +107,9 @@ public class InterTableController extends GenBaseController {
             } else {
                 return AjaxResult.error(genServerResult.getMsg());
             }
-        } catch (RuntimeException | IOException e) {
+        } catch (IOException e) {
-            logger.error(e.getMessage());
+            e.printStackTrace();
-            return AjaxResult.error(GenReturnConstants.SYS_ERROR);
+            return AjaxResult.error();
         }
     }
 
@@ -161,17 +146,12 @@ public class InterTableController extends GenBaseController {
     @Log(title = "接口信息", businessType = GenBusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody InterTableDto interTableDto) {
-        try {
         GenServerResult<Integer> 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);
-        }
     }
 
     /**

ebts/ebts-generator/src/main/java/com/ebts/generator/controller/ModuleController.java

@@ -48,17 +48,12 @@ public class ModuleController extends GenBaseController {
     @PreAuthorize("@ebts.hasAnyPermi('tool:module:querylist')")
     @GetMapping("querylist")
     public AjaxResult queryList() {
-        try {
         GenServerResult<List<Module>> 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);
-        }
     }
 
 
@@ -68,7 +63,6 @@ public class ModuleController extends GenBaseController {
     @PreAuthorize("@ebts.hasPermi('tool:module:list')")
     @GetMapping("/list")
     public Serializable list(Module module) {
-        try {
         startPage();
         GenServerResult<List<Module>> genServerResult = moduleService.selectModuleList(module);
         if (genServerResult.isStart()) {
@@ -76,10 +70,6 @@ public class ModuleController extends GenBaseController {
         } else {
             return AjaxResult.info(genServerResult.getMsg());
         }
-        } catch (RuntimeException e) {
-            logger.error(e.getMessage());
-            return AjaxResult.error(GenReturnConstants.SYS_ERROR);
-        }
     }
 
     /**
@@ -89,7 +79,6 @@ public class ModuleController extends GenBaseController {
     @Log(title = "模块管理", businessType = GenBusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(Module module) {
-        try {
         GenServerResult<List<Module>> genServerResult = moduleService.selectModuleList(module);
         GenExcelUtil<Module> util = new GenExcelUtil<Module>(Module.class);
         if (genServerResult.isStart()) {
@@ -97,10 +86,6 @@ public class ModuleController extends GenBaseController {
         } else {
             return AjaxResult.error(genServerResult.getMsg());
         }
-        } catch (RuntimeException e) {
-            logger.error(e.getMessage());
-            return AjaxResult.error(GenReturnConstants.SYS_ERROR);
-        }
     }
 
     /**
@@ -109,17 +94,12 @@ public class ModuleController extends GenBaseController {
     @PreAuthorize("@ebts.hasPermi('tool:module:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        try {
         GenServerResult<Module> 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);
-        }
     }
 
     /**
@@ -155,8 +135,6 @@ 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("模块名称不能为空!");
         }
@@ -169,10 +147,6 @@ public class ModuleController extends GenBaseController {
         } else {
             return AjaxResult.error(genServerResult.getMsg());
         }
-        } catch (RuntimeException e) {
-            logger.error(e.getMessage());
-            return AjaxResult.error(GenReturnConstants.SYS_ERROR);
-        }
     }
 
     /**
@@ -182,7 +156,6 @@ 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不能为空!");
         }
@@ -192,9 +165,5 @@ public class ModuleController extends GenBaseController {
         } else {
             return AjaxResult.error(genServerResult.getMsg());
         }
-        } catch (RuntimeException e) {
-            logger.error(e.getMessage());
-            return AjaxResult.error(GenReturnConstants.SYS_ERROR);
-        }
     }
 }

ebts/ebts-generator/src/main/java/com/ebts/generator/controller/QueryController.java

@@ -35,13 +35,13 @@ 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<UniQuery> genServerResult = queryService.selectQueryById(id);
         if (genServerResult.isStart()) {
             UniQuery uniQuery = genServerResult.getData();
@@ -54,63 +54,51 @@ public class QueryController extends GenBaseController {
         } else {
             return AjaxResult.error(genServerResult.getMsg());
         }
-        } catch (RuntimeException e) {
-            logger.error(e.getMessage());
-            return AjaxResult.error(GenReturnConstants.SYS_ERROR);
-        }
     }
 
     /**
      * 更新万能查询编辑信息 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);
-        }
     }
 
     /**
      * 导出预览数据
+     *
      * @param uniQuery
      * @return
      */
     @PreAuthorize("@ebts.hasAnyPermi('query:export')")
     @PutMapping("export")
     public AjaxResult export(@Validated @RequestBody UniQuery uniQuery) {
-        try {
         GenServerResult<List<Map<String, Object>>> 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);
-        }
     }
 
     /**
      * 返回预览信息
+     *
      * @param uniQuery
      * @return
      */
     @PreAuthorize("@ebts.hasPermi('query:preview')")
     @PutMapping("preview")
     public Serializable Preview(@Validated @RequestBody UniQuery uniQuery) {
-        try {
         startPage(uniQuery);
         GenServerResult<List<Map<String, Object>>> genServerResult = queryService.previewQuery(uniQuery);
         if (genServerResult.isStart()) {
@@ -118,21 +106,17 @@ public class QueryController extends GenBaseController {
         } else {
             return AjaxResult.error(genServerResult.getMsg());
         }
-        } catch (RuntimeException e) {
-            logger.error(e.getMessage());
-            return AjaxResult.error(GenReturnConstants.SYS_ERROR);
-        }
     }
 
     /**
      * 发布上线
+     *
      * @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 {
@@ -147,10 +131,6 @@ public class QueryController extends GenBaseController {
                 return AjaxResult.error("状态输入错误!");
             }
         }
-        } catch (RuntimeException e) {
-            logger.error(e.getMessage());
-            return AjaxResult.error(GenReturnConstants.SYS_ERROR);
-        }
     }
 
     /**

ebts/ebts-generator/src/main/java/com/ebts/generator/controller/RegularController.java

@@ -48,7 +48,6 @@ public class RegularController extends GenBaseController {
     @PreAuthorize("@ebts.hasPermi('tool:regular:list')")
     @GetMapping("/list")
     public Serializable list(Regular regular) {
-        try {
         startPage();
         GenServerResult<List<Regular>> genServerResult = regularService.selectRegularList(regular);
         if (genServerResult.isStart()) {
@@ -56,11 +55,8 @@ public class RegularController extends GenBaseController {
         } else {
             return AjaxResult.info(genServerResult.getMsg());
         }
-        } catch (RuntimeException e) {
-            logger.error(e.getMessage());
-            return AjaxResult.error(GenReturnConstants.SYS_ERROR);
-        }
     }
+
     /**
      * 查询校验规则列表
      *
@@ -69,7 +65,6 @@ public class RegularController extends GenBaseController {
     @PreAuthorize("@ebts.hasPermi('tool:regular:option')")
     @GetMapping("/option")
     public Serializable option() {
-        try {
         startPage();
         GenServerResult<List<Regular>> genServerResult = regularService.selectRegularOption();
         if (genServerResult.isStart()) {
@@ -77,10 +72,6 @@ public class RegularController extends GenBaseController {
         } else {
             return AjaxResult.info(genServerResult.getMsg());
         }
-        } catch (RuntimeException e) {
-            logger.error(e.getMessage());
-            return AjaxResult.error(GenReturnConstants.SYS_ERROR);
-        }
     }
 
     /**
@@ -93,7 +84,6 @@ public class RegularController extends GenBaseController {
     @Log(title = "校验规则", businessType = GenBusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(Regular regular) {
-        try {
         GenServerResult<List<Regular>> genServerResult = regularService.selectRegularList(regular);
         GenExcelUtil<Regular> util = new GenExcelUtil<Regular>(Regular.class);
         if (genServerResult.isStart()) {
@@ -101,10 +91,6 @@ public class RegularController extends GenBaseController {
         } else {
             return AjaxResult.error(genServerResult.getMsg());
         }
-        } catch (RuntimeException e) {
-            logger.error(e.getMessage());
-            return AjaxResult.error(GenReturnConstants.SYS_ERROR);
-        }
     }
 
     /**
@@ -116,17 +102,12 @@ public class RegularController extends GenBaseController {
     @PreAuthorize("@ebts.hasPermi('tool:regular:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        try {
         GenServerResult<Regular> 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);
-        }
     }
 
     /**
@@ -139,7 +120,6 @@ 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("正则名称不能为空!");
         }
@@ -158,10 +138,6 @@ public class RegularController extends GenBaseController {
         } else {
             return AjaxResult.error(genServerResult.getMsg());
         }
-        } catch (RuntimeException e) {
-            logger.error(e.getMessage());
-            return AjaxResult.error(GenReturnConstants.SYS_ERROR);
-        }
     }
 
     /**
@@ -174,7 +150,6 @@ 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("正则名称不能为空!");
         }
@@ -193,10 +168,6 @@ public class RegularController extends GenBaseController {
         } else {
             return AjaxResult.error(genServerResult.getMsg());
         }
-        } catch (RuntimeException e) {
-            logger.error(e.getMessage());
-            return AjaxResult.error(GenReturnConstants.SYS_ERROR);
-        }
     }
 
     /**
@@ -209,7 +180,6 @@ 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数不能为空!");
         }
@@ -219,10 +189,6 @@ public class RegularController extends GenBaseController {
         } else {
             return AjaxResult.error(genServerResult.getMsg());
         }
-        } catch (RuntimeException e) {
-            logger.error(e.getMessage());
-            return AjaxResult.error(GenReturnConstants.SYS_ERROR);
-        }
     }
 
     public boolean verifyRegular(Regular regular) {

ebts/ebts-generator/src/main/java/com/ebts/generator/controller/RelController.java

@@ -30,26 +30,23 @@ public class RelController {
 
     /**
      * 获取表的基础信息
+     *
      * @return
      */
     @PreAuthorize("@ebts.hasAnyPermi('rel:tableinfo')")
     @GetMapping("/tableinfo")
     public AjaxResult tableinfos() {
-        try {
         GenServerResult<List<Map<String, Object>>> 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();
-        }
     }
 
     /**
      * 获取表的字段信息
+     *
      * @param tableName
      * @param relId
      * @return
@@ -57,49 +54,34 @@ public class RelController {
     @PreAuthorize("@ebts.hasAnyPermi('rel:tableinfo')")
     @GetMapping("/{tableName}/{relId}")
     public AjaxResult relColumns(@PathVariable("tableName") String tableName, @PathVariable("relId") Long relId) {
-        try {
         GenServerResult<List<RelColumn>> 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();
-        }
     }
 
     @PreAuthorize("@ebts.hasAnyPermi('rel:colums')")
     @GetMapping("/{tableName}")
     public AjaxResult tableColumns(@PathVariable("tableName") String tableName) {
-        try {
         GenServerResult<List<Map<String, Object>>> 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();
-        }
     }
 
     @PreAuthorize("@ebts.hasAnyPermi('rel:colums')")
     @GetMapping("/colums/{tableId}")
     public AjaxResult relTableByTableId(@PathVariable("tableId") Long tableId) {
-        try {
         GenServerResult<List<RelTable>> 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();
-        }
     }
 
 

ebts/ebts-generator/src/main/java/com/ebts/generator/controller/UniQueryController.java

@@ -45,7 +45,6 @@ public class UniQueryController extends GenBaseController {
     @PreAuthorize("@ebts.hasPermi('tool:query:list')")
     @GetMapping("/list")
     public Serializable list(UniQuery uniQuery) {
-        try {
         startPage();
         GenServerResult<List<UniQuery>> genServerResult = uniQueryService.selectUniQueryList(uniQuery);
         if (genServerResult.isStart()) {
@@ -53,10 +52,6 @@ public class UniQueryController extends GenBaseController {
         } else {
             return AjaxResult.info(genServerResult.getMsg());
         }
-        } catch (RuntimeException e) {
-            logger.error(e.getMessage());
-            return AjaxResult.error(GenReturnConstants.SYS_ERROR);
-        }
     }
 
     /**
@@ -66,7 +61,6 @@ public class UniQueryController extends GenBaseController {
     @Log(title = "万能查询", businessType = GenBusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(UniQuery uniQuery) {
-        try {
         GenServerResult<List<UniQuery>> genServerResult = uniQueryService.selectUniQueryList(uniQuery);
         GenExcelUtil<UniQuery> util = new GenExcelUtil<UniQuery>(UniQuery.class);
         if (genServerResult.isStart()) {
@@ -74,10 +68,6 @@ public class UniQueryController extends GenBaseController {
         } else {
             return AjaxResult.error(genServerResult.getMsg());
         }
-        } catch (RuntimeException e) {
-            logger.error(e.getMessage());
-            return AjaxResult.error(GenReturnConstants.SYS_ERROR);
-        }
     }
 
     /**
@@ -86,17 +76,12 @@ public class UniQueryController extends GenBaseController {
     @PreAuthorize("@ebts.hasPermi('tool:query:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        try {
         GenServerResult<UniQuery> 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);
-        }
     }
 
     /**
@@ -112,17 +97,12 @@ public class UniQueryController extends GenBaseController {
         if (uniQuery.getUqDescribe() == null || uniQuery.getUqDescribe().equals("")) {
             return AjaxResult.error("描述不能为空!");
         }
-        try {
         GenServerResult<Integer> 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);
-        }
     }
 
     /**
@@ -132,8 +112,6 @@ 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("名称不能为空!");
         }
@@ -146,10 +124,6 @@ public class UniQueryController extends GenBaseController {
         } else {
             return AjaxResult.error(genServerResult.getMsg());
         }
-        } catch (RuntimeException e) {
-            logger.error(e.getMessage());
-            return AjaxResult.error(GenReturnConstants.SYS_ERROR);
-        }
     }
 
     /**
@@ -159,7 +133,6 @@ 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不能为空!");
         }
@@ -169,9 +142,5 @@ public class UniQueryController extends GenBaseController {
         } else {
             return AjaxResult.error(genServerResult.getMsg());
         }
-        } catch (RuntimeException e) {
-            logger.error(e.getMessage());
-            return AjaxResult.error(GenReturnConstants.SYS_ERROR);
-        }
     }
 }