定时任务

定时任务表达式     功能完成
    定时任务           功能完成

权限
    用户管理           功能完成
    用户登录           功能完成
yun-zuoyi
wei.peng 7 years ago
parent 778faac1fc
commit 3c751ac130

@ -103,7 +103,7 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<mainClass>cn.estsh.impp.framework.boot.core.ImppGo</mainClass>
<mainClass>cn.estsh.ImppGo</mainClass>
<layout>JAR</layout>
</configuration>
<executions>

@ -8,10 +8,7 @@ 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.PutMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import javax.websocket.server.PathParam;
import java.util.List;
@ -34,7 +31,7 @@ public class FactoryStoreController {
@PutMapping(value="/insert/{name}/{code}")
@ApiOperation(value="service服务",notes="返回内容添加service")
public ResultBean insertFactory(@PathParam("name")String name,@PathParam("code")String code){
public ResultBean insertFactory(@PathVariable("name")String name, @PathVariable("code")String code){
FactoryStore fs = new FactoryStore();
fs.setStoreName(name);
fs.setStoreCode(code);

@ -17,6 +17,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.websocket.server.PathParam;
import java.util.List;
/**

@ -1,165 +1,173 @@
package cn.estsh.i3plus.core.apiservice.controller.busi;
import cn.estsh.i3plus.core.api.iservice.base.ISysUserService;
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.model.flatform.UserModel;
import cn.estsh.i3plus.pojo.platform.bean.SysRole;
import cn.estsh.i3plus.pojo.platform.bean.SysUser;
import cn.estsh.impp.framework.boot.auth.AuthUtil;
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 cn.estsh.impp.framework.boot.util.ValidatorBean;
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.*;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @Date : 2018-10-25 21:46
* @Modify :
**/
@RestController
@RequestMapping("/user")
@Api(description = "系统用户服务")
public class SysUserController {
public static final Logger LOGGER = LoggerFactory.getLogger(TaskTimeController.class);
@Autowired
private ISysUserService sysUserService;
@PostMapping(value = "/insert")
@ApiOperation(value = "新增用户", notes = "新增系统用户")
public ResultBean insertSysUser(UserModel model) {
try {
// 用户基础信息校验
ValidatorBean.beginValid(model);
ValidatorBean.beginValid(model.getUser())
.notNull("userLoginName",model.getUser().getUserLoginName())
.notNull("userLoginPassword",model.getUser().getUserLoginPassword())
.notNull("userEmpNo",model.getUser().getUserEmpNo())
.notNull("userEmail",model.getUser().getUserEmail());
ValidatorBean.beginValid(model.getRole())
.notNull("id",model.getRole().getId());
ValidatorBean.beginValid(model.getDepartment())
.notNull("id",model.getDepartment().id);
ValidatorBean.beginValid(model.getPosition())
.notNull("id",model.getPosition().getId());
model.getUser().setUserTypeId(CommonEnumUtil.USER_TYPE.USER.getValue());
model.getUser().setDepartmentId(model.getDepartment().getId());
model.getUser().setRoleId(model.getRole().getId());
model.getUser().setPositionId(model.getPosition().getId());
ConvertBean.modelInitialize(model.getUser(), AuthUtil.getSessionUser());
SysUser user = sysUserService.insertSysUserModel(model, AuthUtil.getSessionUser());
return ResultBean.success("操作成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultObject(user);
} 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());
}
}
@PutMapping(value = "/update")
@ApiOperation(value = "修改用户", notes = "修改用户信息")
public ResultBean updateSysUser(UserModel model) {
try {
// 用户基础信息校验
ValidatorBean.beginValid(model);
ValidatorBean.beginValid(model.getUser())
.notNull("id",model.getUser().getId())
.notNull("userLoginName",model.getUser().getUserLoginName())
.notNull("userLoginPassword",model.getUser().getUserLoginPassword())
.notNull("userEmpNo",model.getUser().getUserEmpNo())
.notNull("userEmail",model.getUser().getUserEmail());
ValidatorBean.beginValid(model.getRole())
.notNull("id",model.getRole().getId());
ValidatorBean.beginValid(model.getDepartment())
.notNull("id",model.getDepartment().id);
ValidatorBean.beginValid(model.getPosition())
.notNull("id",model.getPosition().getId());
model.getUser().setUserTypeId(CommonEnumUtil.USER_TYPE.USER.getValue());
model.getUser().setDepartmentId(model.getDepartment().getId());
model.getUser().setRoleId(model.getRole().getId());
model.getUser().setPositionId(model.getPosition().getId());
ConvertBean.modelUpdate(model.getUser(), AuthUtil.getSessionUser());
sysUserService.updateSysUserModel(model, AuthUtil.getSessionUser());
return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep.getErrorShow()).build();
} catch (Exception e) {
return ResultBean.fail(e.getMessage()).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}
}
@GetMapping(value = "/list")
@ApiOperation(value = "查询所有用户", notes = "查询所有系统用户")
public ResultBean findAll() {
try {
List<SysUser> list = sysUserService.findSysUserAll();
return ResultBean.success("操作成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultList(list);
} 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());
}
}
@DeleteMapping(value = "/delete")
@ApiOperation(value = "删除定时任务", notes = "删除定时任务")
public ResultBean delete(String id) {
try {
// 数据校验
ValidatorBean.checkNotNull(id, "用户id 不能为空");
sysUserService.deleteSysUserById(id);
return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} 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());
}
}
}
//package cn.estsh.i3plus.core.apiservice.controller.busi;
//
//import cn.estsh.i3plus.core.api.iservice.base.ISysUserService;
//import cn.estsh.i3plus.platform.common.convert.ConvertBean;
//import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
//import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
//import cn.estsh.i3plus.pojo.model.flatform.UserModel;
//import cn.estsh.i3plus.pojo.platform.bean.SysUser;
//import cn.estsh.impp.framework.boot.auth.AuthUtil;
//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 cn.estsh.impp.framework.boot.util.ValidatorBean;
//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.*;
//
//import java.util.List;
//
///**
// * @Description : 系统用户操作服务
// * @Reference :
// * @Author : wei.peng
// * @Date : 2018-10-25 21:46
// * @Modify :
// **/
//@RestController
//@RequestMapping("/user")
//@Api(description = "系统用户服务")
//public class SysUserController {
//
// public static final Logger LOGGER = LoggerFactory.getLogger(TaskTimeController.class);
//
// @Autowired
// private ISysUserService sysUserService;
//
//
// @PostMapping(value = "/insert")
// @ApiOperation(value = "新增用户", notes = "新增系统用户")
// public ResultBean insertSysUser(SysUser user,String[] departmentIds,String[] positionIds ,String[] roleIds) {
// try {
// /**
// * 先插入 user
// * 插入用户部门关系数据
// * 冗余部门名称信息
// * 插入用户岗位关系数据
// * 冗余岗位名称信息
// * ...
// */
//
//// // 用户基础信息校验
//// ValidatorBean.beginValid(model);
////
//// ValidatorBean.beginValid(model.getUser())
//// .notNull("userLoginName",model.getUser().getUserLoginName())
//// .notNull("userLoginPassword",model.getUser().getUserLoginPassword())
//// .notNull("userEmpNo",model.getUser().getUserEmpNo())
//// .notNull("userEmail",model.getUser().getUserEmail());
////
//// ValidatorBean.beginValid(model.getRole())
//// .notNull("id",model.getRole().getId());
////
//// ValidatorBean.beginValid(model.getDepartment())
//// .notNull("id",model.getDepartment().id);
////
//// ValidatorBean.beginValid(model.getPosition())
//// .notNull("id",model.getPosition().getId());
////
////
//// model.getUser().setUserTypeId(CommonEnumUtil.USER_TYPE.USER.getValue());
//// model.getUser().setDepartmentId(model.getDepartment().getId());
//// model.getUser().setRoleId(model.getRole().getId());
//// model.getUser().setPositionId(model.getPosition().getId());
////
//// ConvertBean.modelInitialize(model.getUser(), AuthUtil.getSessionUser());
////
//// SysUser user = sysUserService.insertSysUserModel(model, AuthUtil.getSessionUser());
//
// return ResultBean.success("操作成功")
// .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
// .setResultObject(user);
// } 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());
// }
// }
//
// @PutMapping(value = "/update")
// @ApiOperation(value = "修改用户", notes = "修改用户信息")
// public ResultBean updateSysUser(UserModel model) {
// try {
// // 用户基础信息校验
// ValidatorBean.beginValid(model);
//
// ValidatorBean.beginValid(model.getUser())
// .notNull("id",model.getUser().getId())
// .notNull("userLoginName",model.getUser().getUserLoginName())
// .notNull("userLoginPassword",model.getUser().getUserLoginPassword())
// .notNull("userEmpNo",model.getUser().getUserEmpNo())
// .notNull("userEmail",model.getUser().getUserEmail());
//
// ValidatorBean.beginValid(model.getRole())
// .notNull("id",model.getRole().getId());
//
// ValidatorBean.beginValid(model.getDepartment())
// .notNull("id",model.getDepartment().id);
//
// ValidatorBean.beginValid(model.getPosition())
// .notNull("id",model.getPosition().getId());
//
//
// model.getUser().setUserTypeId(CommonEnumUtil.USER_TYPE.USER.getValue());
// model.getUser().setDepartmentId(model.getDepartment().getId());
// model.getUser().setRoleId(model.getRole().getId());
// model.getUser().setPositionId(model.getPosition().getId());
//
// ConvertBean.modelUpdate(model.getUser(), AuthUtil.getSessionUser());
//
// sysUserService.updateSysUserModel(model, AuthUtil.getSessionUser());
//
// return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
// } catch (ImppBusiException busExcep) {
// LOGGER.error(busExcep.getErrorMsg() + "{}", busExcep.getErrorDetail(), busExcep);
// return ResultBean.fail(busExcep.getErrorShow()).build();
// } catch (Exception e) {
// return ResultBean.fail(e.getMessage()).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
// }
// }
//
// @GetMapping(value = "/list")
// @ApiOperation(value = "查询所有用户", notes = "查询所有系统用户")
// public ResultBean findAll() {
// try {
// List<SysUser> list = sysUserService.findSysUserAll();
// return ResultBean.success("操作成功")
// .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
// .setResultList(list);
// } 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());
// }
// }
//
// @DeleteMapping(value = "/delete")
// @ApiOperation(value = "删除定时任务", notes = "删除定时任务")
// public ResultBean delete(String id) {
// try {
// // 数据校验
// ValidatorBean.checkNotNull(id, "用户id 不能为空");
//
// sysUserService.deleteSysUserById(id);
// return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
// } 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());
// }
// }
//
//
//
//}

@ -26,7 +26,7 @@ import java.util.List;
* @Modify :
**/
@RestController
@RequestMapping("/sys-time-expression")
@RequestMapping("/task-time-expression")
@Api(description = "系统时间表达式")
public class TaskTimeExpressionController {
@ -88,9 +88,9 @@ public class TaskTimeExpressionController {
}
}
@DeleteMapping(value = "/delete")
@DeleteMapping(value = "/delete/{id}")
@ApiOperation(value = "删除系统时间表达式", notes = "删除系统时间表达式")
public ResultBean deleteTaskTimeExpression(String id) {
public ResultBean deleteTaskTimeExpression(@PathVariable("id") String id) {
try {
// 数据校验
ValidatorBean.checkNotNull(id, "时间表达式id 不能为空");

@ -2,7 +2,6 @@ package cn.estsh.i3plus.core.apiservice.listener;
import cn.estsh.i3plus.core.api.iservice.busi.ISystemResourceService;
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.SysLocaleLanguage;
import cn.estsh.i3plus.pojo.platform.bean.SysLocaleResource;

@ -11,7 +11,6 @@ import cn.estsh.i3plus.pojo.platform.repository.SysUserRepository;
import cn.estsh.impp.framework.boot.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;

@ -1,441 +1,441 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.base.ISysUserService;
import cn.estsh.i3plus.core.apiservice.dao.IUserPermissionDao;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.shirotoken.AdminToken;
import cn.estsh.i3plus.pojo.base.shirotoken.SaAdminToken;
import cn.estsh.i3plus.pojo.base.shirotoken.UserToken;
import cn.estsh.i3plus.pojo.model.flatform.UserModel;
import cn.estsh.i3plus.pojo.platform.bean.*;
import cn.estsh.i3plus.pojo.platform.repository.*;
import cn.estsh.impp.framework.boot.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authc.AuthenticationToken;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @Date : 2018-10-25 17:45
* @Modify :
**/
@Service
public class SysUserServiceImpl implements ISysUserService {
public static final Logger LOGGER = LoggerFactory.getLogger(SysUserServiceImpl.class);
@Autowired
private SysUserRepository sysUserRDao;
@Autowired
private SysUserInfoRepository sysUserInfoRDao;
@Autowired
private IUserPermissionDao userPermissionDao;
@Autowired
private OrganizeRepository organizeRDao;
@Autowired
private SysRoleRepository sysRoleRDao;
@Autowired
private DepartmentRepository departmentRDao;
@Autowired
private PositionRepository positionRDao;
@Autowired
private RefUserRoleRepository refUserRoleRDao;
@Autowired
private RefUserDepartmentRepository refUserDepartmentRDao;
@Autowired
private RefUserPositionRepository refUserPositionRDao;
@Override
public SessionUser queryUserLogin(String loginName, String password, String languageCode) {
LOGGER.info("平台用户 SYS_USER loginName:{} \t password:{} \t languageCode:{}", loginName, password, languageCode);
SysUser user = getSysUserByLoginName(loginName);
AuthenticationToken token = null;
if (user == null) {
//用户不存在
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode())
.setErrorCode(ImppExceptionEnum.LOGIN_EXCEPTION.getCode())
.setErrorDetail("用户不存在")
.setErrorSolution("重新登陆")
.build();
} else if (!StringUtils.equals(user.getUserLoginPassword(), password)) {
//密码不符
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode())
.setErrorCode(ImppExceptionEnum.LOGIN_EXCEPTION.getCode())
.setErrorDetail("登陆密码错误")
.setErrorSolution("重新输入")
.build();
}
switch (user.getUserTypeId()) {
case 2:
token = new AdminToken(loginName, password, languageCode);
break;
case 3:
token = new SaAdminToken(loginName, password, languageCode);
break;
default:
token = new UserToken(loginName, password, languageCode);
break;
}
SessionUser sessionUser = AuthUtil.login(token);
user = getSysUserInfo(user); //设置用户详细信息
packSessionUser(sessionUser, user, user.getUserTypeId(), languageCode);
AuthUtil.setSessionUser(sessionUser);
return sessionUser;
}
@Override
public void updateSysUserStatus(String id, int status, SessionUser user) {
LOGGER.info("平台用户 SYS_USER id:{} \t status:{} \t modifyUser:{}", id, status, user.getUserName());
SysUser sysUser = sysUserRDao.getById(Long.parseLong(id));
sysUser.setUserStatus(status);
sysUser.setModifyUser(user.getUserName());
sysUserRDao.update(sysUser);
}
@Override
public SysUser updateSysUserModel(UserModel model, SessionUser user) {
LOGGER.info("平台用户 SYS_USER model:{}", model);
LOGGER.info("平台用户 SYS_USER user:{}", user);
// 数据真实性校验
SysRole sysRole = sysRoleRDao.getById(model.getRole().id);
checkSysRole(sysRole);
Department dep = departmentRDao.getById(model.getDepartment().getId());
checkDepartment(dep);
Position pos = positionRDao.getById(model.getPosition().getId());
checkPosition(pos);
Organize organize = organizeRDao.getById(model.getDepartment().getOrganizeId());
checkOrganize(organize);
SysUser sysUser = model.getUser();
SysUser loginUser = getSysUserByLoginName(sysUser.getUserLoginName());
// 判断是否修改登录名称
if (null == loginUser || loginUser.getId().equals(sysUser.getId())) {
// 冗余部分信息
sysUser.setRedDepartmentName(dep.getDepartmentName());
sysUser.setRedRoleName(sysRole.getName());
sysUser.setRedPositionName(pos.getPositionName());
sysUser.setOrganizeId(organize.getId());
sysUser.setRedOrganizeName(organize.getRedParentName());
if (!sysUser.getUserLoginPassword().isEmpty()) {
//TODO 密码加密
}
// 刷新用户角色关系信息
refreshRefUserRole( model, sysUser);
// 刷新用户部门关系信息
refreshRefUserDepartment( model, sysUser);
// 刷新用户岗位关系信息
refreshRefUserPosition( model, sysUser);
// 保存用户信息
sysUserInfoRDao.save(model.getUserInfo());
return sysUserRDao.save(sysUser);
} else {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode())
.setErrorCode(ImppExceptionEnum.IO_EXCEPTION.getCode())
.setErrorDetail("用户名已存在")
.setErrorSolution("请重新输入用户名")
.build();
}
}
@Override
public SysUser insertSysUserModel(UserModel model, SessionUser user) {
LOGGER.info("平台用户 SYS_USER model:{}", model);
LOGGER.info("平台用户 SYS_USER user:{}", user);
SysUser sysUser = model.getUser();
SysUser loginUser = getSysUserByLoginName(sysUser.getUserLoginName());
if (null == loginUser) {
sysUser = sysUserRDao.insert(sysUser);
model.getUserInfo().setUserId(sysUser.getId());
model.setUser(sysUser);
return updateSysUserModel(model, user);
} else {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode())
.setErrorCode(ImppExceptionEnum.IO_EXCEPTION.getCode())
.setErrorDetail("用户名已存在")
.setErrorSolution("请重新输入用户名")
.build();
}
}
@Override
public void deleteSysUserById(String id) {
LOGGER.info("平台用户 SYS_USER DELETE By id :{}", id);
sysUserRDao.updateByProperties("id", id, "isValid", CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
// //TODO 确认是否物理删除
refUserRoleRDao.deleteByProperties("userId", Long.parseLong(id)); // 删除用户角色关系
refUserDepartmentRDao.deleteByProperties("userId", Long.parseLong(id)); //删除用户部门关系
refUserPositionRDao.deleteByProperties("userId", Long.parseLong(id)); //删除用户部门关系
// refUserRoleRDao.updateByProperties("userId",id,"isValid", CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
// refUserDepartmentRDao.updateByProperties("userId",id,"isValid", CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
// refUserPositionRDao.updateByProperties("userId",id,"isValid", CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
}
@Override
public List<SysUser> findSysUserAll() {
LOGGER.info("平台用户 SYS_USER find All");
return sysUserRDao.findByProperty("isValid", CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
}
@Override
public SysUser getSysUserById(String id) {
LOGGER.info("平台用户 SYS_USER get By id :{}", id);
return sysUserRDao.getById(Long.parseLong(id));
}
@Override
public SysUser getSysUserByLoginName(String loginName) {
LOGGER.info("平台用户 SYS_USER find By Login Name :{}", loginName);
return sysUserRDao.getByProperty(new String[]{"userLoginName", "isValid"},
new Object[]{loginName, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()});
}
/**
*
*
* @param user
* @return
*/
@Override
public SysUser getSysUserInfo(SysUser user) {
LOGGER.info("平台用户 SYS_USER user id :{}", user.getId());
SysUserInfo userInfo = sysUserInfoRDao.getByProperty("userId", user.getId());
Organize organize = organizeRDao.getById(user.getOrganizeId());
List<Department> departmentList = userPermissionDao.findDepartmentByUser(user);
List<Position> positionList = userPermissionDao.findPositionByUser(user);
List<SysMenu> menuList = userPermissionDao.findSysMenuByUser(user);
List<SysRole> roleList = userPermissionDao.findSysRoleByUser(user);
LOGGER.info("平台用户 SYS_USER userInfo :{}", userInfo);
LOGGER.info("平台用户 SYS_USER organize :{}", organize);
LOGGER.info("平台用户 SYS_USER departmentList size :{}", departmentList.size());
LOGGER.info("平台用户 SYS_USER positionList size :{}", positionList.size());
LOGGER.info("平台用户 SYS_USER menuList size :{}", menuList.size());
LOGGER.info("平台用户 SYS_USER roleList size :{}", roleList.size());
user.setUserInfo(userInfo);
user.setOrganize(organize);
user.setDepartmentList(departmentList);
user.setMenuList(menuList);
user.setPositionList(positionList);
user.setRoleList(roleList);
return user;
}
/**************************************** 公共方法封装 ****************************************/
/**
*
*
* @param sessionUser
* @param user
* @param userType
* @param languageCode
* @return
*/
public static SessionUser packSessionUser(SessionUser sessionUser, SysUser user, Integer userType, String languageCode) {
sessionUser.setLanguageCode(languageCode);
sessionUser.setUserName(user.getName());
sessionUser.setUserType(CommonEnumUtil.USER_TYPE.valueOf(userType));
sessionUser.setUserCode(user.getUserInfo().getLanguageCode());
sessionUser.setRoleList(user.getRoleList());
sessionUser.setDepartmentList(user.getDepartmentList());
sessionUser.setPositionList(user.getPositionList());
sessionUser.setOrganize(user.getOrganize());
return sessionUser;
}
/**
*
* @param model
* @param sysUser
*/
private void refreshRefUserRole( UserModel model, SysUser sysUser) {
// 用户角色操作
refUserRoleRDao.deleteByProperties("userId", sysUser.getId()); // 删除用户角色关系
if (null != model.getRoles() && model.getRoles().size() > 0) { //角色非空是操作
List<RefUserRole> refUserRoles = new ArrayList<>();
StringBuffer roleNames = new StringBuffer();
RefUserRole refUserRole = null;
for (SysRole role : model.getRoles()) {
roleNames.append("," + role.getName());
// 用户角色关系创建
refUserRole = new RefUserRole(sysUser.getId(), role.getId(), role.getName());
refUserRoles.add(refUserRole);
}
refUserRoleRDao.saveAll(refUserRoles);
// 角色名称冗余
model.getUserInfo().setRedRoleNames(roleNames.substring(1, roleNames.length()));
}
}
/**
*
* @param model
* @param sysUser
*/
private void refreshRefUserDepartment(UserModel model, SysUser sysUser) {
// 用户部门操作
refUserDepartmentRDao.deleteByProperties("userId", sysUser.getId()); //删除用户部门关系
if (null != model.getDepartments() && model.getDepartments().size() > 0) {
List<RefUserDepartment> refUserDepartments = new ArrayList<>();
StringBuffer departmentNames = new StringBuffer();
RefUserDepartment refUserDepartment = null;
for (Department department : model.getDepartments()) {
departmentNames.append("," + department.getDepartmentName());
// 用户部门关系创建
refUserDepartment = new RefUserDepartment(sysUser.getId(), department.getId(), department.getDepartmentName());
refUserDepartments.add(refUserDepartment);
}
refUserDepartmentRDao.save(refUserDepartment);
// 部门名称冗余
model.getUserInfo().setRedDepartmentNames(departmentNames.substring(1, departmentNames.length()));
}
}
/**
*
* @param model
* @param sysUser
*/
private void refreshRefUserPosition(UserModel model, SysUser sysUser) {
refUserPositionRDao.deleteByProperties("userId", sysUser.getId()); //删除用户部门关系
if (null != model.getPositions() && model.getPositions().size() > 0) {
List<RefUserPosition> refUserPositions = new ArrayList<>();
StringBuffer positionNames = new StringBuffer();
RefUserPosition refUserPosition = null;
for (Position position : model.getPositions()) {
positionNames.append("," + position.getPositionName());
// 用户岗位关系创建
refUserPosition = new RefUserPosition(sysUser.getId(), position.getId(), position.getPositionName());
refUserPositions.add(refUserPosition);
}
refUserPositionRDao.saveAll(refUserPositions);
// 岗位名称冗余
model.getUserInfo().setRedPositionNames(positionNames.substring(1, positionNames.length()));
}
}
/**
*
* @param department
*/
private void checkDepartment(Department department) {
if (null == department) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode())
.setErrorCode(ImppExceptionEnum.IO_EXCEPTION.getCode())
.setErrorDetail("部门不存在")
.setErrorSolution("请重新输入部门信息")
.build();
}
}
/**
*
* @param position
*/
private void checkPosition(Position position) {
if (null == position) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode())
.setErrorCode(ImppExceptionEnum.IO_EXCEPTION.getCode())
.setErrorDetail("岗位不存在")
.setErrorSolution("请重新输入岗位信息")
.build();
}
}
/**
*
* @param sysRole
*/
private void checkSysRole(SysRole sysRole) {
if (null == sysRole) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode())
.setErrorCode(ImppExceptionEnum.IO_EXCEPTION.getCode())
.setErrorDetail("角色不存在")
.setErrorSolution("请重新输入角色信息")
.build();
}
}
/**
*
* @param organize
*/
private void checkOrganize(Organize organize) {
if (null == organize) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode())
.setErrorCode(ImppExceptionEnum.IO_EXCEPTION.getCode())
.setErrorDetail("部门的组织不存在")
.setErrorSolution("请先完善组织信息")
.build();
}
}
}
//package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
//
//import cn.estsh.i3plus.core.api.iservice.base.ISysUserService;
//import cn.estsh.i3plus.core.apiservice.dao.IUserPermissionDao;
//import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
//import cn.estsh.i3plus.pojo.base.shirotoken.AdminToken;
//import cn.estsh.i3plus.pojo.base.shirotoken.SaAdminToken;
//import cn.estsh.i3plus.pojo.base.shirotoken.UserToken;
//import cn.estsh.i3plus.pojo.model.flatform.UserModel;
//import cn.estsh.i3plus.pojo.platform.bean.*;
//import cn.estsh.i3plus.pojo.platform.repository.*;
//import cn.estsh.impp.framework.boot.auth.AuthUtil;
//import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
//import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
//import org.apache.commons.lang3.StringUtils;
//import org.apache.shiro.authc.AuthenticationToken;
//import org.slf4j.Logger;
//import org.slf4j.LoggerFactory;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.stereotype.Service;
//
//import java.util.ArrayList;
//import java.util.List;
//
///**
// * @Description : 平台用户业务
// * @Reference :
// * @Author : wei.peng
// * @Date : 2018-10-25 17:45
// * @Modify :
// **/
//@Service
//public class SysUserServiceImpl implements ISysUserService {
//
// public static final Logger LOGGER = LoggerFactory.getLogger(SysUserServiceImpl.class);
//
// @Autowired
// private SysUserRepository sysUserRDao;
//
// @Autowired
// private SysUserInfoRepository sysUserInfoRDao;
//
// @Autowired
// private IUserPermissionDao userPermissionDao;
//
// @Autowired
// private OrganizeRepository organizeRDao;
//
// @Autowired
// private SysRoleRepository sysRoleRDao;
//
// @Autowired
// private DepartmentRepository departmentRDao;
//
// @Autowired
// private PositionRepository positionRDao;
//
// @Autowired
// private RefUserRoleRepository refUserRoleRDao;
//
// @Autowired
// private RefUserDepartmentRepository refUserDepartmentRDao;
//
// @Autowired
// private RefUserPositionRepository refUserPositionRDao;
//
// @Override
// public SessionUser queryUserLogin(String loginName, String password, String languageCode) {
// LOGGER.info("平台用户 SYS_USER loginName:{} \t password:{} \t languageCode:{}", loginName, password, languageCode);
// SysUser user = getSysUserByLoginName(loginName);
// AuthenticationToken token = null;
//
// if (user == null) {
// //用户不存在
// throw ImppExceptionBuilder.newInstance()
// .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode())
// .setErrorCode(ImppExceptionEnum.LOGIN_EXCEPTION.getCode())
// .setErrorDetail("用户不存在")
// .setErrorSolution("重新登陆")
// .build();
// } else if (!StringUtils.equals(user.getUserLoginPassword(), password)) {
// //密码不符
// throw ImppExceptionBuilder.newInstance()
// .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode())
// .setErrorCode(ImppExceptionEnum.LOGIN_EXCEPTION.getCode())
// .setErrorDetail("登陆密码错误")
// .setErrorSolution("重新输入")
// .build();
// }
//
// switch (user.getUserTypeId()) {
// case 2:
// token = new AdminToken(loginName, password, languageCode);
// break;
// case 3:
// token = new SaAdminToken(loginName, password, languageCode);
// break;
// default:
// token = new UserToken(loginName, password, languageCode);
// break;
// }
// SessionUser sessionUser = AuthUtil.login(token);
//
// user = getSysUserInfo(user); //设置用户详细信息
// packSessionUser(sessionUser, user, user.getUserTypeId(), languageCode);
// AuthUtil.setSessionUser(sessionUser);
// return sessionUser;
// }
//
//
// @Override
// public void updateSysUserStatus(String id, int status, SessionUser user) {
// LOGGER.info("平台用户 SYS_USER id:{} status:{} modifyUser:{}", id, status, user.getUserName());
// SysUser sysUser = sysUserRDao.getById(Long.parseLong(id));
// sysUser.setUserStatus(status);
// sysUser.setModifyUser(user.getUserName());
// sysUserRDao.update(sysUser);
// }
//
// @Override
// public SysUser updateSysUserModel(UserModel model, SessionUser user) {
// LOGGER.info("平台用户 SYS_USER model:{}", model);
// LOGGER.info("平台用户 SYS_USER user:{}", user);
//
// // 数据真实性校验
// SysRole sysRole = sysRoleRDao.getById(model.getRole().id);
// checkSysRole(sysRole);
//
// Department dep = departmentRDao.getById(model.getDepartment().getId());
// checkDepartment(dep);
//
// Position pos = positionRDao.getById(model.getPosition().getId());
// checkPosition(pos);
//
// Organize organize = organizeRDao.getById(model.getDepartment().getOrganizeId());
// checkOrganize(organize);
//
// SysUser sysUser = model.getUser();
//
// //TODO UserLoginName Count
// SysUser loginUser = getSysUserByLoginName(sysUser.getUserLoginName());
// // 判断是否修改登录名称
// if (loginUser == null || loginUser.getId().equals(sysUser.getId())) {
// // 冗余部分信息
// sysUser.setRedDepartmentName(dep.getDepartmentName());
// sysUser.setRedRoleName(sysRole.getName());
// sysUser.setRedPositionName(pos.getPositionName());
// sysUser.setOrganizeId(organize.getId());
// sysUser.setRedOrganizeName(organize.getRedParentName());
//
// if (!sysUser.getUserLoginPassword().isEmpty()) {
// //TODO 密码加密
// }
//
// // 刷新用户角色关系信息
// refreshRefUserRole(model, sysUser);
//
// // 刷新用户部门关系信息
// refreshRefUserDepartment(model, sysUser);
//
// // 刷新用户岗位关系信息
// refreshRefUserPosition(model, sysUser);
//
// // 保存用户信息
// sysUserInfoRDao.save(model.getUserInfo());
// return sysUserRDao.save(sysUser);
// } else {
// throw ImppExceptionBuilder.newInstance()
// .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode())
// .setErrorCode(ImppExceptionEnum.IO_EXCEPTION.getCode())
// .setErrorDetail("用户名已存在")
// .setErrorSolution("请重新输入用户名")
// .build();
// }
// }
//
// @Override
// public SysUser insertSysUserModel(UserModel model, SessionUser user) {
// LOGGER.info("平台用户 SYS_USER model:{}", model);
// LOGGER.info("平台用户 SYS_USER user:{}", user);
//
// SysUser sysUser = model.getUser();
// SysUser loginUser = getSysUserByLoginName(sysUser.getUserLoginName());
// if (null == loginUser) {
// sysUser = sysUserRDao.insert(sysUser);
// model.getUserInfo().setUserId(sysUser.getId());
// model.setUser(sysUser);
// return updateSysUserModel(model, user);
// } else {
// throw ImppExceptionBuilder.newInstance()
// .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode())
// .setErrorCode(ImppExceptionEnum.IO_EXCEPTION.getCode())
// .setErrorDetail("用户名已存在")
// .setErrorSolution("请重新输入用户名")
// .build();
// }
// }
//
// @Override
// public void deleteSysUserById(String id) {
// LOGGER.info("平台用户 SYS_USER DELETE By id :{}", id);
// sysUserRDao.updateByProperties("id", id, "isValid", CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
//
// // 删除用户关系(物理删除)
// refUserRoleRDao.deleteByProperties("userId", Long.parseLong(id)); // 删除用户角色关系
// refUserDepartmentRDao.deleteByProperties("userId", Long.parseLong(id)); //删除用户部门关系
// refUserPositionRDao.deleteByProperties("userId", Long.parseLong(id)); //删除用户部门关系
// }
//
// @Override
// public List<SysUser> findSysUserAll() {
// LOGGER.info("平台用户 SYS_USER find All");
// return sysUserRDao.findByProperty("isValid", CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
// }
//
// @Override
// public SysUser getSysUserById(String id) {
// LOGGER.info("平台用户 SYS_USER get By id :{}", id);
// return sysUserRDao.getById(Long.parseLong(id));
// }
//
// @Override
// public SysUser getSysUserByLoginName(String loginName) {
// LOGGER.info("平台用户 SYS_USER find By Login Name :{}", loginName);
// return sysUserRDao.getByProperty(new String[]{"userLoginName", "isValid"},
// new Object[]{loginName, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()});
// }
//
// /**
// * 设置用户详细信息
// *
// * @param user
// * @return
// */
// @Override
// public SysUser getSysUserInfo(SysUser user) {
// LOGGER.info("平台用户 SYS_USER user id :{}", user.getId());
// SysUserInfo userInfo = sysUserInfoRDao.getByProperty("userId", user.getId());
// Organize organize = organizeRDao.getById(user.getOrganizeId());
//
// List<Department> departmentList = userPermissionDao.findDepartmentByUser(user);
// List<Position> positionList = userPermissionDao.findPositionByUser(user);
// List<SysMenu> menuList = userPermissionDao.findSysMenuByUser(user);
// List<SysRole> roleList = userPermissionDao.findSysRoleByUser(user);
//
// LOGGER.info("平台用户 SYS_USER userInfo :{}", userInfo);
// LOGGER.info("平台用户 SYS_USER organize :{}", organize);
// LOGGER.info("平台用户 SYS_USER departmentList size :{}", departmentList.size());
// LOGGER.info("平台用户 SYS_USER positionList size :{}", positionList.size());
// LOGGER.info("平台用户 SYS_USER menuList size :{}", menuList.size());
// LOGGER.info("平台用户 SYS_USER roleList size :{}", roleList.size());
//
// user.setUserInfo(userInfo);
// user.setOrganize(organize);
// user.setDepartmentList(departmentList);
// user.setMenuList(menuList);
// user.setPositionList(positionList);
// user.setRoleList(roleList);
//
// return user;
// }
//
//
//
//
//
//
//
//
//
//
//
// /**************************************** 公共方法封装 ****************************************/
//
//// dealUserInfo() 用户信息封装
//
//
// /**
// * 封装用户登陆信息
// *
// * @param sessionUser 当前会话信息
// * @param user 当前登录用户
// * @param userType 用户类型
// * @param languageCode 用户选择的语言
// * @return
// */
// public static SessionUser packSessionUser(SessionUser sessionUser, SysUser user, Integer userType, String languageCode) {
// sessionUser.setLanguageCode(languageCode);
// sessionUser.setUserName(user.getName());
// sessionUser.setUserType(CommonEnumUtil.USER_TYPE.valueOf(userType));
// sessionUser.setUserCode(user.getUserInfo().getLanguageCode());
// sessionUser.setRoleList(user.getRoleList());
// sessionUser.setDepartmentList(user.getDepartmentList());
// sessionUser.setPositionList(user.getPositionList());
// sessionUser.setOrganize(user.getOrganize());
// return sessionUser;
// }
//
// /**
// * 刷新用户 角色关系
// * @param model
// * @param sysUser
// */
// private void refreshRefUserRole( UserModel model, SysUser sysUser) {
// // 用户角色操作
// refUserRoleRDao.deleteByProperties("userId", sysUser.getId()); // 删除用户角色关系
// if (null != model.getRoles() && model.getRoles().size() > 0) { //角色非空是操作
// List<RefUserRole> refUserRoles = new ArrayList<>();
// List<String> roleNameList = new ArrayList<>();
// RefUserRole refUserRole = null;
//
// for (SysRole role : model.getRoles()) {
// roleNameList.add(role.getName());
// // 用户角色关系创建
// refUserRole = new RefUserRole(sysUser.getId(), role.getId(), role.getName());
// refUserRoles.add(refUserRole);
// }
//
// refUserRoleRDao.saveAll(refUserRoles);
// // 角色名称冗余
// model.getUserInfo().setRedRoleNames(String.join(",",roleNameList));
// }
// }
//
// /**
// * 刷新用户部门关系
// * @param model
// * @param sysUser
// */
// private void refreshRefUserDepartment(UserModel model, SysUser sysUser) {
// // 用户部门操作
// refUserDepartmentRDao.deleteByProperties("userId", sysUser.getId()); //删除用户部门关系
// /*if (null != model.getDepartments() && model.getDepartments().size() > 0) {
//
// List<RefUserDepartment> refUserDepartments = new ArrayList<>();
// StringBuffer departmentNames = new StringBuffer();
// RefUserDepartment refUserDepartment = null;
//
// for (Department department : model.getDepartments()) {
// departmentNames.append("," + department.getDepartmentName());
//
// // 用户部门关系创建
// refUserDepartment = new RefUserDepartment(sysUser.getId(), department.getId(), department.getDepartmentName());
// refUserDepartments.add(refUserDepartment);
// }
//
// refUserDepartmentRDao.save(refUserDepartment);
// // 部门名称冗余
// model.getUserInfo().setRedDepartmentNames(departmentNames.substring(1, departmentNames.length()));
// }*/
// }
//
//
// /**
// * 刷新用户岗位关系
// * @param model
// * @param sysUser
// */
// private void refreshRefUserPosition(UserModel model, SysUser sysUser) {
// /*refUserPositionRDao.deleteByProperties("userId", sysUser.getId()); //删除用户部门关系
// if (null != model.getPositions() && model.getPositions().size() > 0) {
//
// List<RefUserPosition> refUserPositions = new ArrayList<>();
// StringBuffer positionNames = new StringBuffer();
// RefUserPosition refUserPosition = null;
// for (Position position : model.getPositions()) {
// positionNames.append("," + position.getPositionName());
//
// // 用户岗位关系创建
// refUserPosition = new RefUserPosition(sysUser.getId(), position.getId(), position.getPositionName());
// refUserPositions.add(refUserPosition);
// }
//
// refUserPositionRDao.saveAll(refUserPositions);
// // 岗位名称冗余
// model.getUserInfo().setRedPositionNames(positionNames.substring(1, positionNames.length()));
// }*/
// }
//
//
// /**
// * 部门真实性校验
// * @param department
// */
// private void checkDepartment(Department department) {
// if (null == department) {
// throw ImppExceptionBuilder.newInstance()
// .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode())
// .setErrorCode(ImppExceptionEnum.IO_EXCEPTION.getCode())
// .setErrorDetail("部门不存在")
// .setErrorSolution("请重新输入部门信息")
// .build();
// }
// }
//
// /**
// * 岗位真实性 校验
// * @param position
// */
// private void checkPosition(Position position) {
// if (null == position) {
// throw ImppExceptionBuilder.newInstance()
// .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode())
// .setErrorCode(ImppExceptionEnum.IO_EXCEPTION.getCode())
// .setErrorDetail("岗位不存在")
// .setErrorSolution("请重新输入岗位信息")
// .build();
// }
// }
//
// /**
// * 角色真实信息校验
// * @param sysRole
// */
// private void checkSysRole(SysRole sysRole) {
// if (null == sysRole) {
// throw ImppExceptionBuilder.newInstance()
// .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode())
// .setErrorCode(ImppExceptionEnum.IO_EXCEPTION.getCode())
// .setErrorDetail("角色不存在")
// .setErrorSolution("请重新输入角色信息")
// .build();
// }
// }
//
// /**
// * 组织真实性校验
// * @param organize
// */
// private void checkOrganize(Organize organize) {
// if (null == organize) {
// throw ImppExceptionBuilder.newInstance()
// .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode())
// .setErrorCode(ImppExceptionEnum.IO_EXCEPTION.getCode())
// .setErrorDetail("部门的组织不存在")
// .setErrorSolution("请先完善组织信息")
// .build();
// }
//
// }
//}

@ -1,13 +1,8 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ITaskTimeExpressionService;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.SysRole;
import cn.estsh.i3plus.pojo.platform.bean.TaskTimeExpression;
import cn.estsh.i3plus.pojo.platform.repository.TaskTimeExpressionRepository;
import cn.estsh.i3plus.pojo.platform.repository.TaskTimeRecordingRepository;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;

@ -15,7 +15,8 @@ filter.shiro.saadmin.filteruri = /saoperate/*
#是否允许前端跨域提交
impp.web.cross = true
#允许前端跨域提交ip地址
impp.web.cross.host = http://127.0.0.1
impp.web.cross.host = http://localhost
################ 主数据源 ################
# mysql

@ -0,0 +1,95 @@
#用户登陆路径
filter.shiro.user.loginuri = /login
#系统管理员登陆路径
filter.shiro.admin.loginuri = /salogin
#运维人员登陆路径
filter.shiro.saadmin.loginuri = /salogin
#用户授权过滤路径
filter.shiro.user.filteruri = /operate/*
#用户授权过滤路径
filter.shiro.admin.filteruri = /adoperate/*
#用户授权过滤路径
filter.shiro.saadmin.filteruri = /saoperate/*
################ 主数据源 ################
# mysql
#spring.datasource.driver-class-name=com.mysql.jdbc.Driver
#spring.datasource.url=jdbc:mysql://localhost:3306/i3wms
##Sql-server##
#spring.datasource.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver
#spring.datasource.url=jdbc:sqlserver://127.0.0.1:1433;databaseName=i3wms
##oracle##
#spring.datasource.driver-class-name=oracle.jdbc.driver.OracleDriver
#spring.datasource.url=jdbc:oracle:thin:@127.0.0.1:1521:i3wms
#spring.datasource.username=root
#spring.datasource.password=123456
##主数据源,读写
#impp.write.datasource.type=com.zaxxer.hikari.HikariDataSource
impp.write.datasource.driver-class-name=com.mysql.jdbc.Driver
impp.write.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/test_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8
impp.write.datasource.username=i3_core
impp.write.datasource.password=i3_core_123456
##辅数据源,只读
#impp.read.datasource.type=com.zaxxer.hikari.HikariDataSource
impp.read.datasource.driver-class-name=com.mysql.jdbc.Driver
impp.read.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/test_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8
impp.read.datasource.username=i3_core
impp.read.datasource.password=i3_core_123456
##############定时任务持久化##############
impp.schedule.datasource.driver-class-name=com.mysql.jdbc.Driver
impp.schedule.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/test_i3_schedule?autoReconnect=true&useSSL=false&characterEncoding=utf-8
impp.schedule.datasource.username=i3_schedule
impp.schedule.datasource.password=i3_schedule_123456
impp.schedule.datasource.max-connections=20
#定时任务在服务启动后多少秒执行
impp.schedule.start.after-second=20
#是否集群部署
impp.schedule.datasource.is-clustered=true
#执行检测(毫秒),若宕机由其他定时器执行
impp.schedule.datasource.cluster-checkin-interval=30000
#线程数
impp.schedule.thread-count=10
#线程优先级1-10默认为5
impp.schedule.thread-priority=5
################ 数据池设置 ################
spring.datasource.maximum-pool-size=100
spring.datasource.max-active=3
spring.datasource.max-idle=3
spring.datasource.min-idle=1
spring.datasource.initial-size=1
spring.datasource.max-wait=10000
spring.datasource.validation-query=SELECT 1
spring.datasource.test-on-borrow=false
spring.datasource.test-while-idle=true
spring.datasource.time-between-eviction-runs-millis=18800
################ JPA设置设置 ################
# mysql
spring.jpa.database=MYSQL
spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
##Sql-server##
#spring.jpa.database=sql_server
#spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.SQLServerDialect
##oracle##
#spring.jpa.database=oracle
#spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.Oracle10gDialect
# mysql
spring.datasource.validationQuery=SELECT 1
##Sql-server##
# spring.datasource.validationQuery=SELECT 1
##oracle##
# spring.datasource.validationQuery=SELECT 1 FROM DUAL
#ImprovedNamingStrategy / physical_naming_strategy java属性映射到数据库字段时命名规则
# spring.jpa.properties.hibernate.physical_naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy/org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
#表关系create,create-drop,update,validate
spring.jpa.properties.hibernate.hbm2ddl.auto=update
#是否显示sql
spring.jpa.show-sql=true
Loading…
Cancel
Save