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

清除controller层的try cath

This commit is contained in:
clay 2021-06-16 22:58:12 +08:00
parent 5804dd1fb9
commit 45d1e82597
14 changed files with 400 additions and 701 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
ebts/ebts-admin/src/main/java/com/ebts/web/controller/monitor/LogininforController.java
View File

@ -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);
}
startPage();
List<Logininfor> 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<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);
}
List<Logininfor> list = logininforService.selectLogininforList(logininfor);
ExcelUtil<Logininfor> util = new ExcelUtil<Logininfor>(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();
}
}

39
ebts/ebts-admin/src/main/java/com/ebts/web/controller/monitor/OperlogController.java
View File

@ -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);
}
startPage();
List<OperLog> 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<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);
}
List<OperLog> list = operLogService.selectOperLogList(operLog);
ExcelUtil<OperLog> util = new ExcelUtil<OperLog>(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();
}
}

11
ebts/ebts-admin/src/main/java/com/ebts/web/controller/monitor/ServerController.java
View File

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

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

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

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

@ -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<List<SysFile>> 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<List<SysFile>> serverResult = fileService.selectFileList(sysFile);
if (serverResult.isStart()) {
return getDataTable(serverResult.getData());
} else {
return AjaxResult.info(serverResult.getMsg());
}
}
@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);
ServerResult<List<SysFile>> 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<List<SysFile>> serverResult = fileService.selectFileList(sysFile);
ExcelUtil<SysFile> util = new ExcelUtil<SysFile>(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<List<SysFile>> serverResult = fileService.selectFileList(sysFile);
ExcelUtil<SysFile> util = new ExcelUtil<SysFile>(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<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);
ServerResult<SysFile> 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<String, String> modeMap = new HashMap<>();
ServerResult<SysFile> 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<String, String> modeMap = new HashMap<>();
ServerResult<SysFile> 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<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);
ServerResult<Integer> 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<Integer> 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<Integer> 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<SysFile> 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<SysFile> 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");
}
}

18
ebts/ebts-admin/src/main/java/com/ebts/web/controller/system/NoticeController.java
View File

@ -39,9 +39,9 @@ public class NoticeController extends BaseController {
@PreAuthorize("@ebts.hasPermi('system:notice:list')")
@GetMapping("/list")
public Serializable list(Notice notice) {
startPage();
List<Notice> list = noticeService.selectNoticeList(notice);
return getDataTable(list);
startPage();
List<Notice> 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));
}
}

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

@ -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<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);
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());
}
}
/**
* 获取查询基本信息
*
* @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<List<RealUniQuery>> 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<List<RealUniQuery>> 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<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);
ServerResult<List<Map<String, Object>>> serverResult = realQueryService.RealData(realUniQuery, 2);
if (serverResult.isStart()) {
return getDataTable(serverResult.getData());
} else {
return AjaxResult.error(serverResult.getMsg());
}
}
}

134
ebts/ebts-generator/src/main/java/com/ebts/generator/controller/ApiClassController.java
View File

@ -47,16 +47,11 @@ 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);
GenServerResult<List<ApiClass>> 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<List<ApiClass>> 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<List<ApiClass>> 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<List<ApiClass>> genServerResult = apiClassService.selectApiclassList(apiclass);
GenExcelUtil<ApiClass> util = new GenExcelUtil<ApiClass>(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<List<ApiClass>> genServerResult = apiClassService.selectApiclassList(apiclass);
GenExcelUtil<ApiClass> util = new GenExcelUtil<ApiClass>(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<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);
GenServerResult<ApiClass> 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<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);
GenServerResult<Integer> 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<Integer> 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<Integer> 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<Integer> 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<Integer> genServerResult = apiClassService.deleteApiclassByIds(ids);
if (genServerResult.isStart()) {
return AjaxResult.success();
} else {
return AjaxResult.error(genServerResult.getMsg());
}
}
}

66
ebts/ebts-generator/src/main/java/com/ebts/generator/controller/InterTableController.java
View File

@ -49,16 +49,11 @@ 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);
GenServerResult<Map<String, Object>> 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<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);
GenServerResult<Map<String, String>> 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<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);
GenServerResult<Map<String, Object>> 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<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);
GenServerResult<Integer> genServerResult = interTableService.updateInterTable(interTableDto);
if (genServerResult.isStart()) {
return AjaxResult.success();
} else {
return AjaxResult.error(genServerResult.getMsg());
}
}

113
ebts/ebts-generator/src/main/java/com/ebts/generator/controller/ModuleController.java
View File

@ -48,16 +48,11 @@ 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);
GenServerResult<List<Module>> 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<List<Module>> 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<List<Module>> 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<List<Module>> genServerResult = moduleService.selectModuleList(module);
GenExcelUtil<Module> util = new GenExcelUtil<Module>(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<List<Module>> genServerResult = moduleService.selectModuleList(module);
GenExcelUtil<Module> util = new GenExcelUtil<Module>(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<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);
GenServerResult<Module> 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<Integer> 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<Integer> 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<Integer> 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<Integer> genServerResult = moduleService.deleteModuleByIds(ids);
if (genServerResult.isStart()) {
return AjaxResult.success();
} else {
return AjaxResult.error(genServerResult.getMsg());
}
}
}

104
ebts/ebts-generator/src/main/java/com/ebts/generator/controller/QueryController.java
View File

@ -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<UniQuery> genServerResult = queryService.selectQueryById(id);
if (genServerResult.isStart()) {
UniQuery uniQuery = genServerResult.getData();
Map<String, Object> modeMap = new HashMap<>();
List<UniCon> 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<UniQuery> genServerResult = queryService.selectQueryById(id);
if (genServerResult.isStart()) {
UniQuery uniQuery = genServerResult.getData();
Map<String, Object> modeMap = new HashMap<>();
List<UniCon> 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<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);
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());
}
}
/**
* 返回预览信息
*
* @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()) {
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<List<Map<String, Object>>> 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<Integer> 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<Integer> 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);
}
}

166
ebts/ebts-generator/src/main/java/com/ebts/generator/controller/RegularController.java
View File

@ -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<List<Regular>> 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<List<Regular>> 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<List<Regular>> 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<List<Regular>> 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<List<Regular>> genServerResult = regularService.selectRegularList(regular);
GenExcelUtil<Regular> util = new GenExcelUtil<Regular>(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<List<Regular>> genServerResult = regularService.selectRegularList(regular);
GenExcelUtil<Regular> util = new GenExcelUtil<Regular>(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<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);
GenServerResult<Regular> 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<Integer> 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<Integer> 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<Integer> 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<Integer> 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<Integer> 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<Integer> genServerResult = regularService.deleteRegularByIds(ids);
if (genServerResult.isStart()) {
return AjaxResult.success();
} else {
return AjaxResult.error(genServerResult.getMsg());
}
}

70
ebts/ebts-generator/src/main/java/com/ebts/generator/controller/RelController.java
View File

@ -30,75 +30,57 @@ 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();
public AjaxResult tableinfos() {
GenServerResult<List<Map<String, Object>>> 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<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();
public AjaxResult relColumns(@PathVariable("tableName") String tableName, @PathVariable("relId") Long relId) {
GenServerResult<List<RelColumn>> 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<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();
public AjaxResult tableColumns(@PathVariable("tableName") String tableName) {
GenServerResult<List<Map<String, Object>>> 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<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();
public AjaxResult relTableByTableId(@PathVariable("tableId") Long tableId) {
GenServerResult<List<RelTable>> genServerResult = relService.relTableByTableId(tableId);
if (genServerResult.isStart()) {
return AjaxResult.success(genServerResult.getData());
} else {
return AjaxResult.error(genServerResult.getMsg());
}
}

113
ebts/ebts-generator/src/main/java/com/ebts/generator/controller/UniQueryController.java
View File

@ -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<List<UniQuery>> 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<List<UniQuery>> 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<List<UniQuery>> genServerResult = uniQueryService.selectUniQueryList(uniQuery);
GenExcelUtil<UniQuery> util = new GenExcelUtil<UniQuery>(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<List<UniQuery>> genServerResult = uniQueryService.selectUniQueryList(uniQuery);
GenExcelUtil<UniQuery> util = new GenExcelUtil<UniQuery>(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<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);
GenServerResult<UniQuery> 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<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);
GenServerResult<Integer> 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<Integer> 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<Integer> 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<Integer> 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<Integer> genServerResult = uniQueryService.deleteUniQueryByIds(ids);
if (genServerResult.isStart()) {
return AjaxResult.success();
} else {
return AjaxResult.error(genServerResult.getMsg());
}
}
}