alwaysfrin 7 years ago
commit f5732c6ffb

@ -21,9 +21,11 @@
<groupId>i3plus.pojo</groupId> <groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-mes</artifactId> <artifactId>i3plus-pojo-mes</artifactId>
</dependency> </dependency>
<!-- shiro -->
<dependency> <dependency>
<groupId>i3plus.pojo</groupId> <groupId>org.apache.shiro</groupId>
<artifactId>i3plus-pojo-wms</artifactId> <artifactId>shiro-core</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>

@ -1,6 +1,9 @@
package cn.estsh.i3plus.core.api.iservice.busi; package cn.estsh.i3plus.core.api.iservice.busi;
import cn.estsh.i3plus.pojo.platform.bean.Department; import cn.estsh.i3plus.pojo.platform.bean.Department;
import cn.estsh.i3plus.pojo.platform.bean.Position;
import java.util.List;
/** /**
* @Description : * @Description :
@ -19,4 +22,26 @@ public interface ICoreTreeService {
* @param step * @param step
*/ */
void findDepartmentChildrenTreePack(Department parent,int step); void findDepartmentChildrenTreePack(Department parent,int step);
/**
*
* @param parentId
* @return
*/
List<Position> findPositionTreeByParentId(long parentId);
/**
*
* @param id
* @return
*/
Position getPositionTreeByParentId(long id);
/**
*
* @param parent
* @param step
*/
void findPositionChildrenTreePack(Position parent,int step);
} }

@ -23,10 +23,7 @@
<groupId>i3plus.pojo</groupId> <groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-base</artifactId> <artifactId>i3plus-pojo-base</artifactId>
</dependency> </dependency>
<dependency>
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-wms</artifactId>
</dependency>
<!-- api调用 --> <!-- api调用 -->
<dependency> <dependency>
@ -60,11 +57,55 @@
<artifactId>commons-lang3</artifactId> <artifactId>commons-lang3</artifactId>
</dependency> </dependency>
<!-- shiro -->
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-spring</artifactId>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-web</artifactId>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-ehcache</artifactId>
</dependency>
<!-- fastjson --> <!-- fastjson -->
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId> <artifactId>fastjson</artifactId>
</dependency> </dependency>
<!-- ehcache缓存 -->
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache-core</artifactId>
</dependency>
<dependency>
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-mes</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<!-- Junit -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
@ -96,7 +137,7 @@
</plugins> </plugins>
<!-- 资源文件位置描述 --> <!-- 资源文件位置描述 -->
<sourceDirectory>src/main/java</sourceDirectory> <sourceDirectory>src/main/java</sourceDirectory>
<testSourceDirectory>src/test/java</testSourceDirectory> <testSourceDirectory>src/main/java</testSourceDirectory>
<resources> <resources>
<resource> <resource>
<directory>src/main/resources</directory> <directory>src/main/resources</directory>

@ -38,7 +38,7 @@ import java.util.Locale;
* @Modify: * @Modify:
**/ **/
@RestController @RestController
@RequestMapping("/core/tree") @RequestMapping("/demo/tree")
@Api(description="系统服务demo") @Api(description="系统服务demo")
public class CoreTreeController { public class CoreTreeController {
private static final Logger LOGGER = LoggerFactory.getLogger(CoreTreeController.class); private static final Logger LOGGER = LoggerFactory.getLogger(CoreTreeController.class);

@ -2,13 +2,16 @@ package cn.estsh.i3plus.core.apiservice.controller.base;
import cn.estsh.i3plus.core.api.iservice.base.ISysUserService; import cn.estsh.i3plus.core.api.iservice.base.ISysUserService;
import cn.estsh.i3plus.core.api.iservice.base.ISystemLoginService; import cn.estsh.i3plus.core.api.iservice.base.ISystemLoginService;
import cn.estsh.i3plus.core.api.iservice.busi.ICoreTreeService;
import cn.estsh.i3plus.core.apiservice.controller.DemoAuthController; import cn.estsh.i3plus.core.apiservice.controller.DemoAuthController;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.Department;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import cn.estsh.impp.framework.boot.util.ImppRedis;
import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.util.ResultBean;
import cn.estsh.impp.framework.boot.util.ValidatorBean;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -18,7 +21,6 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
/** /**
@ -47,12 +49,17 @@ public class AuthController {
public ResultBean login(HttpServletRequest request, String loginName, String loginPwd, String languageCode){ public ResultBean login(HttpServletRequest request, String loginName, String loginPwd, String languageCode){
LOGGER.info("用户登陆 loginName:{} loginPwd:{} languageCode:{}",loginName,loginPwd,languageCode); LOGGER.info("用户登陆 loginName:{} loginPwd:{} languageCode:{}",loginName,loginPwd,languageCode);
try { try {
ValidatorBean.checkNotNull(loginName,"用户名不能为空");
ValidatorBean.checkNotNull(loginPwd,"密码不能为空");
ValidatorBean.checkNotNull(languageCode,"语言不能为空");
SessionUser user = userService.queryUserLogin(loginName,loginPwd,languageCode); SessionUser user = userService.queryUserLogin(loginName,loginPwd,languageCode);
LOGGER.info("会员登陆:{}",user); LOGGER.info("会员登陆:{}",user);
AuthUtil.setSessionObject("languageCode",languageCode); AuthUtil.setSessionObject("languageCode",languageCode);
String sessionId = request.getSession().getId(); String sessionId = request.getSession().getId();
String token = "{accessToken:'"+sessionId+"',expiresIn:1800}"; String token = "{accessToken:'"+sessionId+"',expiresIn:1800}";
return new ResultBean(true,"",token); return new ResultBean(true,token,AuthUtil.getSessionUser());
} catch (ImppBusiException e) { } catch (ImppBusiException e) {
return new ResultBean(false,e.getErrorDetail() + ",so:" + e.getErrorSolution()); return new ResultBean(false,e.getErrorDetail() + ",so:" + e.getErrorSolution());
}catch (Exception e){ }catch (Exception e){

@ -48,7 +48,7 @@ public class DepartmentController {
//条件验证 //条件验证
ValidatorBean.beginValid(department) ValidatorBean.beginValid(department)
.notNull("departmentName", department.getDepartmentName()) .notNull("departmentName", department.getName())
.notNull("departmentCode", department.getDepartmentCode()) .notNull("departmentCode", department.getDepartmentCode())
.checkNotZero("organizeId",department.getOrganizeId()); .checkNotZero("organizeId",department.getOrganizeId());
@ -76,7 +76,7 @@ public class DepartmentController {
//条件验证 //条件验证
ValidatorBean.beginValid(department) ValidatorBean.beginValid(department)
.checkNotZero("id", department.getId()) .checkNotZero("id", department.getId())
.notNull("departmentName", department.getDepartmentName()) .notNull("departmentName", department.getName())
.notNull("departmentCode", department.getDepartmentCode()) .notNull("departmentCode", department.getDepartmentCode())
.checkNotZero("organizeId",department.getOrganizeId()); .checkNotZero("organizeId",department.getOrganizeId());

@ -47,14 +47,14 @@ public class SysMessageController {
ValidatorBean.beginValid(sysMessage) ValidatorBean.beginValid(sysMessage)
.notNull("messageTitle",sysMessage.getMessageTitle()) .notNull("messageTitle",sysMessage.getMessageTitle())
.notNull("messageContent",sysMessage.getMessageContent()) .notNull("messageContent",sysMessage.getMessageContent())
.checkNotZero("messageType",sysMessage.getMessageType()) .checkNotZero("messageType",sysMessage.getMessageTypeId())
.notNull("messageRecipientId",sysMessage.getMessageRecipientId()); .notNull("messageRecipientId",sysMessage.getMessageRecipientId());
// 添加初始化 // 添加初始化
ConvertBean.modelInitialize(sysMessage,user); ConvertBean.modelInitialize(sysMessage,user);
// sysMessage.setMessageSendId(user.getUser().getId()); // sysMessage.setMessageSendId(user.getUser().getId());
// sysMessage.setRedSendName(user.getUser().getName()); // sysMessage.setRedSendName(user.getUser().getName());
sysMessage.setMessageStatus(ImppEnumUtil.USER_MESSAGE_STATUS.UNREAD.getValue()); sysMessage.setMessageStatusId(ImppEnumUtil.USER_MESSAGE_STATUS.UNREAD.getValue());
// TODO 状态 status // TODO 状态 status
sysMessageService.insertSysMessage(sysMessage); sysMessageService.insertSysMessage(sysMessage);
@ -97,7 +97,7 @@ public class SysMessageController {
ValidatorBean.beginValid(sysMessage) ValidatorBean.beginValid(sysMessage)
.notNull("messageTitle",sysMessage.getMessageTitle()) .notNull("messageTitle",sysMessage.getMessageTitle())
.notNull("messageContent",sysMessage.getMessageContent()) .notNull("messageContent",sysMessage.getMessageContent())
.checkNotZero("messageType",sysMessage.getMessageType()) .checkNotZero("messageType",sysMessage.getMessageTypeId())
.notNull("messageRecipientId",sysMessage.getMessageRecipientId()); .notNull("messageRecipientId",sysMessage.getMessageRecipientId());
// 添加初始化 // 添加初始化

@ -62,7 +62,7 @@ public class SysUserController {
//新增初始化 //新增初始化
ConvertBean.modelInitialize(sysUser, AuthUtil.getSessionUser()); ConvertBean.modelInitialize(sysUser, AuthUtil.getSessionUser());
sysUser.setUserStatus(CommonEnumUtil.USER_STATUS.NORMAL.getValue()); sysUser.setUserStatusId(CommonEnumUtil.USER_STATUS.NORMAL.getValue());
sysUser.setUserTypeId(CommonEnumUtil.USER_TYPE.USER.getValue()); sysUser.setUserTypeId(CommonEnumUtil.USER_TYPE.USER.getValue());
SysUser user = sysUserService.insertSysUser(sysUser); SysUser user = sysUserService.insertSysUser(sysUser);

@ -49,14 +49,14 @@ public class ToolController {
ValidatorBean.beginValid(tool) ValidatorBean.beginValid(tool)
.notNull("name",tool.getName()) .notNull("name",tool.getName())
.notNull("toolTypeId",tool.getToolTypeId()) .notNull("toolTypeId",tool.getToolTypeId())
.notNull("toolConnType",tool.getToolConnType()) .notNull("toolConnType",tool.getToolConnTypeId())
.notNull("toolDataType",tool.getToolDataType()) .notNull("toolDataType",tool.getToolDataTypeId())
.notNull("toolIp",tool.getToolIp()) .notNull("toolIp",tool.getToolIp())
.notNull("toolPort",tool.getToolPort()); .notNull("toolPort",tool.getToolPort());
// 添加初始化 // 添加初始化
ConvertBean.modelInitialize(tool,user); ConvertBean.modelInitialize(tool,user);
tool.setToolStatus(ImppEnumUtil.COMM_STATUS.ENABLE.getValue()); tool.setToolStatusId(ImppEnumUtil.COMM_STATUS.ENABLE.getValue());
toolService.insertTool(tool); toolService.insertTool(tool);
return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
@ -82,8 +82,8 @@ public class ToolController {
ValidatorBean.beginValid(tool) ValidatorBean.beginValid(tool)
.notNull("name",tool.getName()) .notNull("name",tool.getName())
.notNull("toolTypeId",tool.getToolTypeId()) .notNull("toolTypeId",tool.getToolTypeId())
.notNull("toolConnType",tool.getToolConnType()) .notNull("toolConnType",tool.getToolConnTypeId())
.notNull("toolDataType",tool.getToolDataType()) .notNull("toolDataType",tool.getToolDataTypeId())
.notNull("toolIp",tool.getToolIp()) .notNull("toolIp",tool.getToolIp())
.notNull("toolPort",tool.getToolPort()); .notNull("toolPort",tool.getToolPort());

@ -0,0 +1,77 @@
package cn.estsh.i3plus.core.apiservice.controller.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ICoreTreeService;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.Department;
import cn.estsh.i3plus.pojo.platform.bean.Position;
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import cn.estsh.impp.framework.boot.util.ResultBean;
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.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @Date : 2018-10-29 14:56
* @Modify :
**/
@RestController
@RequestMapping("/tree")
@Api(description = "树服务")
public class TreeController {
public static final Logger LOGGER = LoggerFactory.getLogger(LogSystemController.class);
@Autowired
private ICoreTreeService coreTreeService;
@GetMapping(value="/position/get/{id}")
@ApiOperation(value="查询部门树",notes="通过部门主键获取部门树,-1为根节点")
public ResultBean listPositionTree(@PathVariable("id") long id) {
try {
Position position = coreTreeService.getPositionTreeByParentId(id);
return ResultBean.success("查询部门树成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultObject(position);
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep.getErrorShow());
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}
}
@GetMapping(value="/position/list/{parentId}")
@ApiOperation(value="查询部门树",notes="通过部门主键获取部门树,-1为根节点")
public ResultBean listPositionListTree(@PathVariable("parentId") long parentId) {
try {
List<Position> positionList = coreTreeService.findPositionTreeByParentId(parentId);
return ResultBean.success("查询部门树成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultList(positionList);
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep.getErrorShow());
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}
}
}

@ -125,7 +125,7 @@ public class SystemLoginService implements ISystemLoginService {
sessionUser.setLanguageCode(languageCode); sessionUser.setLanguageCode(languageCode);
// sessionUser.setSiteCode(user.getFactoryCode()); // sessionUser.setSiteCode(user.getFactoryCode());
// sessionUser.setUserName(user.getName()); // sessionUser.setUserName(user.getName());
sessionUser.setUserType(userType); sessionUser.setUserTypeId(userType);
// sessionUser.setUserCode(user.getUserInfo().getLanguageCode()); // sessionUser.setUserCode(user.getUserInfo().getLanguageCode());
return sessionUser; return sessionUser;

@ -2,7 +2,11 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ICoreTreeService; import cn.estsh.i3plus.core.api.iservice.busi.ICoreTreeService;
import cn.estsh.i3plus.pojo.platform.bean.Department; import cn.estsh.i3plus.pojo.platform.bean.Department;
import cn.estsh.i3plus.pojo.platform.bean.Position;
import cn.estsh.i3plus.pojo.platform.repository.DepartmentRepository; import cn.estsh.i3plus.pojo.platform.repository.DepartmentRepository;
import cn.estsh.i3plus.pojo.platform.repository.PositionRepository;
import cn.estsh.impp.framework.boot.util.ValidatorBean;
import javafx.scene.layout.VBox;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -25,31 +29,77 @@ public class CoreTreeServiceImpl implements ICoreTreeService {
@Autowired @Autowired
private DepartmentRepository departmentRDao; private DepartmentRepository departmentRDao;
@Autowired
private PositionRepository positionRDao;
@Override @Override
public Department getDepartmentTreeByParentId(long depParentId) { public Department getDepartmentTreeByParentId(long depParentId) {
Department depParent = departmentRDao.getById(depParentId); Department depParent = departmentRDao.getById(depParentId);
//封装子集 //封装子集
findDepartmentChildrenTreePack(depParent,0); findDepartmentChildrenTreePack(depParent, 0);
return depParent; return depParent;
} }
/** /**
* *
*
* @param parent * @param parent
*/ */
@Override @Override
public void findDepartmentChildrenTreePack(Department parent,int step){ public void findDepartmentChildrenTreePack(Department parent, int step) {
++step; ++step;
List<Department> childDepList = departmentRDao.findByProperty("parentId",parent.getId()); List<Department> childDepList = departmentRDao.findByProperty("parentId", parent.getId());
if(childDepList.size() > 0){ if (childDepList.size() > 0) {
//说明有子集 //说明有子集
for(Department depChild : childDepList){ for (Department depChild : childDepList) {
findDepartmentChildrenTreePack(depChild,step); findDepartmentChildrenTreePack(depChild, step);
} }
} }
LOGGER.info("【{}】包含子集:{},步长:{}",parent.getDepartmentName(),childDepList.size(),step); LOGGER.info("【{}】包含子集:{},步长:{}", parent.getName(), childDepList.size(), step);
parent.setChildList(childDepList); parent.setChildList(childDepList);
} }
@Override
public List<Position> findPositionTreeByParentId(long parentId) {
List<Position> result = positionRDao.findByProperty("parentId", parentId);
// 循环设置子集
if(result != null && result.size() > 0){
result.stream().forEach(position -> findPositionChildrenTreePack(position,0));
}
return result;
}
@Override
public Position getPositionTreeByParentId(long id) {
// 查找数据
Position position = positionRDao.getById(id);
// 数据是否真实存在
ValidatorBean.checkNotNull(position,"不存在的岗位信息");
// 递归查询子集
findPositionChildrenTreePack(position, 0);
return position;
}
@Override
public void findPositionChildrenTreePack(Position parent, int step) {
++step;
List<Position> childList = positionRDao.findByProperty("parentId", parent.getId());
if (childList.size() > 0) {
//说明有子集
for (Position child : childList) {
findPositionChildrenTreePack(child, step);
}
}
LOGGER.info("【{}】包含子集:{},步长:{}", parent.getName(), childList.size(), step);
parent.setChildList(childList);
}
} }

@ -46,7 +46,7 @@ public class DepartmentServiceImpl implements IDepartmentService {
Department parentPosition = departmentRDao.getById(department.getParentId()); Department parentPosition = departmentRDao.getById(department.getParentId());
ValidatorBean.checkNotNull(parentPosition); ValidatorBean.checkNotNull(parentPosition);
department.setRedParentName(parentPosition.getDepartmentName()); department.setRedParentName(parentPosition.getName());
} }
// 查询所属组织名称 // 查询所属组织名称
@ -87,7 +87,7 @@ public class DepartmentServiceImpl implements IDepartmentService {
Department parentPosition = departmentRDao.getById(department.getParentId()); Department parentPosition = departmentRDao.getById(department.getParentId());
ValidatorBean.checkNotNull(parentPosition); ValidatorBean.checkNotNull(parentPosition);
department.setRedParentName(parentPosition.getDepartmentName()); department.setRedParentName(parentPosition.getName());
} }
// 查询所属组织名称 // 查询所属组织名称

@ -50,7 +50,7 @@ public class OrganizeServiceImpl implements IOrganizeService {
public void updateOrganizeStatus(String id, int status, SessionUser user) { public void updateOrganizeStatus(String id, int status, SessionUser user) {
LOGGER.info("组织 ORGANIZE id:{} status:{} user:{}", id,status,user); LOGGER.info("组织 ORGANIZE id:{} status:{} user:{}", id,status,user);
Organize organize = organizeRDao.getById(Long.parseLong(id)); Organize organize = organizeRDao.getById(Long.parseLong(id));
organize.setOrganizeStatus(status); organize.setOrganizeStatusId(status);
organize.setModifyUser(user.getUserName()); organize.setModifyUser(user.getUserName());
organizeRDao.update(organize); organizeRDao.update(organize);
} }

@ -39,7 +39,7 @@ public class SysRoleServiceImpl implements ISysRoleService {
public void updateSysRoleStatus(String id, int status, SessionUser user) { public void updateSysRoleStatus(String id, int status, SessionUser user) {
LOGGER.info("系统角色 SYS_MENU id:{} status:{} user:{}", id,status,user); LOGGER.info("系统角色 SYS_MENU id:{} status:{} user:{}", id,status,user);
SysRole role = sysRoleRDao.getById(Long.parseLong(id)); SysRole role = sysRoleRDao.getById(Long.parseLong(id));
role.setRoleStatus(status); role.setRoleStatusId(status);
role.setModifyUser(user.getUserName()); role.setModifyUser(user.getUserName());
sysRoleRDao.update(role); sysRoleRDao.update(role);

@ -7,7 +7,6 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.shirotoken.AdminToken; import cn.estsh.i3plus.pojo.base.shirotoken.AdminToken;
import cn.estsh.i3plus.pojo.base.shirotoken.SaAdminToken; import cn.estsh.i3plus.pojo.base.shirotoken.SaAdminToken;
import cn.estsh.i3plus.pojo.base.shirotoken.UserToken; import cn.estsh.i3plus.pojo.base.shirotoken.UserToken;
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import cn.estsh.i3plus.pojo.platform.bean.*; import cn.estsh.i3plus.pojo.platform.bean.*;
import cn.estsh.i3plus.pojo.platform.repository.*; import cn.estsh.i3plus.pojo.platform.repository.*;
import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
@ -15,7 +14,6 @@ import cn.estsh.impp.framework.boot.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import cn.estsh.impp.framework.boot.util.ValidatorBean; import cn.estsh.impp.framework.boot.util.ValidatorBean;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authc.AuthenticationToken; import org.apache.shiro.authc.AuthenticationToken;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -73,6 +71,15 @@ public class SysUserServiceImpl implements ISysUserService {
SysUser user = getSysUserByLoginName(loginName); SysUser user = getSysUserByLoginName(loginName);
if(user == null){
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.LOGIN_USER_NAME_EXCEPTION.getCode())
.setErrorDetail("用户名不存在")
.setErrorSolution("请重新输入用户名")
.build();
}
AuthenticationToken token = null; AuthenticationToken token = null;
switch (user.getUserTypeId()) { switch (user.getUserTypeId()) {
case 2: case 2:
@ -98,7 +105,7 @@ public class SysUserServiceImpl implements ISysUserService {
public void updateSysUserStatus(String id, int status, SessionUser user) { public void updateSysUserStatus(String id, int status, SessionUser user) {
LOGGER.info("平台用户 SYS_USER id:{} status:{} modifyUser:{}", id, status, user.getUserName()); LOGGER.info("平台用户 SYS_USER id:{} status:{} modifyUser:{}", id, status, user.getUserName());
SysUser sysUser = sysUserRDao.getById(Long.parseLong(id)); SysUser sysUser = sysUserRDao.getById(Long.parseLong(id));
sysUser.setUserStatus(status); sysUser.setUserStatusId(status);
sysUser.setModifyUser(user.getUserName()); sysUser.setModifyUser(user.getUserName());
sysUserRDao.update(sysUser); sysUserRDao.update(sysUser);
} }
@ -171,7 +178,7 @@ public class SysUserServiceImpl implements ISysUserService {
ValidatorBean.checkNotNull(dep); ValidatorBean.checkNotNull(dep);
// 用户部门关系保存 // 用户部门关系保存
RefUserDepartment refUserDepartment = new RefUserDepartment(sysUser.getId(), dep.getId(), dep.getDepartmentName()); RefUserDepartment refUserDepartment = new RefUserDepartment(sysUser.getId(), dep.getId(), dep.getName());
refUserDepartmentRDao.save(refUserDepartment); refUserDepartmentRDao.save(refUserDepartment);
// 组织信息冗余 // 组织信息冗余
@ -182,7 +189,7 @@ public class SysUserServiceImpl implements ISysUserService {
} }
// 冗余 部门信息 // 冗余 部门信息
sysUser.setRedDepartmentName(dep.getDepartmentName()); sysUser.setRedDepartmentName(dep.getName());
} }
} }
@ -322,12 +329,17 @@ public class SysUserServiceImpl implements ISysUserService {
public static SessionUser packSessionUser(SessionUser sessionUser, SysUser user, Integer userType, String languageCode) { public static SessionUser packSessionUser(SessionUser sessionUser, SysUser user, Integer userType, String languageCode) {
sessionUser.setLanguageCode(languageCode); sessionUser.setLanguageCode(languageCode);
sessionUser.setUserName(user.getName()); sessionUser.setUserName(user.getName());
sessionUser.setUserType(CommonEnumUtil.USER_TYPE.valueOf(userType)); sessionUser.setUserTypeId(CommonEnumUtil.USER_TYPE.valueOf(userType));
sessionUser.setUserCode(user.getUserInfo().getLanguageCode()); sessionUser.setUserCode(user.getUserInfo().getLanguageCode());
sessionUser.setRoleList(user.getRoleList()); sessionUser.setRoleList(user.getRoleList());
sessionUser.setDepartmentList(user.getDepartmentList()); sessionUser.setDepartmentList(user.getDepartmentList());
sessionUser.setPositionList(user.getPositionList()); sessionUser.setPositionList(user.getPositionList());
sessionUser.setOrganize(user.getOrganize()); sessionUser.setOrganize(user.getOrganize());
if(null != user.getPositionList() && user.getPositionList().size() > 0){
sessionUser.setPosition(user.getPositionList().get(0));
}
return sessionUser; return sessionUser;
} }

@ -12,8 +12,10 @@ filter.shiro.admin.filteruri = /adoperate/*
#用户授权过滤路径 #用户授权过滤路径
filter.shiro.saadmin.filteruri = /saoperate/* filter.shiro.saadmin.filteruri = /saoperate/*
#是否允许前端跨域提交 #是否允许前端跨域提交impp.web.cross.hosts
impp.web.cross = true impp.web.cross = false
#允许前端跨域提交ip地址多个以逗号分隔
impp.web.cross.hosts = http://localhost
################ 主数据源 ################ ################ 主数据源 ################
# mysql # mysql

@ -0,0 +1,42 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.IPositionService;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.context.web.WebAppConfiguration;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @Date : 2018-10-29 19:12
* @Modify :
**/
//@SpringBootTest
//@RunWith(SpringRunner.class)
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@AutoConfigureMockMvc
public class TestBase {
@Before
public void init() {
System.out.println("-----------------开始测试-----------------");
}
@After
public void after() {
System.out.println("-----------------测试结束-----------------");
}
}

@ -0,0 +1,79 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.IPositionService;
import cn.estsh.i3plus.pojo.platform.bean.Position;
import com.alibaba.fastjson.JSON;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import javax.transaction.Transactional;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @Date : 2018-10-29 19:02
* @Modify :
**/
public class TestPositionServiceImpl extends TestBase {
@Autowired
private IPositionService positionService;
/**
*
*/
@Test
@Transactional
public void testListPosition() {
List list = positionService.listPosition();
System.out.println(JSON.toJSONString(list));
}
/**
*
*/
@Test
@Transactional
public void testGetPositionById() {
Position position = positionService.getPositionById("1056796316849541120");
System.out.println(JSON.toJSONString(position));
}
/**
*
*/
@Test
@Transactional
public void testInsertPosition() {
Position position = new Position();
position.setName("张三的岗位");
position.setPositionCode("ZS_CODE");
position.setPositionDescription("描述该岗位的信息");
Position pos = positionService.insertPosition(position);
System.out.println(JSON.toJSONString(pos));
}
/**
*
*/
@Test
@Transactional
public void testDeletePositionById() {
positionService.deletePositionById("105605611393555");
}
/**
*
*/
@Test
@Transactional
public void testUpdatePosition(){
Position position = positionService.getPositionById("1056878692237709312");
position.setName("===>> 改动后的名称");
positionService.updatePosition(position);
}
}

@ -44,6 +44,12 @@
</properties> </properties>
<dependencies> <dependencies>
<!-- 外部对象模型 -->
<dependency>
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-wms</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies> </dependencies>
<dependencyManagement> <dependencyManagement>
@ -57,12 +63,6 @@
<dependency> <dependency>
<groupId>i3plus.pojo</groupId> <groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-base</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-model</artifactId> <artifactId>i3plus-pojo-model</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
@ -97,7 +97,7 @@
<dependency> <dependency>
<groupId>i3plus.pojo</groupId> <groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-wms</artifactId> <artifactId>i3plus-pojo-mes</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
@ -115,6 +115,28 @@
<version>3.8.1</version> <version>3.8.1</version>
</dependency> </dependency>
<!-- shiro -->
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-core</artifactId>
<version>1.4.0</version>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-web</artifactId>
<version>1.4.0</version>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-spring</artifactId>
<version>1.4.0</version>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-ehcache</artifactId>
<version>1.4.0</version>
</dependency>
<!-- json --> <!-- json -->
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
@ -128,9 +150,26 @@
<artifactId>ehcache-core</artifactId> <artifactId>ehcache-core</artifactId>
<version>2.6.11</version> <version>2.6.11</version>
</dependency> </dependency>
<!-- Junit -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>2.0.3.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
<!-- 私有仓库引用配置 --> <!-- 私有仓库引用配置 -->
<repositories> <repositories>
<repository> <repository>
@ -155,6 +194,9 @@
</snapshotRepository> </snapshotRepository>
</distributionManagement> </distributionManagement>
<build> <build>
<plugins> <plugins>
<!-- maven编译的一些插件 --> <!-- maven编译的一些插件 -->
@ -188,7 +230,7 @@
<configuration> <configuration>
<releaseProfiles>prod</releaseProfiles> <releaseProfiles>prod</releaseProfiles>
<autoVersionSubmodules>true</autoVersionSubmodules> <autoVersionSubmodules>true</autoVersionSubmodules>
<tagBase>http://git.estsh.com/i3-IMPP/i3plus-core.git</tagBase> <tagBase>http://git.evun.cn/GCDC-MES-SERVICE/PLATFORM_PROD_EXEC.git</tagBase>
<tagNameFormat>v@{project.version}</tagNameFormat> <tagNameFormat>v@{project.version}</tagNameFormat>
</configuration> </configuration>
</plugin> </plugin>

Loading…
Cancel
Save