From e873d08e06a4a834b9d0b9cb755b75aee0698740 Mon Sep 17 00:00:00 2001 From: "zhang.xw" Date: Sun, 27 Nov 2022 11:40:05 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=85=8D=E7=99=BB=E5=BD=95=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/base/WhiteController.java | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) 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 2ff6038..bd2a7df 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 @@ -66,6 +66,7 @@ import com.taobao.api.ApiException; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.val; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.map.HashedMap; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authc.*; @@ -1597,4 +1598,44 @@ public class WhiteController extends CoreBaseController { } return result; } + /** + * 获取未用户功能权限信息 + * + * @param parentId 菜单id + * @return 处理结果 + */ + @GetMapping(value = "/no/login/menu/list") + @ApiOperation(value = "获取登录用户功能权限信息", notes = "获取首页权限信息") + public ResultBean findModuleListByNoLogin(@RequestParam String parentId, @RequestParam String userId) { + try { + ValidatorBean.checkIsNumber(parentId, "父节点不能为空"); + + List result = memTreeService.packTreeSysMenuByUserIdAndParentId(Long.valueOf(userId), Long.parseLong(parentId)); + result = findChildList(result); + + return ResultBean.success("操作成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + .setResultList(result); + } catch (ImppBusiException busExcep) { + LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep); + return ResultBean.fail(busExcep); + } catch (Exception e) { + LOGGER.error(LocaleUtils.getEnumLocaleResDesc(ImppExceptionEnum.SYSTEM_EXCEPTION, + ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription()) + "：{}", e.getMessage(), e); + return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + } + } + + private List findChildList(List findList) { + List result = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(findList)) { + for (SysMenu menu : findList) { + if (CollectionUtils.isNotEmpty(menu.getChildList())) { + result.addAll(findChildList(menu.getChildList())); + } + result.add(menu); + } + } + return result; + } } From 25f6bebf94844ddb4ed7577b16e44cb939168907 Mon Sep 17 00:00:00 2001 From: "zhang.xw" Date: Mon, 28 Nov 2022 16:21:34 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=9D=83=E9=99=90=E5=8B=BE=E9=80=89?= =?UTF-8?q?=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/controller/busi/SysRoleController.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) 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 6585b68..6e6908e 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 @@ -25,6 +25,7 @@ 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 cn.estsh.impp.framework.boot.util.ValidatorBean; +import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.collections.CollectionUtils; @@ -401,7 +402,9 @@ public class SysRoleController extends CrudBaseController { ValidatorBean.beginValid(refRoleMenu) .notNull("roleId", refRoleMenu.getRoleId()) .notNull("softType", refRoleMenu.getSoftType()); - + if (CollectionUtils.isEmpty(refRoleMenu.getMenuIdList())) { + throw ImppExceptionBuilder.newInstance().setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()).setErrorCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode()).setErrorDetail("未勾选菜单").build(); + } sysRoleService.refreshSysRoleRef(refRoleMenu.getRoleId(), refRoleMenu.getSoftType(), refRoleMenu.getMenuIdList() , AuthUtil.getSessionUser().getUserName()); @@ -488,4 +491,14 @@ public class SysRoleController extends CrudBaseController { } } + public static void main(String[] args) { + String aa ="{\"roleId\":\"1161540710735032320\",\"softType\":3,\"menuIdList\":[]}"; + JSONObject bb = (JSONObject) JSONObject.toJSON(aa); + + SysRefRoleMenu sysRefRoleMenu = JSONObject.toJavaObject(bb, SysRefRoleMenu.class); + if (CollectionUtils.isEmpty(sysRefRoleMenu.getMenuIdList())) { + System.out.println(true); + } + } + } From e9aa50d303c2858a151a320697d026b01b864f30 Mon Sep 17 00:00:00 2001 From: "zhang.xw" Date: Mon, 28 Nov 2022 16:21:56 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=9D=83=E9=99=90=E5=8B=BE=E9=80=89?= =?UTF-8?q?=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/apiservice/controller/busi/SysRoleController.java | 11 ----------- 1 file changed, 11 deletions(-) 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 6e6908e..6d087da 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 @@ -490,15 +490,4 @@ public class SysRoleController extends CrudBaseController { return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } - - public static void main(String[] args) { - String aa ="{\"roleId\":\"1161540710735032320\",\"softType\":3,\"menuIdList\":[]}"; - JSONObject bb = (JSONObject) JSONObject.toJSON(aa); - - SysRefRoleMenu sysRefRoleMenu = JSONObject.toJavaObject(bb, SysRefRoleMenu.class); - if (CollectionUtils.isEmpty(sysRefRoleMenu.getMenuIdList())) { - System.out.println(true); - } - } - } From cd4281226e13a29557cec295bd61c8c77567dd27 Mon Sep 17 00:00:00 2001 From: "zhang.xw" Date: Thu, 1 Dec 2022 11:32:52 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=AF=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/core/api/iservice/dto/LanguageDTO.java | 9 +++++++++ .../i3plus/core/apiservice/controller/base/WhiteController.java | 5 +++-- 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/dto/LanguageDTO.java diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/dto/LanguageDTO.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/dto/LanguageDTO.java new file mode 100644 index 0000000..9e494f9 --- /dev/null +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/dto/LanguageDTO.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.core.api.iservice.dto; + +import lombok.Data; + +@Data +public class LanguageDTO { + + private String languageCode; +} 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 bd2a7df..8ce2c2a 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 @@ -4,6 +4,7 @@ import cn.estsh.i3plus.core.api.iservice.base.ISynchronizedService; import cn.estsh.i3plus.core.api.iservice.base.ISystemInitService; import cn.estsh.i3plus.core.api.iservice.base.ISystemLoginStrategyService; import cn.estsh.i3plus.core.api.iservice.busi.*; +import cn.estsh.i3plus.core.api.iservice.dto.LanguageDTO; import cn.estsh.i3plus.core.api.iservice.dto.SysMenuDTO; import cn.estsh.i3plus.core.apiservice.controller.busi.*; import cn.estsh.i3plus.core.apiservice.util.MailUtil; @@ -513,10 +514,10 @@ public class WhiteController extends CoreBaseController { @PostMapping(value = "/find-language-code") @ApiOperation(value = "根据语言代码查询资源") - public ResultBean findSysLocaleResourceByLanguageCode(@RequestParam String languageCode) { + public ResultBean findSysLocaleResourceByLanguageCode(@RequestBody LanguageDTO languageCodeDto) { try { startMultiService(); - + String languageCode = languageCodeDto.getLanguageCode(); ValidatorBean.checkNotNull(languageCode, "语言代码不能为空"); if (sysLocaleLanguageService.getSysLocaleLanguageByCode(languageCode) == null) { throw ImppExceptionBuilder.newInstance() From c22fb6132251a4dda0b88add9dce50f0fba85f77 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Mon, 5 Dec 2022 15:08:02 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9core=20maven=E7=9A=84?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/base/WhiteController.java | 2 - pom.xml | 88 ++++++++++++---------- 2 files changed, 49 insertions(+), 41 deletions(-) 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 8ce2c2a..be7c275 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 @@ -66,7 +66,6 @@ import com.google.common.cache.CacheBuilder; import com.taobao.api.ApiException; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.val; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.map.HashedMap; import org.apache.commons.lang3.StringUtils; @@ -87,7 +86,6 @@ import java.util.*; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; import java.util.stream.Collectors; -import java.util.stream.Stream; /** * @Description : diff --git a/pom.xml b/pom.xml index 2055206..1eb31a5 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ true UTF-8 1.8 - 1.0-TEST-SNAPSHOT + 2.18.0 1.0.0.1 1.0.0.1 @@ -46,6 +46,27 @@ 2.13.2 1.0.0.1-patch 1.4.19 + 1.0.0.3 + 1.0.0.1 + 1.0.0.1 + 1.0.0.1 + 1.0.0.1 + 1.0.0.1 + 1.0.0.1 + 1.0.0.1 + 1.0.0.1 + 1.0.0.1 + 1.0.0.1 + 1.0.0.1 + 1.0.0.1 + 1.0.0.1 + 1.0.0.1 + 1.0.0.1 + 1.0.0.1 + 1.0.0.1 + 1.0.0.1 + 1.0.0.1 + 1.0.0.1 @@ -56,13 +77,14 @@ com.alibaba druid - 1.2.8 + 1.2.15 impp.framework impp-framework-boot - ${project.dependency.version} + ${impp.framework.boot.version} + @@ -81,66 +103,62 @@ i3plus.core i3plus-core-icloud - ${project.dependency.version} + ${i3plus.core.icloud.version} + - i3plus.icloud i3plus-icloud-wms - ${project.dependency.version} + ${i3plus.wms.icloud.version} i3plus.icloud i3plus-icloud-mes - ${project.dependency.version} + ${i3plus.mes.icloud.version} i3plus.icloud i3plus-icloud-mes-pcn - ${project.dependency.version} + ${i3plus.mes-pcn.icloud.version} i3plus.icloud i3plus-icloud-ptl - ${project.dependency.version} + ${i3plus.ptl.icloud.version} i3plus.icloud i3plus-icloud-andon - ${project.dependency.version} + ${i3plus.andon.icloud.version} i3plus.icloud i3plus-icloud-form - ${project.dependency.version} + ${i3plus.from.icloud.version} i3plus.icloud i3plus-icloud-softswitch - ${project.dependency.version} + ${i3plus.softwitch.icloud.version} i3plus.icloud i3plus-icloud-mdm - ${project.dependency.version} + ${i3plus.mdm.icloud.version} i3plus.icloud i3plus-icloud-screen - ${project.dependency.version} + ${i3plus.screen.icloud.version} @@ -159,13 +177,13 @@ i3plus.pojo i3plus-pojo-model - ${project.dependency.version} + ${i3plus.model.pojo.version} i3plus.pojo i3plus-pojo-mdm - ${project.dependency.version} + ${i3plus.mdm.pojo.version} @@ -178,19 +196,22 @@ i3plus.sdk i3plus-sdk-dingtalk - ${project.dependency.version} + + 1.0-TEST-SNAPSHOT i3plus.sdk i3plus-sdk-wechat - ${project.dependency.version} + + 1.0-TEST-SNAPSHOT i3plus.sdk i3plus-sdk-sms - ${project.dependency.version} + + 1.0-TEST-SNAPSHOT @@ -202,41 +223,30 @@ i3plus.platform i3plus-platform-plugin - ${project.dependency.version} + ${i3plus.platform.plugin.version} - - - - - i3plus.pojo i3plus-pojo-platform - ${project.dependency.version} + ${i3plus.pojo.platform.version} i3plus.pojo i3plus-pojo-mes - ${project.dependency.version} + ${i3plus.pojo.mes.version} i3plus.pojo i3plus-pojo-base - ${project.dependency.version} + ${i3plus.pojo.base.version} - - - - - - i3plus.icloud i3plus-icloud-core - ${project.dependency.version} + ${i3plus.icloud.core.version}