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

Merge branch 'test' into test_les_yujia

Browse Source
yun-zuoyi
yanyujia 2 years ago
parent 349c615167 c22fb61322
commit 487158cf2e
4 changed files with 106 additions and 45 deletions
Show Stats Download Patch File Download Diff File

9
modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/dto/LanguageDTO.java
Unescape Escape View File

@ -0,0 +1,9 @@
package cn.estsh.i3plus.core.api.iservice.dto;
import lombok.Data;
@Data
public class LanguageDTO {
private String languageCode;
}

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

@ -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;
@ -66,7 +67,7 @@ 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;
import org.apache.shiro.authc.*;
@ -86,7 +87,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 :
@ -518,10 +518,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()
@ -1610,4 +1610,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<SysMenu> 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<SysMenu> findChildList(List<SysMenu> findList) {
List<SysMenu> 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;
}
}

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

@ -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<SysRole> {
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());
@ -487,5 +490,4 @@ public class SysRoleController extends CrudBaseController<SysRole> {
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
}

88
pom.xml
Unescape Escape View File

@ -37,7 +37,7 @@
<skipTests>true</skipTests>
<app.charset>UTF-8</app.charset>
<app.jdk.version>1.8</app.jdk.version>
<project.dependency.version>1.0-TEST-SNAPSHOT</project.dependency.version>
<!-- <project.dependency.version>1.0-TEST-SNAPSHOT</project.dependency.version>-->
<log4j2.version>2.18.0</log4j2.version>
<qms.icloud.version>1.0.0.1</qms.icloud.version>
<eam.icloud.version>1.0.0.1</eam.icloud.version>
@ -46,6 +46,27 @@
<jackson.annotation.version>2.13.2</jackson.annotation.version>
<project.patch.version>1.0.0.1-patch</project.patch.version>
<xstream.version>1.4.19</xstream.version>
<impp.framework.boot.version>1.0.0.3</impp.framework.boot.version>
<i3plus.core.icloud.version>1.0.0.1</i3plus.core.icloud.version>
<i3plus.wms.icloud.version>1.0.0.1</i3plus.wms.icloud.version>
<i3plus.mes.icloud.version>1.0.0.1</i3plus.mes.icloud.version>
<i3plus.mes-pcn.icloud.version>1.0.0.1</i3plus.mes-pcn.icloud.version>
<i3plus.ptl.icloud.version>1.0.0.1</i3plus.ptl.icloud.version>
<i3plus.andon.icloud.version>1.0.0.1</i3plus.andon.icloud.version>
<i3plus.form.icloud.version>1.0.0.1</i3plus.form.icloud.version>
<i3plus.icloud.core.version>1.0.0.1</i3plus.icloud.core.version>
<i3plus.pojo.platform.version>1.0.0.1</i3plus.pojo.platform.version>
<i3plus.screen.icloud.version>1.0.0.1</i3plus.screen.icloud.version>
<i3plus.sdk.sms.version>1.0.0.1</i3plus.sdk.sms.version>
<i3plus.pojo.mes.version>1.0.0.1</i3plus.pojo.mes.version>
<i3plus.pojo.base.version>1.0.0.1</i3plus.pojo.base.version>
<i3plus.mdm.pojo.version>1.0.0.1</i3plus.mdm.pojo.version>
<i3plus.softwitch.icloud.version>1.0.0.1</i3plus.softwitch.icloud.version>
<i3plus.model.pojo.version>1.0.0.1</i3plus.model.pojo.version>
<i3plus.sdk.dingtalk.version>1.0.0.1</i3plus.sdk.dingtalk.version>
<i3plus.platform.plugin.version>1.0.0.1</i3plus.platform.plugin.version>
<i3plus.from.icloud.version>1.0.0.1</i3plus.from.icloud.version>
<i3plus.mdm.icloud.version>1.0.0.1</i3plus.mdm.icloud.version>
</properties>
<dependencies>
@ -56,13 +77,14 @@
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid</artifactId>
<version>1.2.8</version>
<version>1.2.15</version>
</dependency>
<!-- impp framework -->
<dependency>
<groupId>impp.framework</groupId>
<artifactId>impp-framework-boot</artifactId>
<version>${project.dependency.version}</version>
<version>${impp.framework.boot.version}</version>
</dependency>
<!--xxlJob 最新稳定版本-->
@ -88,66 +110,62 @@
<dependency>
<groupId>i3plus.core</groupId>
<artifactId>i3plus-core-icloud</artifactId>
<version>${project.dependency.version}</version>
<version>${i3plus.core.icloud.version}</version>
</dependency>
<!-- <dependency>
<groupId>i3plus.ext.cdm</groupId>
<artifactId>i3plus-ext-cdm-icloud</artifactId>
<version>1.0.0.1</version>
</dependency>-->
<dependency>
<groupId>i3plus.icloud</groupId>
<artifactId>i3plus-icloud-wms</artifactId>
<version>${project.dependency.version}</version>
<version>${i3plus.wms.icloud.version}</version>
</dependency>
<dependency>
<groupId>i3plus.icloud</groupId>
<artifactId>i3plus-icloud-mes</artifactId>
<version>${project.dependency.version}</version>
<version>${i3plus.mes.icloud.version}</version>
</dependency>
<dependency>
<groupId>i3plus.icloud</groupId>
<artifactId>i3plus-icloud-mes-pcn</artifactId>
<version>${project.dependency.version}</version>
<version>${i3plus.mes-pcn.icloud.version}</version>
</dependency>
<dependency>
<groupId>i3plus.icloud</groupId>
<artifactId>i3plus-icloud-ptl</artifactId>
<version>${project.dependency.version}</version>
<version>${i3plus.ptl.icloud.version}</version>
</dependency>
<dependency>
<groupId>i3plus.icloud</groupId>
<artifactId>i3plus-icloud-andon</artifactId>
<version>${project.dependency.version}</version>
<version>${i3plus.andon.icloud.version}</version>
</dependency>
<dependency>
<groupId>i3plus.icloud</groupId>
<artifactId>i3plus-icloud-form</artifactId>
<version>${project.dependency.version}</version>
<version>${i3plus.from.icloud.version}</version>
</dependency>
<dependency>
<groupId>i3plus.icloud</groupId>
<artifactId>i3plus-icloud-softswitch</artifactId>
<version>${project.dependency.version}</version>
<version>${i3plus.softwitch.icloud.version}</version>
</dependency>
<dependency>
<groupId>i3plus.icloud</groupId>
<artifactId>i3plus-icloud-mdm</artifactId>
<version>${project.dependency.version}</version>
<version>${i3plus.mdm.icloud.version}</version>
</dependency>
<dependency>
<groupId>i3plus.icloud</groupId>
<artifactId>i3plus-icloud-screen</artifactId>
<version>${project.dependency.version}</version>
<version>${i3plus.screen.icloud.version}</version>
</dependency>
<dependency>
@ -166,13 +184,13 @@
<dependency>
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-model</artifactId>
<version>${project.dependency.version}</version>
<version>${i3plus.model.pojo.version}</version>
</dependency>
<dependency>
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-mdm</artifactId>
<version>${project.dependency.version}</version>
<version>${i3plus.mdm.pojo.version}</version>
</dependency>
<!-- 内部依赖声明 -->
@ -185,19 +203,22 @@
<dependency>
<groupId>i3plus.sdk</groupId>
<artifactId>i3plus-sdk-dingtalk</artifactId>
<version>${project.dependency.version}</version>
<!-- <version>${i3plus.sdk.dingtalk.version}</version>-->
<version>1.0-TEST-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>i3plus.sdk</groupId>
<artifactId>i3plus-sdk-wechat</artifactId>
<version>${project.dependency.version}</version>
<!-- <version>${i3plus.sdk.wechat.version}</version>-->
<version>1.0-TEST-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>i3plus.sdk</groupId>
<artifactId>i3plus-sdk-sms</artifactId>
<version>${project.dependency.version}</version>
<!-- <version>${i3plus.sdk.sms.version}</version>-->
<version>1.0-TEST-SNAPSHOT</version>
</dependency>
<dependency>
@ -209,41 +230,30 @@
<dependency>
<groupId>i3plus.platform</groupId>
<artifactId>i3plus-platform-plugin</artifactId>
<version>${project.dependency.version}</version>
<version>${i3plus.platform.plugin.version}</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>i3plus.platform</groupId>-->
<!-- <artifactId>i3plus-platform-plugin</artifactId>-->
<!-- <version>${project.dependency.version}</version>-->
<!-- </dependency>-->
<dependency>
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-platform</artifactId>
<version>${project.dependency.version}</version>
<version>${i3plus.pojo.platform.version}</version>
</dependency>
<dependency>
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-mes</artifactId>
<version>${project.dependency.version}</version>
<version>${i3plus.pojo.mes.version}</version>
</dependency>
<dependency>
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-base</artifactId>
<version>${project.dependency.version}</version>
<version>${i3plus.pojo.base.version}</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>i3plus.pojo</groupId>-->
<!-- <artifactId>i3plus-pojo-mes</artifactId>-->
<!-- <version>${project.dependency.version}</version>-->
<!-- </dependency>-->
<!-- 微朝调用 -->
<dependency>
<groupId>i3plus.icloud</groupId>
<artifactId>i3plus-icloud-core</artifactId>
<version>${project.dependency.version}</version>
<version>${i3plus.icloud.core.version}</version>
</dependency>
<!-- mysql -->

Write Preview
Loading…
Cancel
Save