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

Merge remote-tracking branch 'upstream/test' into test

Browse Source
yun-zuoyi
administrator 11 months ago
parent 28fb9c4a3b 2f1bd72eff
commit 78e4d85040
9 changed files with 106 additions and 7 deletions
Show Stats Download Patch File Download Diff File

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

@ -106,4 +106,6 @@ public interface ISysRoleService extends ICrudService<SysRole> {
*/
@ApiOperation(value = "新增角色菜单权限变更日志")
SysLogRoleMenuChange insertSysLogRoleMenuChange(SysLogRoleMenuChange sysLogRoleMenuChange);
List<SysRefRoleMenu> setLanguageSysMenuName(String languageCode, List<SysRefRoleMenu> menuList);
}

21
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoController.java
Unescape Escape View File

@ -1,20 +1,27 @@
package cn.estsh.i3plus.core.apiservice.controller;
import cn.estsh.i3plus.core.api.iservice.busi.IPersonnelService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysPojoVersionPlanService;
import cn.estsh.i3plus.platform.common.tool.StringTool;
import cn.estsh.i3plus.platform.common.util.CommonConstWords;
import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersion;
import cn.estsh.i3plus.pojo.platform.bean.SysUser;
import cn.estsh.i3plus.pojo.platform.repository.SysLogUserLoginRepository;
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.util.ImppRedis;
import cn.estsh.impp.framework.boot.util.ResultBean;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@ -42,6 +49,8 @@ public class DemoController extends CoreBaseController {
@Autowired
private ISysPojoVersionPlanService pojoVersionPlanService;
@Autowired
private IPersonnelService personnelService;
@GetMapping(value = "/redis/update")
@ApiOperation(value = "添加操作日志", notes = "添加操作日志，可用于国际化")
@ -70,6 +79,18 @@ public class DemoController extends CoreBaseController {
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@PostMapping(value = "lacjob/rabbit")
@ApiOperation(value = "空载具单据生成")
public void rabbit() {
try {
// checkUserModel(model);
personnelService.refreshRefSysUserRole(1564859495220891648l, new Long[]{200001l});
} catch (Exception e) {
e.printStackTrace();
}
}
}

3
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java
Unescape Escape View File

@ -275,7 +275,10 @@ public class AuthController extends CoreBaseController {
} else {
List<SysMenu> menuList = memTreeService.packTreeSysMenuByUserId(getSessionUser().getUser().getId());
list = memTreeService.packTreeSysMenuByParentIdAndMenuType(menuList, CommonConstWords.SYSTEM_MENU_ROOT_ID, CommonEnumUtil.METHOD_LEVEL.PLUGIN.getValue());
}
list = sysMenuService.setLanguageSysMenuName(AuthUtil.getSessionUser().getLanguageCode(), list);
if (list != null && list.size() > 0) {
// 内存排序 Sort 降序 code 升序

44
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java
Unescape Escape View File

@ -177,6 +177,9 @@ public class WhiteController extends CoreBaseController {
@Autowired
private ICoreMemTreeService memTreeService;
@Autowired
private ISysOrderNoRuleService sysOrderNoRuleService;
@Value(value = "${filter.ding.menu.parent.id}")
private Long filterDingPmcParentMenuId;
@ -764,6 +767,47 @@ public class WhiteController extends CoreBaseController {
}
/**
* 新增单号规则
* @param sysOrderNoRule 单号规则
* @return 处理结果
*/
@PostMapping(value = "/insert")
@ApiOperation(value = "新增单号规则")
public ResultBean insertSysOrderNoRule(SysOrderNoRule sysOrderNoRule) {
try {
// 添加校验
validatorSysOrderNoRule(sysOrderNoRule);
sysOrderNoRule.setOrderNoRuleStatus(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
sysOrderNoRule.setSerialNo(CommonEnumUtil.PARENT.DEFAULT.getValue());
sysOrderNoRuleService.insertSysOrderNoRule(sysOrderNoRule);
return ResultBean.success("操作成功").setResultObject(sysOrderNoRule).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep);
} catch (Exception e) {
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
/**
* 对象添加校验
*
* @param sysOrderNoRule 校验对象
* @throws NoSuchFieldException
*/
private void validatorSysOrderNoRule(SysOrderNoRule sysOrderNoRule) throws NoSuchFieldException {
ValidatorBean.beginValid(sysOrderNoRule)
.notNull("name", sysOrderNoRule.getName())
.notNull("orderNoRuleCode", sysOrderNoRule.getOrderNoRuleCode())
.notNull("orderNoRule", sysOrderNoRule.getOrderNoRule())
.checkNotZero("serialNoSeed", sysOrderNoRule.getSerialNoSeed())
.checkNotZero("serialNoIncrement", sysOrderNoRule.getSerialNoIncrement())
.checkNotZero("serialNoLength", sysOrderNoRule.getSerialNoLength())
.checkNotZero("isCycle", sysOrderNoRule.getIsCycle());
}
/**
* 根据单号规则代码，生成单号
*
* @param code 单号规则代码

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

@ -1,9 +1,6 @@
package cn.estsh.i3plus.core.apiservice.controller.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ICoreMemTreeService;
import cn.estsh.i3plus.core.api.iservice.busi.IPersonnelService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysOrganizeService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysPositionService;
import cn.estsh.i3plus.core.api.iservice.busi.*;
import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
@ -47,7 +44,8 @@ public class SysMemTreeController extends CoreBaseController {
@Autowired
private ISysOrganizeService organizeService;
@Autowired
private ISysMenuService sysMenuService;
/**
* 根据父节点ID 获取树列表
* @return 处理结果
@ -224,6 +222,8 @@ public class SysMemTreeController extends CoreBaseController {
}else{
result = memTreeService.packTreeSysMenuByUserId(getSessionUser().getUser().getId());
}
result = sysMenuService.setLanguageSysMenuName(AuthUtil.getSessionUser().getLanguageCode(), result);
return ResultBean.success("操作成功").setResultList(result).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
return ResultBean.fail(busExcep);

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

@ -514,6 +514,9 @@ public class SysRoleController extends CrudBaseController<SysRole> {
List<SysRefRoleMenu> sysRefRoleMenuList = sysRoleService.findSysRefRoleMenuByRoleId(roleId, softType);
sysRefRoleMenuList = sysRoleService.setLanguageSysMenuName(AuthUtil.getSessionUser().getLanguageCode(), sysRefRoleMenuList);
return ResultBean.success("操作成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultList(sysRefRoleMenuList);

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

@ -8,6 +8,7 @@ import cn.estsh.i3plus.platform.common.util.CommonConstWords;
import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.SysOrderNoRule;
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.util.ImppRedis;
import org.apache.commons.collections.CollectionUtils;
@ -185,7 +186,9 @@ public class SynchronizedService implements ISynchronizedService {
// 生成单号更缓存
return orderNoRuleList;
} catch (Exception e) {
} catch (ImppBusiException e) {
throw e;
} catch (Exception e) {
LOGGER.error("生成单号失败,单号代码:{},num:{}", code, num, e);
} finally {
if (rLock.isHeldByCurrentThread()) {

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

@ -45,7 +45,7 @@ public class SysMenuService extends CrudService<SysMenu> implements ISysMenuServ
/**
* 功能权限国际化
*/
private final static Map<String, Map<String, String>> MEM_CACHE_LANGAGE = new HashMap<>();
public final static Map<String, Map<String, String>> MEM_CACHE_LANGAGE = new HashMap<>();
@Autowired
private SysMenuRepository sysMenuRDao;

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

@ -6,6 +6,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysRoleService;
import cn.estsh.i3plus.core.apiservice.dao.IUserPermissionDao;
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
import cn.estsh.i3plus.platform.common.tool.SerializeTool;
import cn.estsh.i3plus.platform.common.util.CommonConstWords;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
@ -39,7 +40,9 @@ import org.springframework.util.ObjectUtils;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import static cn.estsh.i3plus.platform.common.util.CommonConstWords.RESOURCE_PREFIX_MENU;
import static cn.estsh.i3plus.platform.common.util.PlatformConstWords.IMPP_REQUEST_ID;
import static cn.estsh.i3plus.platform.common.util.PlatformConstWords.SQL_SERVER_PARAM_MAX_MUM;
@ -464,7 +467,27 @@ public class SysRoleService extends CrudService<SysRole> implements ISysRoleServ
LOGGER.debug("平台角色菜单权限变更操作记录 SysLogRoleOperate sysLogRoleOperate:{}", sysLogRoleMenuChange);
return sysLogRoleMenuChangeRDao.insert(sysLogRoleMenuChange);
}
@Override
public List<SysRefRoleMenu> setLanguageSysMenuName(String languageCode, List<SysRefRoleMenu> menuList) {
languageCode = StringUtils.isNotBlank(languageCode) ? languageCode : CommonConstWords.DEFAULT_LANGUAGE;
Map<String, String> localeResourceMap = SysMenuService.MEM_CACHE_LANGAGE.get(languageCode);
if (menuList != null && localeResourceMap != null) {
List<SysRefRoleMenu> resultList = (List<SysRefRoleMenu>) SerializeTool.copyObject(menuList);
for (SysRefRoleMenu menu : resultList) {
if (menu != null) {
if (StringUtils.isNotBlank(menu.getMenuNameRdd())) {
String menuName = localeResourceMap.get(RESOURCE_PREFIX_MENU + menu.getMenuNameRdd());
menu.setMenuNameRdd(StringUtils.isNotBlank(menuName) ? menuName : menu.getMenuNameRdd());
}
}
}
return resultList;
}
return menuList;
}
// @Override
// public void packAfterRefreshCache() {

Write Preview
Loading…
Cancel
Save