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

core 升级1.0.0.2版本

Browse Source
yun-zuoyi
nies 4 years ago
parent c533b19f72
commit 3c95407292
6 changed files with 236 additions and 210 deletions
Show Stats Download Patch File Download Diff File

2
modules/i3plus-core-api/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>i3plus-core</artifactId> <artifactId>i3plus-core</artifactId>
<groupId>i3plus.core</groupId> <groupId>i3plus.core</groupId>
<version>1.0-TEST-SNAPSHOT</version> <version>1.0.0.2</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

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

@ -19,6 +19,7 @@ public interface IPersonnelService {
/** /**
* 保存账号信息 * 保存账号信息
*
* @param user 账号信息 * @param user 账号信息
* @return 保存之后的账号信息 * @return 保存之后的账号信息
*/ */
@ -27,6 +28,7 @@ public interface IPersonnelService {
/** /**
* 保存用户信息 * 保存用户信息
*
* @param info 账号信息 * @param info 账号信息
* @return 保存后的账号信息 * @return 保存后的账号信息
*/ */
@ -120,6 +122,9 @@ public interface IPersonnelService {
@ApiOperation(value = "查询角色账号关系", notes = "查询角色账号关系") @ApiOperation(value = "查询角色账号关系", notes = "查询角色账号关系")
ListPager<SysRefUserRole> findSysRefUserRoleByRoleIds(List<Long> roleIdList, Pager pager); ListPager<SysRefUserRole> findSysRefUserRoleByRoleIds(List<Long> roleIdList, Pager pager);
@ApiOperation(value = "查询人员拥有的角色信息", notes = "查询人员是否拥有对应角色")
List<SysRefUserRole> findSysRefUserRoleByRoleNameAndUserID(String roleName, Long userId);
@ApiOperation(value = "角色权限关系", notes = "根据角色ID 查询权限") @ApiOperation(value = "角色权限关系", notes = "根据角色ID 查询权限")
List<SysRefRoleMenu> findSysRefRoleMenuByRoleIds(List<Long> roleIdList); List<SysRefRoleMenu> findSysRefRoleMenuByRoleIds(List<Long> roleIdList);

2
modules/i3plus-core-apiservice/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>i3plus-core</artifactId> <artifactId>i3plus-core</artifactId>
<groupId>i3plus.core</groupId> <groupId>i3plus.core</groupId>
<version>1.0-TEST-SNAPSHOT</version> <version>1.0.0.2</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

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

@ -34,6 +34,7 @@ import org.springframework.beans.BeanWrapper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
@ -241,7 +242,7 @@ public class SysRoleController extends CrudBaseController<SysRole> {
} }
} }
@PostMapping(value = "/queryAllRoleRefUser", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) @PostMapping(value = "/queryAllRoleRefUser")
@ApiOperation(value = "在所有角色中查询角色及关联的人员信息", notes = "查询角色及关联的人员信息") @ApiOperation(value = "在所有角色中查询角色及关联的人员信息", notes = "查询角色及关联的人员信息")
public BaseResultBean queryAllRoleRefUser(@RequestBody SysRoleModel sysRoleModel) { public BaseResultBean queryAllRoleRefUser(@RequestBody SysRoleModel sysRoleModel) {
try { try {
@ -272,7 +273,7 @@ public class SysRoleController extends CrudBaseController<SysRole> {
} }
@PostMapping(value = "/queryRoleRefUser", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) @PostMapping(value = "/queryRoleRefUser")
@ApiOperation(value = "查询当前请求人员的角色及关联的人员信息", notes = "查询角色及关联的人员信息") @ApiOperation(value = "查询当前请求人员的角色及关联的人员信息", notes = "查询角色及关联的人员信息")
public BaseResultBean queryRoleRefUser(@RequestBody SysRoleModel sysRoleModel) { public BaseResultBean queryRoleRefUser(@RequestBody SysRoleModel sysRoleModel) {
try { try {
@ -280,12 +281,15 @@ public class SysRoleController extends CrudBaseController<SysRole> {
SysRole sysRole = sysRoleModel.getSysRole(); SysRole sysRole = sysRoleModel.getSysRole();
Pager pager = sysRoleModel.getPager(); Pager pager = sysRoleModel.getPager();
if (ObjectUtils.isEmpty(sysRole)){ if (ObjectUtils.isEmpty(sysRole)){
sysRole = new SysRole(); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} }
if (ObjectUtils.isEmpty(pager)){ if (ObjectUtils.isEmpty(pager)){
pager = new Pager(); pager = new Pager();
} }
List<SysRefUserRole> refList = personnelService.findSysRefUserRole(getSessionUser().getUser().getId()); if (StringUtils.isEmpty(sysRole.getName())){
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}
List<SysRefUserRole> refList = personnelService.findSysRefUserRoleByRoleNameAndUserID(sysRole.getName(), getSessionUser().getUser().getId());
if (refList != null && refList.size() > 0) { if (refList != null && refList.size() > 0) {
List<Long> idList = new ArrayList<>(refList.size()); List<Long> idList = new ArrayList<>(refList.size());
refList.forEach(ref -> { refList.forEach(ref -> {

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

@ -296,7 +296,6 @@ public class PersonnelServiceService implements IPersonnelService {
public ListPager<SysUserInfo> querySysUserInfo(UserDetailModel model, Pager pager) { public ListPager<SysUserInfo> querySysUserInfo(UserDetailModel model, Pager pager) {
DdlPackBean packBean = CoreHqlPack.packDdlBeanSysUserInfo(model.getSysUserInfo(), StringTool.getListLong(model.getUserInfoIdList())); DdlPackBean packBean = CoreHqlPack.packDdlBeanSysUserInfo(model.getSysUserInfo(), StringTool.getListLong(model.getUserInfoIdList()));
pager = PagerHelper.getPager(pager, userInfoRDao.findByHqlWhereCount(packBean)); pager = PagerHelper.getPager(pager, userInfoRDao.findByHqlWhereCount(packBean));
@ -411,7 +410,7 @@ public class PersonnelServiceService implements IPersonnelService {
@Override @Override
public ListPager<SysRefUserRole> findSysRefUserRoleByRoleIds(List<Long> roleIdList, Pager pager) { public ListPager<SysRefUserRole> findSysRefUserRoleByRoleIds(List<Long> roleIdList, Pager pager) {
if (ObjectUtils.isEmpty(roleIdList)) { if (ObjectUtils.isEmpty(roleIdList)) {
return null; return new ListPager();
} }
DdlPackBean packBean = DdlPackBean.getDdlPackBean(); DdlPackBean packBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getInPackList(roleIdList, "roleId", packBean); DdlPreparedPack.getInPackList(roleIdList, "roleId", packBean);
@ -420,6 +419,15 @@ public class PersonnelServiceService implements IPersonnelService {
} }
@Override @Override
public List<SysRefUserRole> findSysRefUserRoleByRoleNameAndUserID(String roleName, Long userId) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringLikerPack(roleName, "roleNameRdd", packBean);
DdlPreparedPack.getNumEqualPack(userId, "userId", packBean);
return refUserRoleRDao.findByHqlWhere(packBean);
}
@Override
public List<SysRefRoleMenu> findSysRefRoleMenuByRoleIds(List<Long> roleIdList) { public List<SysRefRoleMenu> findSysRefRoleMenuByRoleIds(List<Long> roleIdList) {
LOGGER.info("平台账号角色 SysRefRoleMenu roleIdList:{}", roleIdList); LOGGER.info("平台账号角色 SysRefRoleMenu roleIdList:{}", roleIdList);
if (roleIdList != null) { if (roleIdList != null) {
@ -1183,6 +1191,7 @@ public class PersonnelServiceService implements IPersonnelService {
/** /**
* 校验密码长度 * 校验密码长度
*
* @return * @return
*/ */
private boolean checkPasswordLength(SysConfig config, String password) { private boolean checkPasswordLength(SysConfig config, String password) {
@ -1204,6 +1213,7 @@ public class PersonnelServiceService implements IPersonnelService {
/** /**
* 校验密码小写 * 校验密码小写
*
* @param password * @param password
* @return * @return
*/ */
@ -1227,6 +1237,7 @@ public class PersonnelServiceService implements IPersonnelService {
/** /**
* 校验密码大写 * 校验密码大写
*
* @param password * @param password
* @return * @return
*/ */
@ -1250,6 +1261,7 @@ public class PersonnelServiceService implements IPersonnelService {
/** /**
* 校验密码大写 * 校验密码大写
*
* @param password * @param password
* @return * @return
*/ */
@ -1273,6 +1285,7 @@ public class PersonnelServiceService implements IPersonnelService {
/** /**
* 校验密码特殊字符 * 校验密码特殊字符
*
* @param password * @param password
* @return * @return
*/ */
@ -1320,6 +1333,7 @@ public class PersonnelServiceService implements IPersonnelService {
/** /**
* 用户邮箱唯一检查 * 用户邮箱唯一检查
*
* @param email * @param email
* @param infoId * @param infoId
* @return * @return
@ -1343,6 +1357,7 @@ public class PersonnelServiceService implements IPersonnelService {
/** /**
* 手机号码 唯一校验 * 手机号码 唯一校验
*
* @param phone * @param phone
* @param infoId * @param infoId
* @return * @return
@ -1366,6 +1381,7 @@ public class PersonnelServiceService implements IPersonnelService {
/** /**
* 工号唯一检查 * 工号唯一检查
*
* @param empNo * @param empNo
* @param infoId * @param infoId
* @return * @return

51
pom.xml
Unescape Escape View File

@ -7,7 +7,7 @@
<groupId>i3plus.core</groupId> <groupId>i3plus.core</groupId>
<artifactId>i3plus-core</artifactId> <artifactId>i3plus-core</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>1.0-TEST-SNAPSHOT</version> <version>1.0.0.2</version>
<modules> <modules>
<module>modules/i3plus-core-api</module> <module>modules/i3plus-core-api</module>
<module>modules/i3plus-core-apiservice</module> <module>modules/i3plus-core-apiservice</module>
@ -37,6 +37,7 @@
<skipTests>true</skipTests> <skipTests>true</skipTests>
<app.charset>UTF-8</app.charset> <app.charset>UTF-8</app.charset>
<app.jdk.version>1.8</app.jdk.version> <app.jdk.version>1.8</app.jdk.version>
<project.dependency.version>1.0-TEST-SNAPSHOT</project.dependency.version>
</properties> </properties>
<dependencies> <dependencies>
@ -48,82 +49,82 @@
<dependency> <dependency>
<groupId>impp.framework</groupId> <groupId>impp.framework</groupId>
<artifactId>impp-framework-boot</artifactId> <artifactId>impp-framework-boot</artifactId>
<version>${project.version}</version> <version>${project.dependency.version}</version>
</dependency> </dependency>
<!-- 微朝调用 --> <!-- 微朝调用 -->
<dependency> <dependency>
<groupId>i3plus.core</groupId> <groupId>i3plus.core</groupId>
<artifactId>i3plus-core-icloud</artifactId> <artifactId>i3plus-core-icloud</artifactId>
<version>${project.version}</version> <version>${project.dependency.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>i3plus.icloud</groupId> <groupId>i3plus.icloud</groupId>
<artifactId>i3plus-icloud-wms</artifactId> <artifactId>i3plus-icloud-wms</artifactId>
<version>${project.version}</version> <version>${project.dependency.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>i3plus.icloud</groupId> <groupId>i3plus.icloud</groupId>
<artifactId>i3plus-icloud-mes</artifactId> <artifactId>i3plus-icloud-mes</artifactId>
<version>${project.version}</version> <version>${project.dependency.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>i3plus.icloud</groupId> <groupId>i3plus.icloud</groupId>
<artifactId>i3plus-icloud-mes-pcn</artifactId> <artifactId>i3plus-icloud-mes-pcn</artifactId>
<version>${project.version}</version> <version>${project.dependency.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>i3plus.icloud</groupId> <groupId>i3plus.icloud</groupId>
<artifactId>i3plus-icloud-ptl</artifactId> <artifactId>i3plus-icloud-ptl</artifactId>
<version>${project.version}</version> <version>${project.dependency.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>i3plus.icloud</groupId> <groupId>i3plus.icloud</groupId>
<artifactId>i3plus-icloud-andon</artifactId> <artifactId>i3plus-icloud-andon</artifactId>
<version>${project.version}</version> <version>${project.dependency.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>i3plus.icloud</groupId> <groupId>i3plus.icloud</groupId>
<artifactId>i3plus-icloud-form</artifactId> <artifactId>i3plus-icloud-form</artifactId>
<version>${project.version}</version> <version>${project.dependency.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>i3plus.icloud</groupId> <groupId>i3plus.icloud</groupId>
<artifactId>i3plus-icloud-softswitch</artifactId> <artifactId>i3plus-icloud-softswitch</artifactId>
<version>${project.version}</version> <version>${project.dependency.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>i3plus.icloud</groupId> <groupId>i3plus.icloud</groupId>
<artifactId>i3plus-icloud-mdm</artifactId> <artifactId>i3plus-icloud-mdm</artifactId>
<version>${project.version}</version> <version>${project.dependency.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>i3plus.icloud</groupId> <groupId>i3plus.icloud</groupId>
<artifactId>i3plus-icloud-screen</artifactId> <artifactId>i3plus-icloud-screen</artifactId>
<version>${project.version}</version> <version>${project.dependency.version}</version>
</dependency> </dependency>
<!-- 基础对象调用 --> <!-- 基础对象调用 -->
<dependency> <dependency>
<groupId>i3plus.pojo</groupId> <groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-model</artifactId> <artifactId>i3plus-pojo-model</artifactId>
<version>${project.version}</version> <version>${project.dependency.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>i3plus.pojo</groupId> <groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-mdm</artifactId> <artifactId>i3plus-pojo-mdm</artifactId>
<version>${project.version}</version> <version>${project.dependency.version}</version>
</dependency> </dependency>
<!-- 内部依赖声明 --> <!-- 内部依赖声明 -->
@ -136,65 +137,65 @@
<dependency> <dependency>
<groupId>i3plus.sdk</groupId> <groupId>i3plus.sdk</groupId>
<artifactId>i3plus-sdk-dingtalk</artifactId> <artifactId>i3plus-sdk-dingtalk</artifactId>
<version>${project.version}</version> <version>${project.dependency.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>i3plus.sdk</groupId> <groupId>i3plus.sdk</groupId>
<artifactId>i3plus-sdk-wechat</artifactId> <artifactId>i3plus-sdk-wechat</artifactId>
<version>${project.version}</version> <version>${project.dependency.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>i3plus.sdk</groupId> <groupId>i3plus.sdk</groupId>
<artifactId>i3plus-sdk-sms</artifactId> <artifactId>i3plus-sdk-sms</artifactId>
<version>${project.version}</version> <version>${project.dependency.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>i3plus.platform</groupId> <groupId>i3plus.platform</groupId>
<artifactId>i3plus-platform-common</artifactId> <artifactId>i3plus-platform-common</artifactId>
<version>${project.version}</version> <version>${project.dependency.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>i3plus.platform</groupId> <groupId>i3plus.platform</groupId>
<artifactId>i3plus-platform-plugin</artifactId> <artifactId>i3plus-platform-plugin</artifactId>
<version>${project.version}</version> <version>${project.dependency.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>i3plus.platform</groupId> <groupId>i3plus.platform</groupId>
<artifactId>i3plus-platform-plugin</artifactId> <artifactId>i3plus-platform-plugin</artifactId>
<version>${project.version}</version> <version>${project.dependency.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>i3plus.pojo</groupId> <groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-platform</artifactId> <artifactId>i3plus-pojo-platform</artifactId>
<version>${project.version}</version> <version>${project.dependency.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>i3plus.pojo</groupId> <groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-mes</artifactId> <artifactId>i3plus-pojo-mes</artifactId>
<version>${project.version}</version> <version>${project.dependency.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>i3plus.pojo</groupId> <groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-base</artifactId> <artifactId>i3plus-pojo-base</artifactId>
<version>${project.version}</version> <version>${project.dependency.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>i3plus.pojo</groupId> <groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-mes</artifactId> <artifactId>i3plus-pojo-mes</artifactId>
<version>${project.version}</version> <version>${project.dependency.version}</version>
</dependency> </dependency>
<!-- 微朝调用 --> <!-- 微朝调用 -->
<dependency> <dependency>
<groupId>i3plus.icloud</groupId> <groupId>i3plus.icloud</groupId>
<artifactId>i3plus-icloud-core</artifactId> <artifactId>i3plus-icloud-core</artifactId>
<version>${project.version}</version> <version>${project.dependency.version}</version>
</dependency> </dependency>
<!-- mysql --> <!-- mysql -->

Write Preview
Loading…
Cancel
Save