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

Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core

Browse Source 
# Conflicts:
#	modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ILogOperateService.java
#	modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogOperateService.java

语言管理 完成
资源管理 完成
yun-zuoyi
yunhao.wang 7 years ago
parent 984d2dd7b3
commit 9d61f5a6a5
6 changed files with 79 additions and 10 deletions
Show Stats Download Patch File Download Diff File

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

@ -131,4 +131,11 @@ public class EnumController {
return new ResultBean(true, "操作成功",
Arrays.asList(ImppEnumUtil.SYS_CONFIG_TYPE.values()));
}
@GetMapping("/sys-locale-resource-type")
@ApiOperation(value = "系统资源类型")
public ResultBean getSysLocaleResourceType(){
return new ResultBean(true, "操作成功",
Arrays.asList(CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.values()));
}
}

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

@ -73,7 +73,7 @@ public class SysLocaleLanguageController extends CoreBaseController {
//修改初始化
// ConvertBean.modelUpdate(sysLocaleLanguage, sessionUser);
sysLocaleLanguageService.insertSysLocaleLanguage(sysLocaleLanguage);
sysLocaleLanguageService.updateSysLocaleLanguage(sysLocaleLanguage);
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
return ResultBean.fail(busExcep.getErrorShow());

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

@ -11,6 +11,7 @@ import cn.estsh.impp.framework.base.controller.CoreBaseController;
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import cn.estsh.impp.framework.boot.util.ImppRedis;
import cn.estsh.impp.framework.boot.util.ResultBean;
import cn.estsh.impp.framework.boot.util.ValidatorBean;
import io.swagger.annotations.Api;
@ -20,6 +21,8 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
/**
@ -35,6 +38,9 @@ import java.util.List;
public class SysLocaleResourceController extends CoreBaseController {
public static final Logger LOGGER = LoggerFactory.getLogger(SysFileController.class);
@Resource(name="redisRes")
private ImppRedis redisRes;
@Autowired
private ISysLocaleResourceService sysLocaleResourceService;
@ -50,10 +56,15 @@ public class SysLocaleResourceController extends CoreBaseController {
.notNull("resourceValue",sysLocaleResource.getResourceValue());
//新增初始化
ConvertBean.modelInitialize(sysLocaleResource, sessionUser);
// ConvertBean.modelInitialize(sysLocaleResource, sessionUser);
sysLocaleResource.setIsSystem(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
sysLocaleResourceService.insertSysLocaleResource(sysLocaleResource);
sysLocaleResource = sysLocaleResourceService.insertSysLocaleResource(sysLocaleResource);
// 放入缓存
HashMap<String,String> resource = new HashMap<String,String>();
resource.put(sysLocaleResource.getLanguageCode(),sysLocaleResource.getResourceValue());
redisRes.putHashMap(sysLocaleResource.getResourceKey(),resource,0);
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
return ResultBean.fail(busExcep.getErrorShow());
@ -75,9 +86,14 @@ public class SysLocaleResourceController extends CoreBaseController {
.notNull("resourceValue",sysLocaleResource.getResourceValue());
//修改初始化
ConvertBean.modelUpdate(sysLocaleResource, sessionUser);
// ConvertBean.modelUpdate(sysLocaleResource, sessionUser);
sysLocaleResourceService.updateSysLocaleResource(sysLocaleResource);
sysLocaleResourceService.insertSysLocaleResource(sysLocaleResource);
// 放入缓存
HashMap<String,String> resource = new HashMap<String,String>();
resource.put(sysLocaleResource.getLanguageCode(),sysLocaleResource.getResourceValue());
redisRes.putHashMap(sysLocaleResource.getResourceKey(),resource,0);
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
return ResultBean.fail(busExcep.getErrorShow());

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

@ -7,14 +7,12 @@ import cn.estsh.i3plus.pojo.base.common.PagerHelper;
import cn.estsh.i3plus.pojo.platform.bean.LogSystem;
import cn.estsh.i3plus.pojo.platform.repositorymongo.LogSystemRepository;
import cn.estsh.i3plus.pojo.platform.sqlpack.CoreBsonPack;
import io.swagger.annotations.ApiOperation;
import org.bson.conversions.Bson;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**

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

@ -7,10 +7,12 @@ import cn.estsh.i3plus.pojo.base.common.PagerHelper;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
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;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@ -32,6 +34,9 @@ public class SysLocaleLanguageService implements ISysLocaleLanguageService {
@Autowired
private SysLocaleLanguageRepository sysLocaleLanguageRDao;
@Autowired
private SysLocaleResourceRepository sysLocaleResourceRDao;
@Override
public SysLocaleLanguage insertSysLocaleLanguage(SysLocaleLanguage sysLocaleLanguage) {
LOGGER.info("系统语言 SYS_LOCALE_LANGUAGE SysLocaleLanguage:{}",sysLocaleLanguage);
@ -50,7 +55,8 @@ public class SysLocaleLanguageService implements ISysLocaleLanguageService {
@Override
public void updateSysLocaleLanguage(SysLocaleLanguage sysLocaleLanguage) {
LOGGER.info("系统语言 SYS_LOCALE_LANGUAGE SysLocaleLanguage:{}",sysLocaleLanguage);
SysLocaleLanguage data = sysLocaleLanguageRDao.getById(sysLocaleLanguage.getId());
String hqlPack = CoreHqlPack.packHqlSysLocaleLanguageCode(sysLocaleLanguage);
int count = sysLocaleLanguageRDao.findByHqlWhereCount(hqlPack);
if (count > 0){
@ -62,12 +68,29 @@ public class SysLocaleLanguageService implements ISysLocaleLanguageService {
.build();
}
// 根据资源中的语言代码和名称
sysLocaleResourceRDao.updateByProperties(
"languageCode", data.getLanguageCode(),
new String[]{"languageCode", "languageNameRdd"},
new Object[]{sysLocaleLanguage.getLanguageCode(), sysLocaleLanguage.getLanguageName()}
);
sysLocaleLanguageRDao.update(sysLocaleLanguage);
}
@Override
public void deleteSysLocaleLanguageById(String idStr) {
LOGGER.info("系统语言 SYS_LOCALE_LANGUAGE id:{}",idStr);
SysLocaleLanguage sysLocaleLanguage = sysLocaleLanguageRDao.getById(Long.parseLong(idStr));
ValidatorBean.checkNotNull(sysLocaleLanguage,"需要删除的资源不存在");
if(sysLocaleResourceRDao.isExitByProperty("languageCode",sysLocaleLanguage.getLanguageCode())){
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())
.setErrorDetail("存在关联资源无法删除")
.build();
}
sysLocaleLanguageRDao.deleteById(Long.parseLong(idStr));
}
@ -109,4 +132,9 @@ public class SysLocaleLanguageService implements ISysLocaleLanguageService {
sysLocaleLanguageRDao.updateByProperties("id",Long.parseLong(idStr),
"isDefault",CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
}
@Override
public SysLocaleLanguage getSysLocaleLanguageByCode(String code) {
return sysLocaleLanguageRDao.getByProperty("languageCode",code);
}
}

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

@ -5,11 +5,15 @@ import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.common.PagerHelper;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.SysLocaleLanguage;
import cn.estsh.i3plus.pojo.platform.bean.SysLocaleResource;
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.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import cn.estsh.impp.framework.boot.util.ValidatorBean;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@ -31,10 +35,14 @@ public class SysLocaleResourceService implements ISysLocaleResourceService {
@Autowired
private SysLocaleResourceRepository sysLocaleResourceRDao;
@Autowired
private SysLocaleLanguageRepository sysLocaleLanguageRDao;
@Override
@ApiOperation(value = "新增系统资源")
public SysLocaleResource insertSysLocaleResource(SysLocaleResource sysLocaleResource) {
LOGGER.info("系统资源 SYS_LOCALE_RESOURCE SysLocaleResource：{}",sysLocaleResource);
int count = sysLocaleResourceRDao.findByPropertyCount(new String[]{"language_code","resource_key"},
int count = sysLocaleResourceRDao.findByPropertyCount(new String[]{"languageCode","resourceKey"},
new String[]{sysLocaleResource.getLanguageCode(),sysLocaleResource.getResourceKey()});
if (count > 0){
throw ImppExceptionBuilder.newInstance()
@ -45,6 +53,12 @@ public class SysLocaleResourceService implements ISysLocaleResourceService {
.build();
}
// 设置语言名称冗余
SysLocaleLanguage sysLocaleLanguage = sysLocaleLanguageRDao.getByProperty("languageCode",
sysLocaleResource.getLanguageCode());
ValidatorBean.checkNotNull(sysLocaleLanguage,"选中的语言不存在");
sysLocaleResource.setLanguageNameRdd(sysLocaleLanguage.getLanguageName());
return sysLocaleResourceRDao.insert(sysLocaleResource);
}
@ -62,6 +76,12 @@ public class SysLocaleResourceService implements ISysLocaleResourceService {
.build();
}
// 设置语言名称冗余
SysLocaleLanguage sysLocaleLanguage = sysLocaleLanguageRDao.getByProperty("languageCode",
sysLocaleResource.getLanguageCode());
ValidatorBean.checkNotNull(sysLocaleLanguage,"选中的语言不存在");
sysLocaleResource.setLanguageNameRdd(sysLocaleLanguage.getLanguageName());
sysLocaleResourceRDao.update(sysLocaleResource);
}

Write Preview
Loading…
Cancel
Save