I3_YF_SEAT
/
impp-core
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
yun-zuoyi
wei.peng 7 years ago
parent 49b65a92bc cf633033a3
commit 2d7d61eb1c
6 changed files with 92 additions and 10 deletions
Show Stats Download Patch File Download Diff File

5
modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLocaleLanguageService.java
Unescape Escape View File

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

3
modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLocaleResourceService.java
Unescape Escape View File

@ -33,4 +33,7 @@ public interface ISysLocaleResourceService {
@ApiOperation(value = "根据id批量删除",notes = "根据id批量删除")
void deleteSysLocaleResourceByIds(Long[] ids);
@ApiOperation(value = "批量添加")
void insertSysLocaleResourceList(List<SysLocaleResource> sysLocaleResources);
}

45
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleLanguageController.java
Unescape Escape View File

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

22
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java
Unescape Escape View File

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

22
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleLanguageService.java
Unescape Escape View File

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

5
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java
Unescape Escape View File

@ -115,4 +115,9 @@ public class SysLocaleResourceService implements ISysLocaleResourceService {
LOGGER.info("系统资源 SYS_LOCALE_RESOURCE ids：{}",ids);
sysLocaleResourceRDao.deleteByIds(ids);
}
@Override
public void insertSysLocaleResourceList(List<SysLocaleResource> sysLocaleResourcesList) {
sysLocaleResourceRDao.saveAll(sysLocaleResourcesList);
}
}

Write Preview
Loading…
Cancel
Save