定时任务

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

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

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

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

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

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

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

@ -1,13 +1,8 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ITaskTimeExpressionService; 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.bean.TaskTimeExpression;
import cn.estsh.i3plus.pojo.platform.repository.TaskTimeExpressionRepository; 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.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

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