From f22902426a9538825a94a9cbafb6381fc5c5ec2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=AE=E7=AC=91=E7=9D=80=E9=9D=A2=E5=AF=B9=E6=98=8E?= =?UTF-8?q?=E5=A4=A9?= <752558143@qq.com> Date: Thu, 30 May 2024 18:43:18 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8A=A0=E8=8F=9C=E5=8D=95=E7=BF=BB?= =?UTF-8?q?=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/api/iservice/busi/ISysRoleService.java | 2 ++ .../core/apiservice/controller/DemoController.java | 21 ++++++++++++++++++++ .../controller/busi/SysRoleController.java | 3 +++ .../serviceimpl/busi/SysMenuService.java | 2 +- .../serviceimpl/busi/SysRoleService.java | 23 ++++++++++++++++++++++ 5 files changed, 50 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysRoleService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysRoleService.java index b8bdedd..aed67fa 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysRoleService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysRoleService.java @@ -106,4 +106,6 @@ public interface ISysRoleService extends ICrudService { */ @ApiOperation(value = "新增角色菜单权限变更日志") SysLogRoleMenuChange insertSysLogRoleMenuChange(SysLogRoleMenuChange sysLogRoleMenuChange); + + List setLanguageSysMenuName(String languageCode, List menuList); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoController.java index 3554460..f26fb1c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoController.java @@ -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(); + } + } } 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 64bdae8..c308910 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 @@ -514,6 +514,9 @@ public class SysRoleController extends CrudBaseController { List sysRefRoleMenuList = sysRoleService.findSysRefRoleMenuByRoleId(roleId, softType); + sysRefRoleMenuList = sysRoleService.setLanguageSysMenuName(AuthUtil.getSessionUser().getLanguageCode(), sysRefRoleMenuList); + + return ResultBean.success("操作成功") .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) .setResultList(sysRefRoleMenuList); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java index e73aa55..13dd6b9 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java @@ -45,7 +45,7 @@ public class SysMenuService extends CrudService implements ISysMenuServ /** * 功能权限国际化 */ - private final static Map> MEM_CACHE_LANGAGE = new HashMap<>(); + public final static Map> MEM_CACHE_LANGAGE = new HashMap<>(); @Autowired private SysMenuRepository sysMenuRDao; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java index 05048c0..4a278c4 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java @@ -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 implements ISysRoleServ LOGGER.debug("平台角色菜单权限变更操作记录 SysLogRoleOperate sysLogRoleOperate:{}", sysLogRoleMenuChange); return sysLogRoleMenuChangeRDao.insert(sysLogRoleMenuChange); } + @Override + public List setLanguageSysMenuName(String languageCode, List menuList) { + languageCode = StringUtils.isNotBlank(languageCode) ? languageCode : CommonConstWords.DEFAULT_LANGUAGE; + Map localeResourceMap = SysMenuService.MEM_CACHE_LANGAGE.get(languageCode); + + if (menuList != null && localeResourceMap != null) { + List resultList = (List) 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() { From 4ad91ff7f11e67502e19be49915c6f93f736b355 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=AE=E7=AC=91=E7=9D=80=E9=9D=A2=E5=AF=B9=E6=98=8E?= =?UTF-8?q?=E5=A4=A9?= <752558143@qq.com> Date: Thu, 30 May 2024 20:14:10 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8A=A0=E8=8F=9C=E5=8D=95=E7=BF=BB?= =?UTF-8?q?=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/core/apiservice/controller/base/AuthController.java | 3 +++ .../core/apiservice/controller/busi/SysMemTreeController.java | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java index 302c7ae..4cff3bb 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java @@ -275,7 +275,10 @@ public class AuthController extends CoreBaseController { } else { List 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 升序 diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMemTreeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMemTreeController.java index 8154bf3..2e6e858 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMemTreeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMemTreeController.java @@ -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); From 2f1bd72eff1b7b7d8aefe8e4b58c81bc4b22995e Mon Sep 17 00:00:00 2001 From: jiajia Date: Fri, 31 May 2024 16:22:47 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8D=95=E5=8F=B7?= =?UTF-8?q?=E8=A7=84=E5=88=99=E7=99=BD=E5=90=8D=E5=8D=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/base/WhiteController.java | 44 ++++++++++++++++++++++ .../serviceimpl/base/SynchronizedService.java | 5 ++- 2 files changed, 48 insertions(+), 1 deletion(-) 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 ba4961b..b47d67f 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 @@ -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 单号规则代码 diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SynchronizedService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SynchronizedService.java index 091ef64..d1bffbe 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SynchronizedService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SynchronizedService.java @@ -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()) {