From b7500c7324d901c1cf602484d3e5a09901225aa6 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Tue, 20 Nov 2018 18:46:33 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=B5=84=E6=BA=90=20?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iservice/busi/ISysLocaleLanguageService.java | 5 +++ .../iservice/busi/ISysLocaleResourceService.java | 3 ++ .../busi/SysLocaleLanguageController.java | 45 +++++++++++++++++++--- .../busi/SysLocaleResourceController.java | 22 ++++++++++- .../serviceimpl/busi/SysLocaleLanguageService.java | 22 +++++++++-- .../serviceimpl/busi/SysLocaleResourceService.java | 5 +++ 6 files changed, 92 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLocaleLanguageService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLocaleLanguageService.java index 4a3cd26..64efd55 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLocaleLanguageService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLocaleLanguageService.java @@ -39,4 +39,9 @@ public interface ISysLocaleLanguageService { @ApiOperation(value = "根据code查询语言") SysLocaleLanguage getSysLocaleLanguageByCode(String code); + + @ApiOperation(value = "根据语言id修改语言状态") + void updateSysLocaleLanguageStatusById(Long id,Integer status); + + void updateSysLocaleLanguageStatusByIds(Long[] ids,Integer status); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLocaleResourceService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLocaleResourceService.java index 3059734..2a5b5ea 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLocaleResourceService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLocaleResourceService.java @@ -33,4 +33,7 @@ public interface ISysLocaleResourceService { @ApiOperation(value = "根据id批量删除",notes = "根据id批量删除") void deleteSysLocaleResourceByIds(Long[] ids); + + @ApiOperation(value = "批量添加") + void insertSysLocaleResourceList(List sysLocaleResources); } 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 4e9f941..d3e5206 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 @@ -1,7 +1,6 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysLocaleLanguageService; -import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.StringTool; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; @@ -49,8 +48,8 @@ public class SysLocaleLanguageController extends CoreBaseController { .notNull("languageCode", sysLocaleLanguage.getLanguageCode()); //新增初始化 -// ConvertBean.modelInitialize(sysLocaleLanguage, sessionUser); sysLocaleLanguage.setIsDefault(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); + sysLocaleLanguage.setLanguageStatus(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); sysLocaleLanguageService.insertSysLocaleLanguage(sysLocaleLanguage); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); @@ -71,9 +70,6 @@ public class SysLocaleLanguageController extends CoreBaseController { .notNull("languageName", sysLocaleLanguage.getLanguageName()) .notNull("languageCode", sysLocaleLanguage.getLanguageCode()); - //修改初始化 -// ConvertBean.modelUpdate(sysLocaleLanguage, sessionUser); - sysLocaleLanguageService.updateSysLocaleLanguage(sysLocaleLanguage); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ @@ -161,4 +157,43 @@ public class SysLocaleLanguageController extends CoreBaseController { return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } + + @PostMapping(value = "/status/{id}/{status}") + @ApiOperation(value = "根据id修改语言状态") + public ResultBean updateSysLocaleLanguageStatusById(@PathVariable("id") String idStr,@PathVariable("status") Integer status){ + try { + //条件校验 + ValidatorBean.checkNotNull(idStr,"id不能为空"); + ValidatorBean.checkIsNumber(status,"状态不能为空"); + + sysLocaleLanguageService.updateSysLocaleLanguageStatusById(Long.parseLong(idStr),status); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @PostMapping(value = "/batch-status") + @ApiOperation(value = "根据批量修改语言状态") + public ResultBean updateSysLocaleLanguageStatusByIds(String[] idsStr,Integer status){ + try { + if(idsStr.length == 0){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("请选择需要删除的资源。") + .build(); + } + ValidatorBean.checkNotZero(status,"状态不能为0"); + + sysLocaleLanguageService.updateSysLocaleLanguageStatusByIds(StringTool.getArrayLong(idsStr),status); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(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 62b2c28..fdd55c4 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 @@ -1,7 +1,6 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysLocaleResourceService; -import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.StringTool; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; @@ -165,4 +164,25 @@ public class SysLocaleResourceController extends CoreBaseController { return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } + + @PutMapping(value = "batch-insert") + @ApiOperation(value = "批量添加系统资源") + public ResultBean insertSysLocaleResourceList(@RequestBody List sysLocaleResourcesList){ + try { + if(sysLocaleResourcesList.size() == 0){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("请选择需要删除的资源。") + .build(); + } + System.out.println(sysLocaleResourcesList); + sysLocaleResourceService.insertSysLocaleResourceList(sysLocaleResourcesList); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleLanguageService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleLanguageService.java index 89f8afb..6b85de1 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleLanguageService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleLanguageService.java @@ -9,7 +9,6 @@ import cn.estsh.i3plus.pojo.platform.bean.SysLocaleLanguage; import cn.estsh.i3plus.pojo.platform.repository.SysLocaleLanguageRepository; import cn.estsh.i3plus.pojo.platform.repository.SysLocaleResourceRepository; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; -import cn.estsh.impp.framework.base.service.IBaseService; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ValidatorBean; @@ -103,7 +102,6 @@ public class SysLocaleLanguageService implements ISysLocaleLanguageService { @Override public ListPager querySysLocaleLanguageByPager(SysLocaleLanguage sysLocaleLanguage, Pager pager) { - LOGGER.info("系统语言 SYS_LOCALE_LANGUAGE sysLocaleLanguage:{},Pager:{}",sysLocaleLanguage,pager); if(sysLocaleLanguage == null) { pager = PagerHelper.getPager(pager, sysLocaleLanguageRDao.listCount()); return new ListPager(sysLocaleLanguageRDao.listPager(pager),pager); @@ -116,13 +114,19 @@ public class SysLocaleLanguageService implements ISysLocaleLanguageService { @Override public void deleteSysLocaleLanguageByIds(Long[] ids) { - LOGGER.info("系统语言 SYS_LOCALE_LANGUAGE ids:{}",ids); + if(sysLocaleResourceRDao.findByHqlWhereCount(CoreHqlPack.packHqlIds("id",ids)) > 0){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) + .setErrorDetail("存在关联资源无法删除") + .build(); + } + sysLocaleLanguageRDao.deleteByIds(ids); } @Override public void updateSysLocaleLanguageDefaultById(Long ids) { - LOGGER.info("系统语言 SYS_LOCALE_LANGUAGE ids:{}",ids); sysLocaleLanguageRDao.updateByHqlWhere("and 1=1","isDefault",CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); sysLocaleLanguageRDao.updateByProperties("id",ids, @@ -133,4 +137,14 @@ public class SysLocaleLanguageService implements ISysLocaleLanguageService { public SysLocaleLanguage getSysLocaleLanguageByCode(String code) { return sysLocaleLanguageRDao.getByProperty("languageCode",code); } + + @Override + public void updateSysLocaleLanguageStatusById(Long id, Integer status) { + sysLocaleLanguageRDao.updateByProperties("id",id,"languageStatus",status); + } + + @Override + public void updateSysLocaleLanguageStatusByIds(Long[] ids, Integer status) { + sysLocaleLanguageRDao.updateByHqlWhere(CoreHqlPack.packHqlIds("id",ids),"languageStatus",status); + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java index 25fac4b..ae7f1d8 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java @@ -115,4 +115,9 @@ public class SysLocaleResourceService implements ISysLocaleResourceService { LOGGER.info("系统资源 SYS_LOCALE_RESOURCE ids：{}",ids); sysLocaleResourceRDao.deleteByIds(ids); } + + @Override + public void insertSysLocaleResourceList(List sysLocaleResourcesList) { + sysLocaleResourceRDao.saveAll(sysLocaleResourcesList); + } }