From c5b16f1e99097d53ebb28853f540d07ea596dd46 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Tue, 12 Mar 2019 19:29:17 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=8F=90=E7=A4=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E4=B8=BA=20=E6=93=8D=E4=BD=9C=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DemoExceptionController.java | 2 +- .../controller/DemoResourceController.java | 10 +++++----- .../controller/base/WhiteController.java | 2 +- .../controller/busi/PersonnelController.java | 14 +++++++------- .../controller/busi/SysConfigController.java | 20 ++++++++++---------- .../controller/busi/SysDashboardController.java | 10 +++++----- .../controller/busi/SysDepartmentController.java | 10 +++++----- .../controller/busi/SysDictionaryController.java | 20 ++++++++++---------- .../controller/busi/SysFileController.java | 14 +++++++------- .../busi/SysLocaleLanguageController.java | 4 ++-- .../busi/SysLocaleResourceController.java | 4 ++-- .../controller/busi/SysLogOperateController.java | 10 +++++----- .../controller/busi/SysLogSystemController.java | 10 +++++----- .../controller/busi/SysLogTaskTimeController.java | 8 ++++---- .../controller/busi/SysMenuController.java | 4 ++-- .../controller/busi/SysMessageController.java | 22 +++++++++++----------- .../controller/busi/SysOrderNoRuleController.java | 6 +++--- .../controller/busi/SysOrganizeController.java | 4 ++-- .../controller/busi/SysPositionController.java | 10 +++++----- .../controller/busi/SysRoleController.java | 4 ++-- .../controller/busi/SysTaskController.java | 2 +- .../controller/busi/SysTaskCycleController.java | 6 +++--- .../controller/busi/SysTaskPlanController.java | 4 ++-- .../controller/busi/SysToolController.java | 12 ++++++------ .../controller/busi/SysToolTypeController.java | 12 ++++++------ .../controller/busi/SysUserController.java | 2 +- .../controller/busi/SysUserInfoController.java | 12 ++++++------ 27 files changed, 119 insertions(+), 119 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoExceptionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoExceptionController.java index fde4bbc..740c24c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoExceptionController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoExceptionController.java @@ -45,7 +45,7 @@ public class DemoExceptionController { }else if(type == 2){ throw new SQLException("测试数据库异常"); }else { - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } }catch(ImppBusiException busExcep){ LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java index 7322623..8ff7b99 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java @@ -103,7 +103,7 @@ public class DemoResourceController extends CoreBaseController { //修改条件 ConvertBean.modelUpdate(lang,user); systemResourceService.updateSysLocaleLanguage(lang); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep).build(); }catch(Exception e){ @@ -173,7 +173,7 @@ public class DemoResourceController extends CoreBaseController { SysLocaleResource res = systemResourceService.getSysLocaleResourceByLanguage(resourceType, langCode, resKey); LOGGER.info("获取的资源：" + res); - return ResultBean.success("保存成功") + return ResultBean.success("操作成功") .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) .setResultObject(res); }catch(ImppBusiException busExcep){ @@ -221,7 +221,7 @@ public class DemoResourceController extends CoreBaseController { SysUser user = userService.getSysUserById(key); System.out.println("1==="+user.toString()); - return ResultBean.success("保存成功"); + return ResultBean.success("操作成功"); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -240,7 +240,7 @@ public class DemoResourceController extends CoreBaseController { SysUserInfo userInfo = userInfoServicer.getSysUserInfoById(key); System.out.println("2==="+userInfo.toString()); - return ResultBean.success("保存成功"); + return ResultBean.success("操作成功"); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -266,7 +266,7 @@ public class DemoResourceController extends CoreBaseController { SysUserInfo userInfo = userInfoServicer.getSysUserInfoById(key); // System.out.println("2==="+userInfo); - return ResultBean.success("保存成功"); + return ResultBean.success("操作成功"); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java index a66ae66..101cc9e 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java @@ -71,7 +71,7 @@ public class WhiteController extends CoreBaseController { public ResultBean listSysLocaleLanguage(){ try { List sysLocaleLanguageList = sysLocaleLanguageService.findSysLocaleLanguageByStatus(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); - return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(sysLocaleLanguageList); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(sysLocaleLanguageList); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java index 0a04177..051f433 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java @@ -117,7 +117,7 @@ public class PersonnelController extends CoreBaseController { // 关系 刷新 refreshRef(user, info, model); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); } catch (Exception e) { @@ -197,7 +197,7 @@ public class PersonnelController extends CoreBaseController { personnelService.saveSysUser(user); personnelService.saveSysUserInfo(userInfo); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); } catch (Exception e) { @@ -229,7 +229,7 @@ public class PersonnelController extends CoreBaseController { // 关系 刷新 refreshRef(user, null, model); personnelService.saveSysUser(user); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); } catch (Exception e) { @@ -309,7 +309,7 @@ public class PersonnelController extends CoreBaseController { personnelService.deleteSysUserInfo(new Long[]{info.getId()},getSessionUser().getUserName()); personnelService.deleteSysUser(new Long[]{info.getUserId()},getSessionUser().getUserName()); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }else{ return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); } @@ -347,7 +347,7 @@ public class PersonnelController extends CoreBaseController { personnelService.deleteSysUserInfo(infoIds,getSessionUser().getUserName()); personnelService.deleteSysUser(userIds,getSessionUser().getUserName()); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }else{ return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); } @@ -370,7 +370,7 @@ public class PersonnelController extends CoreBaseController { personnelService.deleteSysUserInfo(new Long[]{user.getUserInfoId()},getSessionUser().getUserName()); personnelService.deleteSysUser(new Long[]{user.getId()},getSessionUser().getUserName()); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }else{ return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); } @@ -408,7 +408,7 @@ public class PersonnelController extends CoreBaseController { personnelService.deleteSysUserInfo(infoIds,getSessionUser().getUserName()); personnelService.deleteSysUser(userIds,getSessionUser().getUserName()); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }else{ return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysConfigController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysConfigController.java index 4859363..fe1e6a6 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysConfigController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysConfigController.java @@ -72,7 +72,7 @@ public class SysConfigController extends CoreBaseController { sysConfigService.insertSysConfig(sysConfig); systemInitService.loadSysConfig(); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -97,7 +97,7 @@ public class SysConfigController extends CoreBaseController { sysConfigService.deleteSysConfigById(Long.parseLong(idStr)); systemInitService.loadSysConfig(); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -124,7 +124,7 @@ public class SysConfigController extends CoreBaseController { sysConfigService.updateSysConfig(sysConfig); systemInitService.loadSysConfig(); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -137,7 +137,7 @@ public class SysConfigController extends CoreBaseController { public ResultBean findSysConfigAll(){ try { List sysConfigList = sysConfigService.ListSysConfig(); - return ResultBean.success("查询成功") + return ResultBean.success("操作成功") .setResultList(sysConfigList) .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ @@ -155,7 +155,7 @@ public class SysConfigController extends CoreBaseController { SysConfig sysConfig = sysConfigService.getSysConfigById(Long.parseLong(id)); if (sysConfig != null) { - return ResultBean.success("查询成功") + return ResultBean.success("操作成功") .setResultObject(sysConfig).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }else { return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); @@ -172,7 +172,7 @@ public class SysConfigController extends CoreBaseController { public ResultBean querySysConfigByPager(SysConfig sysConfig,Pager pager) { try { ListPager sysConfigListPager = sysConfigService.querySysConfigByPager(sysConfig,pager); - return ResultBean.success("查询成功").setListPager(sysConfigListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setListPager(sysConfigListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -190,7 +190,7 @@ public class SysConfigController extends CoreBaseController { if(sysConfig == null){ return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); } else{ - return ResultBean.success("查询成功").setResultObject(sysConfig).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setResultObject(sysConfig).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); @@ -207,7 +207,7 @@ public class SysConfigController extends CoreBaseController { if(sysConfig == null){ return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); } else{ - return ResultBean.success("查询成功").setResultList(sysConfig).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setResultList(sysConfig).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); @@ -225,7 +225,7 @@ public class SysConfigController extends CoreBaseController { sysConfigService.updateSysConfigByCode(code,value); systemInitService.loadSysConfig(); - return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -267,7 +267,7 @@ public class SysConfigController extends CoreBaseController { try { ValidatorBean.checkNotNull(group,"参数组不能为空"); List sysConfigList = sysConfigService.findSysConfigByGroup(group); - return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(sysConfigList); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(sysConfigList); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDashboardController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDashboardController.java index a5d6e83..e87a7ae 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDashboardController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDashboardController.java @@ -72,7 +72,7 @@ public class SysDashboardController extends CoreBaseController { redisCore.putHashMap(redisKey, dashboardData, 500); } - return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultMap(dashboardData); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultMap(dashboardData); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); }catch(Exception e){ @@ -99,7 +99,7 @@ public class SysDashboardController extends CoreBaseController { redisCore.putHashMap(redisKey, dashboardData, 500); } - return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) .setResultMap(dashboardData); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); @@ -129,7 +129,7 @@ public class SysDashboardController extends CoreBaseController { redisCore.putHashMap(redisKey, dashboardData, 500); } - return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) .setResultMap(dashboardData); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); @@ -159,7 +159,7 @@ public class SysDashboardController extends CoreBaseController { redisCore.putHashMap(redisKey, dashboardData, 500); } - return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) .setResultMap(dashboardData); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); @@ -208,7 +208,7 @@ public class SysDashboardController extends CoreBaseController { redisCore.putHashMap(redisKey, dashboardData, 500); } - return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) .setResultMap(dashboardData); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java index 9fe63fd..0a6986c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java @@ -72,7 +72,7 @@ public class SysDepartmentController extends CoreBaseController { } departmentService.insertSysDepartment(department); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); } catch (Exception e) { @@ -101,7 +101,7 @@ public class SysDepartmentController extends CoreBaseController { } departmentService.updateSysDepartment(department); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); } catch (Exception e) { @@ -159,7 +159,7 @@ public class SysDepartmentController extends CoreBaseController { }else{ list = departmentService.findSysDepartmentByPager(department, pager); } - return ResultBean.success("查询成功").setListPager(list).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setListPager(list).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); } catch (Exception e) { @@ -175,7 +175,7 @@ public class SysDepartmentController extends CoreBaseController { ValidatorBean.checkNotNull(id, "id为空。"); departmentService.deleteSysDepartmentById(Long.parseLong(id)); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); } catch (Exception e) { @@ -196,7 +196,7 @@ public class SysDepartmentController extends CoreBaseController { .build(); } departmentService.deleteSysDepartmentByIds(StringTool.getArrayLong(ids)); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java index 1f5d165..b29a18e 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java @@ -60,7 +60,7 @@ public class SysDictionaryController extends CoreBaseController{ sysDictionary.setIsDefault(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); sysDictionaryService.insertSysDictionary(sysDictionary); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -85,7 +85,7 @@ public class SysDictionaryController extends CoreBaseController{ ConvertBean.modelUpdate(sysDictionary,user); sysDictionaryService.updateSysDictionary(sysDictionary); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -117,7 +117,7 @@ public class SysDictionaryController extends CoreBaseController{ } sysDictionaryService.deleteSysDictionaryById(Long.parseLong(idStr)); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -130,7 +130,7 @@ public class SysDictionaryController extends CoreBaseController{ public ResultBean findSysDictionaryAll() { try { List sysDictionaryList = sysDictionaryService.listSysDictionary(); - return ResultBean.success("查询成功").setResultList(sysDictionaryList) + return ResultBean.success("操作成功").setResultList(sysDictionaryList) .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); @@ -148,7 +148,7 @@ public class SysDictionaryController extends CoreBaseController{ SysDictionary sysDictionary = sysDictionaryService.getSysDictionaryById(Long.parseLong(id)); if (sysDictionary != null) { - return ResultBean.success("查询成功").setResultObject(sysDictionary).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setResultObject(sysDictionary).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }else { return ResultBean.fail("字典不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); } @@ -164,7 +164,7 @@ public class SysDictionaryController extends CoreBaseController{ public ResultBean findSysDictionaryByParentCode(@PathVariable("code") String code) { try { List sysDictionaryList = sysDictionaryService.findSysDictionaryByParentCode(code); - return ResultBean.success("查询成功").setResultList(sysDictionaryList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setResultList(sysDictionaryList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); } catch (Exception e) { @@ -187,7 +187,7 @@ public class SysDictionaryController extends CoreBaseController{ resultMap.put("8",sysDictionaryService.findSysDictionaryByParentCode(BaseConstWords.DICTIONARY_POLITICAL_STATUS)); resultMap.put("9",sysDictionaryService.findSysDictionaryByParentCode(BaseConstWords.DICTIONARY_EMPLOYEE_TYPE)); - return ResultBean.success("查询成功").setResultMap(resultMap).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setResultMap(resultMap).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); } catch (Exception e) { @@ -200,7 +200,7 @@ public class SysDictionaryController extends CoreBaseController{ public ResultBean querySysDictionaryByPager(SysDictionary sysDictionary, Pager pager) { try { ListPager sysDictionaryListPager = sysDictionaryService.querySysDictionaryByPager(sysDictionary,pager); - return ResultBean.success("查询成功").setListPager(sysDictionaryListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setListPager(sysDictionaryListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -213,7 +213,7 @@ public class SysDictionaryController extends CoreBaseController{ public ResultBean findSysDictionaryByTop() { try { List sysDictionaryList = sysDictionaryService.findSysDictionaryByTop(); - return ResultBean.success("查询成功").setResultList(sysDictionaryList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setResultList(sysDictionaryList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -233,7 +233,7 @@ public class SysDictionaryController extends CoreBaseController{ .build(); } sysDictionaryService.deleteSysDictionaryByIds(StringTool.getArrayLong(ids)); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java index a34cafc..b5afd31 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java @@ -66,7 +66,7 @@ public class SysFileController extends CoreBaseController{ .notNull("name",sysFile.getName()); sysFileService.updateSysFile(sysFile); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -79,7 +79,7 @@ public class SysFileController extends CoreBaseController{ public ResultBean deleteSysFileById(@PathVariable("id") String id){ try { sysFileService.deleteSysFileById(Long.parseLong(id)); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -92,7 +92,7 @@ public class SysFileController extends CoreBaseController{ public ResultBean findSysFileAll(SysFile sysFile){ try { List sysFileList = sysFileService.listSysFile(); - return ResultBean.success("查询成功") + return ResultBean.success("操作成功") .setResultList(sysFileList) .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ @@ -109,7 +109,7 @@ public class SysFileController extends CoreBaseController{ ValidatorBean.checkIsNumber(id,"id必须为数字"); SysFile sysFile = sysFileService.getSysFileById(Long.parseLong(id)); - return ResultBean.success("查询成功") + return ResultBean.success("操作成功") .setResultObject(sysFile) .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ @@ -124,7 +124,7 @@ public class SysFileController extends CoreBaseController{ public ResultBean querySysFileByPager(SysFile sysFile, Pager pager){ try { ListPager sysFileListPager = sysFileService.querySysFileByPager(sysFile,pager); - return ResultBean.success("查询成功").setListPager(sysFileListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setListPager(sysFileListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -145,7 +145,7 @@ public class SysFileController extends CoreBaseController{ } sysFileService.deleteSysFileByIds(StringTool.getArrayLong(ids)); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -274,7 +274,7 @@ public class SysFileController extends CoreBaseController{ sysFile.setFileTypeName(dictionary.getName()); sysFile = sysFileService.insertSysFile(sysFile); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(sysFile); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(sysFile); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleLanguageController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleLanguageController.java index 718a978..e8794a2 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleLanguageController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleLanguageController.java @@ -124,7 +124,7 @@ public class SysLocaleLanguageController extends CoreBaseController { public ResultBean listSysLocaleLanguage(){ try { List sysLocaleLanguageList = sysLocaleLanguageService.listSysLocaleLanguage(); - return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(sysLocaleLanguageList); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(sysLocaleLanguageList); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -137,7 +137,7 @@ public class SysLocaleLanguageController extends CoreBaseController { public ResultBean querySysLocaleLanguageByPager(SysLocaleLanguage sysLocaleLanguage, Pager pager){ try { ListPager sysLocaleLanguageListPager = sysLocaleLanguageService.querySysLocaleLanguageByPager(sysLocaleLanguage,pager); - return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setListPager(sysLocaleLanguageListPager); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setListPager(sysLocaleLanguageListPager); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java index b414a52..1f7ac89 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java @@ -132,7 +132,7 @@ public class SysLocaleResourceController extends CoreBaseController { public ResultBean listSysLocaleResource(){ try { List sysLocaleLanguageList = sysLocaleResourceService.listSysLocaleResource(); - return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(sysLocaleLanguageList); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(sysLocaleLanguageList); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -145,7 +145,7 @@ public class SysLocaleResourceController extends CoreBaseController { public ResultBean querySysLocaleResourceByPager(SysLocaleResource sysLocaleResource, Pager pager){ try { ListPager sysLocaleLanguageListPager = sysLocaleResourceService.querySysLocaleResourceByPager(sysLocaleResource,pager); - return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setListPager(sysLocaleLanguageListPager); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setListPager(sysLocaleLanguageListPager); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java index 28c8ace..33b42f1 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java @@ -63,7 +63,7 @@ public class SysLogOperateController extends CoreBaseController { public ResultBean insertSysLogOperateController(SysLogOperate logOperate){ try { logOperateService.insertSysLogOperate(logOperate); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -79,7 +79,7 @@ public class SysLogOperateController extends CoreBaseController { ValidatorBean.checkNotNull(id,"id不能为空！"); logOperateService.deleteSysLogOperateById(Long.parseLong(id)); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -92,7 +92,7 @@ public class SysLogOperateController extends CoreBaseController { public ResultBean findSysLogOperateAll(){ try { List logOperateList = logOperateService.listSysLogOperate(); - return ResultBean.success("查询成功").setResultList(logOperateList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setResultList(logOperateList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -106,7 +106,7 @@ public class SysLogOperateController extends CoreBaseController { try{ SysLogOperate logOperate = logOperateService.getSysLogOperateById(Long.parseLong(id)); if (logOperate != null) { - return ResultBean.success("查询成功") + return ResultBean.success("操作成功") .setResultObject(logOperate) .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }else { @@ -125,7 +125,7 @@ public class SysLogOperateController extends CoreBaseController { public ResultBean querySysLogOperateByPager(SysLogOperate logOperate, Pager pager){ try { ListPager logSystemList = logOperateService.querySysLogOperateByPager(logOperate, pager); - return ResultBean.success("查询成功").setListPager(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setListPager(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java index 047e84a..f2c1cbe 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java @@ -59,7 +59,7 @@ public class SysLogSystemController extends CoreBaseController{ public ResultBean insertSysLogSystem(SysLogSystem logSystem) { try { logSystemService.insertSysLogSystem(logSystem); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -75,7 +75,7 @@ public class SysLogSystemController extends CoreBaseController{ ValidatorBean.checkNotNull(id,"id不能为空"); logSystemService.deleteSysLogSystemById(Long.parseLong(id)); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -88,7 +88,7 @@ public class SysLogSystemController extends CoreBaseController{ public ResultBean findSysLogSystemAll(){ try { List logSystemList = logSystemService.listSysLogSystem(); - return ResultBean.success("查询成功").setResultList(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setResultList(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -101,7 +101,7 @@ public class SysLogSystemController extends CoreBaseController{ public ResultBean getSysLogSystemById(String id){ try { SysLogSystem logSystem = logSystemService.getSysLogSystemById(Long.parseLong(id)); - return ResultBean.success("查询成功").setResultObject(logSystem).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setResultObject(logSystem).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -120,7 +120,7 @@ public class SysLogSystemController extends CoreBaseController{ public ResultBean querySysLogSystemByPager(SysLogSystem logSystem, Pager pager){ try { ListPager logSystemList = logSystemService.querySysLogSystemByPager(logSystem, pager); - return ResultBean.success("查询成功").setListPager(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setListPager(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogTaskTimeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogTaskTimeController.java index db37eda..874f7a6 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogTaskTimeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogTaskTimeController.java @@ -39,7 +39,7 @@ public class SysLogTaskTimeController extends CoreBaseController{ public ResultBean insertSyslogTaskTime(SysLogTaskTime sysLogTaskTime) { try { logTaskTimeService.insertSysLogTaskTime(sysLogTaskTime); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -55,7 +55,7 @@ public class SysLogTaskTimeController extends CoreBaseController{ ValidatorBean.checkNotNull(id,"id不能为空"); logTaskTimeService.deleteSysLogTaskTimeById(Long.parseLong(id)); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -69,7 +69,7 @@ public class SysLogTaskTimeController extends CoreBaseController{ try { SysLogTaskTime logTaskTime = logTaskTimeService.getSysLogTaskTimeById(Long.parseLong(id)); if (logTaskTime != null) { - return ResultBean.success("查询成功").setResultObject(logTaskTime).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setResultObject(logTaskTime).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }else { return ResultBean.fail("日志不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); } @@ -91,7 +91,7 @@ public class SysLogTaskTimeController extends CoreBaseController{ public ResultBean querySysLogSystemByPager(SysLogTaskTime sysLogTaskTime, Pager pager){ try { ListPager logSystemList = logTaskTimeService.querySysLogTaskTimeByPager(sysLogTaskTime, pager); - return ResultBean.success("查询成功").setListPager(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setListPager(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java index 05e9325..6af671d 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java @@ -93,7 +93,7 @@ public class SysMenuController extends CoreBaseController { } sysMenuService.updateSysMenu(menu); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep).build(); } catch (Exception e) { @@ -215,7 +215,7 @@ public class SysMenuController extends CoreBaseController { .build(); } sysMenuService.deleteSysMenuByIds(StringTool.getArrayLong(ids)); - return ResultBean.success("删除成功") + return ResultBean.success("操作成功") .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java index 9059c0f..b5da61d 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java @@ -66,7 +66,7 @@ public class SysMessageController extends CoreBaseController { sysMessage.setMessageReceiverType(ImppEnumUtil.MESSAGE_RECEIVER_TYPE.INTERNAL.getValue()); sysMessageService.doSendSysMessage(sysMessage); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -82,7 +82,7 @@ public class SysMessageController extends CoreBaseController { ValidatorBean.checkNotNull(id,"id不能为空"); sysMessageService.deleteSysMessageById(Long.parseLong(id)); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -104,7 +104,7 @@ public class SysMessageController extends CoreBaseController { .checkNotZero("messageType",sysMessage.getMessageType()); sysMessageService.updateSysMessage(sysMessage); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -117,7 +117,7 @@ public class SysMessageController extends CoreBaseController { public ResultBean findSysMessageAll(){ try { List sysMessageList = sysMessageService.listSysMessage(); - return ResultBean.success("查询成功").setResultList(sysMessageList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setResultList(sysMessageList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -131,7 +131,7 @@ public class SysMessageController extends CoreBaseController { try { SysMessage sysMessage = sysMessageService.getSysMessageById(Long.parseLong(idStr)); if (sysMessage != null) { - return ResultBean.success("查询成功").setResultObject(sysMessage).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setResultObject(sysMessage).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }else { return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); } @@ -147,7 +147,7 @@ public class SysMessageController extends CoreBaseController { public ResultBean querySysMessageByPager(SysMessage sysMessage, Pager pager){ try { ListPager sysMessageListPager = sysMessageService.querySysMessageByPager(sysMessage,pager); - return ResultBean.success("查询成功").setListPager(sysMessageListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setListPager(sysMessageListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -169,7 +169,7 @@ public class SysMessageController extends CoreBaseController { .build(); } sysMessageService.deleteSysMessageByIds(StringTool.getArrayLong(ids)); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -186,7 +186,7 @@ public class SysMessageController extends CoreBaseController { sysRefUserMessage.setReceiverId(getSessionUser().getUser().getId()); ListPager userMessageList = sysMessageService.querySysRefUserMessageByPager(sysRefUserMessage,pager); - return ResultBean.success("查询成功").setListPager(userMessageList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setListPager(userMessageList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -203,7 +203,7 @@ public class SysMessageController extends CoreBaseController { sysMessage.setMessageSenderId(getSessionUser().getUser().getId()); ListPager sysMessageListPager = sysMessageService.querySysMessageByPager(sysMessage,pager); - return ResultBean.success("查询成功").setListPager(sysMessageListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setListPager(sysMessageListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -217,7 +217,7 @@ public class SysMessageController extends CoreBaseController { try { List userMessageList = sysMessageService.findSysRefUserMessageByUserIdAndStatus(getSessionUser().getUser().getId(), ImppEnumUtil.MESSAGE_STATUS.UNREAD.getValue()); - return ResultBean.success("查询成功").setResultList(userMessageList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setResultList(userMessageList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -313,7 +313,7 @@ public class SysMessageController extends CoreBaseController { sysMessage.setMessageReceiverType(ImppEnumUtil.MESSAGE_RECEIVER_TYPE.INTERNAL.getValue()); sysMessageService.doSendSysMessage(sysMessage); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java index 71f1679..8a3e352 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java @@ -121,7 +121,7 @@ public class SysOrderNoRuleController extends CoreBaseController { SysOrderNoRule sysOrderNoRule = sysOrderNoRuleService.getSysOrderNoRuleById(Long.parseLong(idStr)); if (sysOrderNoRule != null) { - return ResultBean.success("查询成功").setResultObject(sysOrderNoRule).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setResultObject(sysOrderNoRule).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }else { return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); } @@ -152,7 +152,7 @@ public class SysOrderNoRuleController extends CoreBaseController { public ResultBean querySysOrderNoRuleByPager(SysOrderNoRule sysOrderNoRule, Pager pager){ try { ListPager sysOrderNoRuleList = sysOrderNoRuleService.querySysOrderNoRuleByPager(sysOrderNoRule, pager); - return ResultBean.success("查询成功").setListPager(sysOrderNoRuleList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setListPager(sysOrderNoRuleList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -375,7 +375,7 @@ public class SysOrderNoRuleController extends CoreBaseController { ValidatorBean.checkNotNull(code,"code不能为空"); SysOrderNoRule sysOrderNoRule = sysOrderNoRuleService.getSysOrderNoRuleCode(code); - return ResultBean.success("查询成功").setResultObject(sysOrderNoRule).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setResultObject(sysOrderNoRule).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java index b9be58b..4e1a3a9 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java @@ -86,7 +86,7 @@ public class SysOrganizeController extends CoreBaseController{ } organizeService.updateSysOrganize(organize); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); } catch (Exception e) { @@ -184,7 +184,7 @@ public class SysOrganizeController extends CoreBaseController{ } organizeService.deleteSysOrganizeByIds(StringTool.getArrayLong(ids)); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java index 0a8ed72..4956522 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java @@ -61,7 +61,7 @@ public class SysPositionController extends CoreBaseController { } SysPosition pos = positionService.insertSysPosition(position); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) .setResultObject(pos); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); @@ -91,7 +91,7 @@ public class SysPositionController extends CoreBaseController { } positionService.updateSysPosition(position); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); } catch (Exception e) { @@ -137,7 +137,7 @@ public class SysPositionController extends CoreBaseController { ValidatorBean.beginValid(position) .notNull("id",position.getId()); - return ResultBean.success("查询成功").setResultObject(position).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setResultObject(position).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -153,7 +153,7 @@ public class SysPositionController extends CoreBaseController { ValidatorBean.checkNotNull(id,"id为空"); positionService.deleteSysPositionById(Long.parseLong(id)); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); } catch (Exception e) { @@ -174,7 +174,7 @@ public class SysPositionController extends CoreBaseController { .build(); } positionService.deleteSysPositionByIds(StringTool.getArrayLong(ids)); - return ResultBean.success("删除成功") + return ResultBean.success("操作成功") .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java index cc5827e..3108cce 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java @@ -81,7 +81,7 @@ public class SysRoleController extends CoreBaseController{ ConvertBean.modelUpdate(role, AuthUtil.getSessionUser()); sysRoleService.updateSysRole(role); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); } catch (Exception e) { @@ -291,7 +291,7 @@ public class SysRoleController extends CoreBaseController{ .build(); } sysRoleService.deleteSysRoleByIds(StringTool.getArrayLong(ids)); - return ResultBean.success("删除成功") + return ResultBean.success("操作成功") .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskController.java index a8b27d8..ac35073 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskController.java @@ -145,7 +145,7 @@ public class SysTaskController extends CoreBaseController { .build(); } sysTaskService.deleteSysTaskByIds(StringTool.getArrayLong(idsStr)); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); } catch (Exception e) { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskCycleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskCycleController.java index 4206b7a..29bfb02 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskCycleController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskCycleController.java @@ -144,7 +144,7 @@ public class SysTaskCycleController extends CoreBaseController{ SysTaskCycle sysTaskCycle = sysTaskCycleService.getSysTaskCycleById(Long.parseLong(id)); if (sysTaskCycle != null) { - return ResultBean.success("查询成功").setResultObject(sysTaskCycle).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setResultObject(sysTaskCycle).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }else { return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); } @@ -160,7 +160,7 @@ public class SysTaskCycleController extends CoreBaseController{ public ResultBean querySysTaskCycleByPager(SysTaskCycle taskTimeExpression, Pager pager){ try { ListPager listPager = sysTaskCycleService.querySysTaskCycleByPager(taskTimeExpression,pager); - return ResultBean.success("查询成功").setListPager(listPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setListPager(listPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -181,7 +181,7 @@ public class SysTaskCycleController extends CoreBaseController{ } sysTaskCycleService.deleteSysTaskCycleByIds(StringTool.getArrayLong(idsStr)); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskPlanController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskPlanController.java index 904de23..8f41740 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskPlanController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskPlanController.java @@ -165,7 +165,7 @@ public class SysTaskPlanController extends CoreBaseController{ SysTaskPlan taskTime = sysTaskPlanService.getSysTaskPlanById(Long.parseLong(id)); if (taskTime != null) { - return ResultBean.success("查询成功").setResultObject(taskTime).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setResultObject(taskTime).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }else { return ResultBean.fail("任务计划不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); } @@ -198,7 +198,7 @@ public class SysTaskPlanController extends CoreBaseController{ public ResultBean querySysTaskTimeByPager(SysTaskPlan taskTime, Pager pager){ try { ListPager taskTimeListPager = sysTaskPlanService.querySysTaskPlanByPager(taskTime,pager); - return ResultBean.success("查询成功").setListPager(taskTimeListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setListPager(taskTimeListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolController.java index fe1eb2f..a89e3bf 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolController.java @@ -69,7 +69,7 @@ public class SysToolController extends CoreBaseController{ tool.setToolStatus(CommonEnumUtil.DATA_STATUS.ENABLE.getValue()); toolService.insertSysTool(tool); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -97,7 +97,7 @@ public class SysToolController extends CoreBaseController{ ConvertBean.modelUpdate(tool,user); toolService.updateSysTool(tool); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -112,7 +112,7 @@ public class SysToolController extends CoreBaseController{ ValidatorBean.checkNotNull(id,"id不能为空"); toolService.deleteSysToolById(Long.parseLong(id)); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -142,7 +142,7 @@ public class SysToolController extends CoreBaseController{ SysTool tool = toolService.getSysToolById(Long.parseLong(id)); if (tool != null) { - return ResultBean.success("查询成功").setResultObject(tool).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setResultObject(tool).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }else { return ResultBean.fail("硬件不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); } @@ -158,7 +158,7 @@ public class SysToolController extends CoreBaseController{ public ResultBean querySysToolByPager(SysTool tool, Pager pager){ try { ListPager sysSysToolListPager = toolService.querySysToolByPager(tool,pager); - return ResultBean.success("查询成功").setListPager(sysSysToolListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setListPager(sysSysToolListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -191,7 +191,7 @@ public class SysToolController extends CoreBaseController{ .build(); } toolService.deleteSysToolByIds(StringTool.getArrayLong(ids)); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolTypeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolTypeController.java index 12489de..76f0859 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolTypeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolTypeController.java @@ -53,7 +53,7 @@ public class SysToolTypeController extends CoreBaseController{ ConvertBean.modelInitialize(toolType, AuthUtil.getSessionUser()); toolTypeService.insertSysToolType(toolType); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -75,7 +75,7 @@ public class SysToolTypeController extends CoreBaseController{ ConvertBean.modelUpdate(toolType,user); toolTypeService.updateSysToolType(toolType); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -98,7 +98,7 @@ public class SysToolTypeController extends CoreBaseController{ } toolTypeService.deleteSysToolTypeById(Long.parseLong(idStr)); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); return ResultBean.fail(busExcep); @@ -129,7 +129,7 @@ public class SysToolTypeController extends CoreBaseController{ SysToolType toolType = toolTypeService.getSysToolTypeById(Long.parseLong(id)); if (toolType != null) { - return ResultBean.success("查询成功").setResultObject(toolType).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setResultObject(toolType).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }else { return ResultBean.fail("硬件不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); } @@ -145,7 +145,7 @@ public class SysToolTypeController extends CoreBaseController{ public ResultBean querySysToolTypeByPager(SysToolType toolType, Pager pager){ try { ListPager sysDictionaryListPager = toolTypeService.querySysToolTypeByPager(toolType,pager); - return ResultBean.success("查询成功").setListPager(sysDictionaryListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setListPager(sysDictionaryListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); return ResultBean.fail(busExcep); @@ -166,7 +166,7 @@ public class SysToolTypeController extends CoreBaseController{ .build(); } toolTypeService.deleteSysToolTypeByIds(StringTool.getArrayLong(ids)); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java index 6be7b5b..e41dd95 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java @@ -293,7 +293,7 @@ public class SysUserController extends CoreBaseController{ } sysUserService.deleteBatchSysUserById(StringTool.getArrayLong(ids),AuthUtil.getSessionUser()); - return ResultBean.success("删除成功") + return ResultBean.success("操作成功") .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java index d49a53e..e0b400a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java @@ -81,7 +81,7 @@ public class SysUserInfoController extends CoreBaseController{ sysUserInfoService.refreshRefUserOrganize(info.getId(), userInfo.getDepartment().getOrganizeId(),user.getUserName()); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(info); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(info); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); } catch (Exception e) { @@ -106,7 +106,7 @@ public class SysUserInfoController extends CoreBaseController{ sysUserInfoService.refreshRefUserOrganize(userInfo.getId(), userInfo.getDepartment().getOrganizeId(),user.getUserName()); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); } catch (Exception e) { @@ -122,7 +122,7 @@ public class SysUserInfoController extends CoreBaseController{ ValidatorBean.checkNotNull(id,"id为空"); sysUserInfoService.deleteSysUserInfoById(Long.parseLong(id)); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); } catch (Exception e) { @@ -168,7 +168,7 @@ public class SysUserInfoController extends CoreBaseController{ .notNull("id",userInfo.getId()); if(userInfo != null){ - return ResultBean.success("查询成功").setResultObject(userInfo).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setResultObject(userInfo).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }else { return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); } @@ -192,7 +192,7 @@ public class SysUserInfoController extends CoreBaseController{ .build(); } sysUserInfoService.deleteSysUserInfoByIds(StringTool.getArrayLong(ids)); - return ResultBean.success("删除成功") + return ResultBean.success("操作成功") .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); @@ -378,7 +378,7 @@ public class SysUserInfoController extends CoreBaseController{ @ApiOperation(value = "获取用户可导出字段") public ResultBean getSysUserInfoColName(){ try { - return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultMap(ExcelUtil.getColName(SysUserInfo.class)); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultMap(ExcelUtil.getColName(SysUserInfo.class)); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){