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

定时任务

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

权限
    用户管理           功能完成
    用户登录           功能完成
yun-zuoyi
wei.peng 7 years ago
parent 8ebe456cab
commit 7405bf575f
29 changed files with 1956 additions and 234 deletions
Show Stats Download Patch File Download Diff File

85
modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISysUserService.java
Unescape Escape View File

@ -0,0 +1,85 @@
package cn.estsh.i3plus.core.api.iservice.base;
import cn.estsh.i3plus.pojo.base.shirotoken.UserToken;
import cn.estsh.i3plus.pojo.model.flatform.UserModel;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
import cn.estsh.i3plus.pojo.platform.bean.SysUser;
import java.util.List;
/**
* @Description : 用户服务
* @Reference :
* @Author : wei.peng
* @Date : 2018-10-25 16:21
* @Modify :
**/
public interface ISysUserService {
/**
* 用户登录
* @param loginName 登录名
* @param password 登录密码
* @param languageCode 界面语言
* @return
*/
SessionUser queryUserLogin(String loginName, String password, String languageCode);
/**
* 修改权限状态
* @param id 修改权限状态
* @param status 状态
* @param user 当前会话用户
* @return
*/
void updateSysUserStatus(String id, int status, SessionUser user);
/**
* 修改用户信息
* @param model 封装的用户对象
* @param user 当前会话用户
*/
SysUser updateSysUserModel(UserModel model, SessionUser user);
/**
* 新建用户信息
* @param model 用户封装对象
* @param user 当前会话用户
*/
SysUser insertSysUserModel(UserModel model,SessionUser user);
/**
* 根据Key 删除数据
* @param id
* @return
*/
void deleteSysUserById(String id);
/**
* 查询所有数据
* @return
*/
List<SysUser> findSysUserAll();
/**
* 根据id 数据
* @param id
* @return
*/
SysUser getSysUserById(String id);
/**
* 根据登录名称 获取用户信息
* @param loginName
* @return
*/
SysUser getSysUserByLoginName(String loginName);
/**
* 封装用户详细信息
* @param user
* @return
*/
SysUser getSysUserInfo(SysUser user);
}

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

@ -1,6 +1,7 @@
package cn.estsh.i3plus.core.api.iservice.busi; package cn.estsh.i3plus.core.api.iservice.busi;
import cn.estsh.i3plus.pojo.platform.bean.Organize; import cn.estsh.i3plus.pojo.platform.bean.Organize;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.List; import java.util.List;
@ -21,11 +22,18 @@ public interface IOrganizeService {
void updateOrganize(Organize organize); void updateOrganize(Organize organize);
/** /**
* 修改 组织状态
* @param id 组织ID
* @param status 组织状态
* @param user 当前会话用户
*/
void updateOrganizeStatus(String id, int status, SessionUser user);
/**
* 根据Key 删除数据 * 根据Key 删除数据
* @param id * @param id
* @param modifyUser 当前用户名称
*/ */
void deleteOrganizeById(long id,String modifyUser); void deleteOrganizeById(String id);
/** /**
* 新增数据 * 新增数据
@ -45,5 +53,5 @@ public interface IOrganizeService {
* @param id * @param id
* @return * @return
*/ */
Organize getOrganizeById(long id); Organize getOrganizeById(String id);
} }

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

@ -29,14 +29,14 @@ public interface ISysMenuService {
* @param user 当前会话用户 * @param user 当前会话用户
* @return * @return
*/ */
void updateSysMenuStatus(long id, int status, SessionUser user); void updateSysMenuStatus(String id, int status, SessionUser user);
/** /**
* 根据Key 删除数据 * 根据Key 删除数据
* @param id * @param id
* @return * @return
*/ */
void deleteSysMenuById(long id); void deleteSysMenuById(String id);
/** /**
* 新增数据 * 新增数据
@ -59,7 +59,7 @@ public interface ISysMenuService {
* @param id * @param id
* @return * @return
*/ */
SysMenu getSysMenuById(long id); SysMenu getSysMenuById(String id);

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

@ -29,13 +29,13 @@ public interface ISysRoleService {
* @param user 当前用户会话 * @param user 当前用户会话
* @return * @return
*/ */
void updateSysRoleStatus(long id, int status, SessionUser user); void updateSysRoleStatus(String id, int status, SessionUser user);
/** /**
* 根据Key 删除数据 * 根据Key 删除数据
* @param id * @param id
*/ */
void deleteSysRoleById(long id); void deleteSysRoleById(String id);
/** /**
* 新增数据 * 新增数据
@ -58,5 +58,5 @@ public interface ISysRoleService {
* @param id * @param id
* @return * @return
*/ */
SysRole getSysRoleById(long id); SysRole getSysRoleById(String id);
} }

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

@ -0,0 +1,50 @@
package cn.estsh.i3plus.core.api.iservice.busi;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
import cn.estsh.i3plus.pojo.platform.bean.SysRole;
import cn.estsh.i3plus.pojo.platform.bean.TaskTimeExpression;
import java.util.List;
/**
* @Description : 定时任务表达式业务接口
* @Reference :
* @Author : wei.peng
* @Date : 2018-10-22 16:58:43.771
* @Modify :
**/
public interface ITaskTimeExpressionService {
/**
* 修改数据
* @param taskTimeExpression
*/
void updateTaskTimeExpression(TaskTimeExpression taskTimeExpression);
/**
* 根据Key 删除数据
* @param id
*/
void deleteTaskTimeExpressionById(String id);
/**
* 新增数据
* @param taskTimeExpression
* @return
*/
TaskTimeExpression insertTaskTimeExpression(TaskTimeExpression taskTimeExpression);
/**
* 查询所有数据
* @return
*/
List<TaskTimeExpression> findTaskTimeExpressionAll();
/**
* 根据ID 查询任务表达式
* @param id
* @return
*/
TaskTimeExpression getTaskTimeExpressionById(String id);
}

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

@ -0,0 +1,48 @@
package cn.estsh.i3plus.core.api.iservice.busi;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
import cn.estsh.i3plus.pojo.platform.bean.TaskTimeRecording;
import java.util.List;
/**
* @Description : 定时任务执行记录业务接口
* @Reference :
* @Author : wei.peng
* @Date : 2018-10-22 16:58:44.005
* @Modify :
**/
public interface ITaskTimeRecordingService {
/**
* 修改数据
* @param taskTimeRecording
*/
void updateTaskTimedRecording(TaskTimeRecording taskTimeRecording);
/**
* 根据Key 删除数据
* @param id
*/
void deleteTaskTimedRecordingById(String id);
/**
* 新增数据
* @param taskTimeRecording
* @return
*/
TaskTimeRecording insertTaskTimedRecording(TaskTimeRecording taskTimeRecording);
/**
* 查询所有数据
* @return
*/
List<TaskTimeRecording> findTaskTimedRecordingAll();
/**
* 根据id 数据
* @param id
* @return
*/
TaskTimeRecording getTaskTimedRecordingById(String id);
}

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

@ -0,0 +1,56 @@
package cn.estsh.i3plus.core.api.iservice.busi;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
import cn.estsh.i3plus.pojo.platform.bean.TaskTime;
import java.util.List;
/**
* @Description : 定时任务业务接口
* @Reference :
* @Author : wei.peng
* @Date : 2018-10-22 16:58:43.968
* @Modify :
**/
public interface ITaskTimeService {
/**
* 修改数据
* @param taskTime
*/
void updateTaskTimed(TaskTime taskTime);
/**
* 修改任务状态
* @param id 任务ID
* @param status 任务状态
* @param user 当前会话用户
*/
void updateTaskTimedStatus(String id, int status, SessionUser user);
/**
* 根据Key 删除数据
* @param id
*/
void deleteTaskTimedById(String id);
/**
* 新增数据
* @param taskTime
* @return
*/
TaskTime insertTaskTimed(TaskTime taskTime);
/**
* 查询所有数据
* @return
*/
List<TaskTime> findTaskTimedAll();
/**
* 根据id 数据
* @param id
* @return
*/
TaskTime getTaskTimedById(String id);
}

2
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoAuthController.java
Unescape Escape View File

@ -44,7 +44,6 @@ public class DemoAuthController {
SessionUser sUser = systemLoginService.queryUserLogin(loginName,loginPwd,languageCode); SessionUser sUser = systemLoginService.queryUserLogin(loginName,loginPwd,languageCode);
LOGGER.info("会员登陆：{}",sUser); LOGGER.info("会员登陆：{}",sUser);
AuthUtil.setSessionObject("languageCode",languageCode); AuthUtil.setSessionObject("languageCode",languageCode);
return new ResultBean(true,""); return new ResultBean(true,"");
} catch (ImppBusiException e) { } catch (ImppBusiException e) {
return new ResultBean(false,e.getErrorDetail() + ",so:" + e.getErrorSolution()); return new ResultBean(false,e.getErrorDetail() + ",so:" + e.getErrorSolution());
@ -61,7 +60,6 @@ public class DemoAuthController {
LOGGER.info("用户退出..."); LOGGER.info("用户退出...");
try { try {
AuthUtil.logout(); AuthUtil.logout();
return new ResultBean(true,""); return new ResultBean(true,"");
} catch (ImppBusiException e) { } catch (ImppBusiException e) {
return new ResultBean(false,e.getErrorDetail() + ",so:" + e.getErrorSolution()); return new ResultBean(false,e.getErrorDetail() + ",so:" + e.getErrorSolution());

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

@ -0,0 +1,91 @@
package cn.estsh.i3plus.core.apiservice.controller.base;
import cn.estsh.i3plus.core.api.iservice.base.ISysUserService;
import cn.estsh.i3plus.core.api.iservice.base.ISystemLoginService;
import cn.estsh.i3plus.core.apiservice.controller.DemoAuthController;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
import cn.estsh.impp.framework.boot.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.util.ImppRedis;
import cn.estsh.impp.framework.boot.util.ResultBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
/**
* @Description : 用户权限服务
* @Reference :
* @Author : wei.peng
* @Date : 2018-10-25 21:01
* @Modify :
**/
@RestController
@RequestMapping("/auth")
@Api(description="用户所有权限操作服务")
public class AuthController {
public static final Logger LOGGER = LoggerFactory.getLogger(DemoAuthController.class);
@Autowired
private ISystemLoginService systemLoginService;
@Autowired
private ISysUserService userService;
@GetMapping(value="/login")
@ApiOperation(value="登陆",notes="登陆")
public ResultBean login(String loginName, String loginPwd, String languageCode){
LOGGER.info("用户登陆 loginName:{} loginPwd:{} languageCode:{}",loginName,loginPwd,languageCode);
try {
SessionUser sUser = userService.queryUserLogin(loginName,loginPwd,languageCode);
LOGGER.info("会员登陆：{}",sUser);
AuthUtil.setSessionObject("languageCode",languageCode);
return new ResultBean(true,"");
} catch (ImppBusiException e) {
return new ResultBean(false,e.getErrorDetail() + ",so:" + e.getErrorSolution());
}
}
/**
*
* @return
*/
@GetMapping(value="/logout")
@ApiOperation(value="登出",notes="登出")
public ResultBean logout(){
LOGGER.info("用户退出...");
try {
AuthUtil.logout();
return new ResultBean(true,"");
} catch (ImppBusiException e) {
return new ResultBean(false,e.getErrorDetail() + ",so:" + e.getErrorSolution());
}
}
/**
*
* @return
*/
@GetMapping(value="/getUserInfo")
@ApiOperation(value="获取登录用户信息",notes="获取当前登录用户详细信息")
public ResultBean getUserInfo(){
LOGGER.info("获取用户信息...lang:{}",AuthUtil.getSessionAttribute("languageCode"));
try {
SessionUser sUser = AuthUtil.getSessionUser();
LOGGER.info("用户：{}",sUser);
return new ResultBean(true,"",sUser);
} catch (ImppBusiException e) {
return new ResultBean(false,e.getErrorDetail() + ",so:" + e.getErrorSolution());
}
}
}

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

@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.Arrays; import java.util.Arrays;
/** /**
* @Description : * @Description : 系统对外枚举服务
* @Reference : * @Reference :
* @Author : wei.peng * @Author : wei.peng
* @Date : 2018-10-22 15:58 * @Date : 2018-10-22 15:58
@ -44,5 +44,25 @@ public class EnumController {
Arrays.asList(ImppEnumUtil.ORGANIZE_YTPE.values())); Arrays.asList(ImppEnumUtil.ORGANIZE_YTPE.values()));
} }
@GetMapping("/task-method-type")
@ApiOperation(value = "任务类型", notes = "查询全部任务类型功能")
public ResultBean getTaskMethodType(){
return new ResultBean(true, "操作成功",
Arrays.asList(ImppEnumUtil.TASK_METHOD_TYPE.values()));
}
@GetMapping("/user-type")
@ApiOperation(value = "用户类型", notes = "查询全部用户类型功能")
public ResultBean getUserType(){
return new ResultBean(true, "操作成功",
Arrays.asList(CommonEnumUtil.USER_TYPE.values()));
}
@GetMapping("/user-status")
@ApiOperation(value = "用户状态", notes = "查询全部用户状态功能")
public ResultBean getUserStatus(){
return new ResultBean(true, "操作成功",
Arrays.asList(CommonEnumUtil.USER_STATUS.values()));
}
} }

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

@ -1,9 +1,14 @@
package cn.estsh.i3plus.core.apiservice.controller.busi; package cn.estsh.i3plus.core.apiservice.controller.busi;
import cn.estsh.i3plus.core.api.iservice.busi.IOrganizeService; import cn.estsh.i3plus.core.api.iservice.busi.IOrganizeService;
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.Organize; import cn.estsh.i3plus.pojo.platform.bean.Organize;
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.ResultBean;
import cn.estsh.impp.framework.boot.util.ValidatorBean;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -27,50 +32,126 @@ public class OrganizeController {
public static final Logger LOGGER = LoggerFactory.getLogger(OrganizeController.class); public static final Logger LOGGER = LoggerFactory.getLogger(OrganizeController.class);
public static SysUser USER;
static {
USER =new SysUser();
USER.setEmployeeNameRdd("中国移动");
USER.setId(10086L);
}
@Autowired @Autowired
private IOrganizeService organizeService; private IOrganizeService organizeService;
@PostMapping(value = "/insert") @PostMapping(value = "/insert")
@ApiOperation(value = "新增组织", notes = "组织") @ApiOperation(value = "新增组织", notes = "组织")
public ResultBean insertOrganize(Organize organize) { public ResultBean insertOrganize(Organize organize) {
organizeService.insertOrganize(organize); ;
return new ResultBean(true, "操作成功", organize); try {
//条件验证
ValidatorBean.beginValid(organize)
.notNull("name", organize.getName())
.notNull("organizeTypeId", organize.getOrganizeTypeId());
//新增初始化
ConvertBean.modelInitialize(organize, AuthUtil.getSessionUser());
organize = organizeService.insertOrganize(organize);
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(organize);
} 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());
}
} }
@PutMapping(value = "/update") @PutMapping(value = "/update")
@ApiOperation(value = "修改组织", notes = "组织") @ApiOperation(value = "修改组织", notes = "组织")
public ResultBean updateOrganize(Organize organize) { public ResultBean updateOrganize(Organize organize) {
try {
// 数据校验
ValidatorBean.beginValid(organize)
.notNull("id", organize.getId())
.notNull("name", organize.getName())
.notNull("organizeTypeId", organize.getOrganizeTypeId());
ConvertBean.modelUpdate(organize, AuthUtil.getSessionUser());
organizeService.updateOrganize(organize); organizeService.updateOrganize(organize);
return new ResultBean(true, "操作成功", organize); 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());
}
} }
@DeleteMapping(value = "/delete") @DeleteMapping(value = "/delete")
@ApiOperation(value = "删除组织", notes = "删除组织") @ApiOperation(value = "删除组织", notes = "删除组织")
public ResultBean deleteOrganize(Long id) { public ResultBean deleteOrganize(String id) {
organizeService.deleteOrganizeById(id,USER.getEmployeeNameRdd()); try {
return new ResultBean(true, "操作成功"); // 数据校验
ValidatorBean.checkNotNull(id, "组织id 不能为空");
organizeService.deleteOrganizeById(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());
}
} }
@GetMapping(value = "/findOrganizeAll") @GetMapping(value = "/list")
@ApiOperation(value = "查询Organize", notes = "查询所有组织") @ApiOperation(value = "查询Organize", notes = "查询所有组织")
public ResultBean findOrganizeAll() { public ResultBean findOrganizeAll() {
try {
List<Organize> list = organizeService.findOrganizeAll(); List<Organize> list = organizeService.findOrganizeAll();
return new ResultBean(true, "操作成功", list); 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());
}
} }
@GetMapping(value = "/getOrganize/{id}") @GetMapping(value = "/get/{id}")
@ApiOperation(value = "查询组织", notes = "查询根据ID查询组织") @ApiOperation(value = "查询组织", notes = "查询根据ID查询组织")
public ResultBean getByOrganizeId(@PathVariable("id") long id) { public ResultBean getByOrganizeId(@PathVariable("id") String id) {
try {
// 数据校验
ValidatorBean.checkNotNull(id, "角色id 不能为空");
Organize organize = organizeService.getOrganizeById(id); Organize organize = organizeService.getOrganizeById(id);
return new ResultBean(true, "操作成功", organize);
return ResultBean.success("操作成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultObject(organize);
} 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 = "/status")
@ApiOperation(value = "修改权限状态", notes = "根据ID修改权限状态")
public ResultBean updateStatus(String id, int status) {
try {
// 数据校验
ValidatorBean.checkNotNull(id, "角色id 不能为空");
ValidatorBean.checkNotZero(status, "角色状态不能为空");
organizeService.updateOrganizeStatus(id, status, AuthUtil.getSessionUser());
return new ResultBean(true);
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep.getErrorShow());
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
}
} }
} }

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

@ -1,13 +1,14 @@
package cn.estsh.i3plus.core.apiservice.controller.busi; package cn.estsh.i3plus.core.apiservice.controller.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ISysMenuService; import cn.estsh.i3plus.core.api.iservice.busi.ISysMenuService;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.platform.common.convert.ConvertBean;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.SysMenu; import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
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 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;
@ -36,62 +37,113 @@ public class SysMenuController {
@PostMapping(value = "/insert") @PostMapping(value = "/insert")
@ApiOperation(value = "新增系统功能", notes = "系统功能") @ApiOperation(value = "新增系统功能", notes = "系统功能")
public ResultBean insertSysMenu(SysMenu sysMenu) { public ResultBean insertSysMenu(SysMenu menu) {
try { try {
SysMenu menu = sysMenuService.insertSysMenu(sysMenu); //条件验证
return new ResultBean(true,menu); ValidatorBean.beginValid(menu)
.notNull("name", menu.getName())
.notNull("menuTypeId", menu.getMenuTypeId());
//新增初始化
ConvertBean.modelInitialize(menu, AuthUtil.getSessionUser());
menu = sysMenuService.insertSysMenu(menu);
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(menu);
} catch (ImppBusiException busExcep) { } catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep); LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep.getErrorShow()); return ResultBean.fail(busExcep.getErrorShow()).build();
} catch (Exception e) { } catch (Exception e) {
LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}",e.getMessage(),e); return ResultBean.fail(e.getMessage()).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
} }
} }
@PutMapping(value = "/update") @PutMapping(value = "/update")
@ApiOperation(value = "修改系统功能", notes = "系统功能") @ApiOperation(value = "修改系统功能", notes = "系统功能")
public ResultBean updateSysMenu(SysMenu sysMenu) { public ResultBean updateSysMenu(SysMenu sysMenu) {
if(null == sysMenu || null == sysMenu.getId()){ try {
return new ResultBean(false, "操作失败","对象id不能为空为空"); // 数据校验
} ValidatorBean.beginValid(sysMenu)
.notNull("id", sysMenu.getId())
.notNull("menuTypeId", sysMenu.getMenuTypeId())
.notNull("name", sysMenu.getName());
ConvertBean.modelUpdate(sysMenu, AuthUtil.getSessionUser());
sysMenuService.updateSysMenu(sysMenu); sysMenuService.updateSysMenu(sysMenu);
return new ResultBean(true, "操作成功", sysMenu); 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());
}
} }
@DeleteMapping(value = "/delete") @DeleteMapping(value = "/delete")
@ApiOperation(value = "删除系统功能", notes = "删除系统功能") @ApiOperation(value = "删除系统功能", notes = "删除系统功能")
public ResultBean deleteSysMenu(long id) { public ResultBean deleteSysMenu(String id) {
try { try {
// 数据校验
ValidatorBean.checkNotNull(id, "系统功能id 不能为空");
sysMenuService.deleteSysMenuById(id); sysMenuService.deleteSysMenuById(id);
return new ResultBean(true); return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) { } catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep); LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep.getErrorShow()); return ResultBean.fail(busExcep.getErrorShow());
} catch (Exception e) { } catch (Exception e) {
LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}",e.getMessage(),e); LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode()); return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
} }
} }
@GetMapping(value = "/findSysMenuAll") @GetMapping(value = "/list")
@ApiOperation(value = "查询SysMenu", notes = "查询所有系统功能") @ApiOperation(value = "查询所有系统功能", notes = "查询所有系统功能")
public ResultBean findSysMenuAll() { public ResultBean findAll() {
try {
List<SysMenu> list = sysMenuService.findSysMenuAll(); List<SysMenu> list = sysMenuService.findSysMenuAll();
return new ResultBean(true, "操作成功", list); 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());
}
} }
@GetMapping(value = "/getSysMenu/{id}") @GetMapping(value = "/get/{id}")
@ApiOperation(value = "查询系统功能", notes = "查询根据ID查询系统功能") @ApiOperation(value = "查询系统功能", notes = "查询根据ID查询系统功能")
public ResultBean getBySysMenuId(@PathVariable("id") long id) { public ResultBean getById(@PathVariable("id") String id) {
try {
// 数据校验
ValidatorBean.checkNotNull(id, "功能id 不能为空");
SysMenu sysMenu = sysMenuService.getSysMenuById(id); SysMenu sysMenu = sysMenuService.getSysMenuById(id);
return new ResultBean(true, "操作成功", sysMenu);
return ResultBean.success("操作成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultObject(sysMenu);
} 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 = "/updateStatus") @PutMapping(value = "/status")
@ApiOperation(value = "修改权限状态", notes = "根据ID修改权限状态") @ApiOperation(value = "修改系统功能状态", notes = "根据ID修改系统功能状态")
public ResultBean updateStatus(long id,int status) { public ResultBean updateStatus(String id,int status) {
try { try {
// 数据校验
ValidatorBean.checkNotNull(id, "功能id 不能为空");
ValidatorBean.checkNotZero(status, "功能状态不能为空");
sysMenuService.updateSysMenuStatus(id,status,AuthUtil.getSessionUser()); sysMenuService.updateSysMenuStatus(id,status,AuthUtil.getSessionUser());
return new ResultBean(true); return new ResultBean(true);
} catch(ImppBusiException busExcep){ } catch(ImppBusiException busExcep){

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

@ -1,13 +1,15 @@
package cn.estsh.i3plus.core.apiservice.controller.busi; package cn.estsh.i3plus.core.apiservice.controller.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ISysRoleService; import cn.estsh.i3plus.core.api.iservice.busi.ISysRoleService;
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
import cn.estsh.i3plus.pojo.platform.bean.SysRole; 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.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 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;
@ -37,51 +39,109 @@ public class SysRoleController {
@PostMapping(value = "/insert") @PostMapping(value = "/insert")
@ApiOperation(value = "新增系统角色", notes = "系统角色") @ApiOperation(value = "新增系统角色", notes = "系统角色")
public ResultBean insertSysRole(SysRole sysRole) { public ResultBean insertSysRole(SysRole role) {
try { try {
SysRole role = sysRoleService.insertSysRole(sysRole); //条件验证
return new ResultBean(true, role); ValidatorBean.beginValid(role)
.notNull("name", role.getName());
//新增初始化
ConvertBean.modelInitialize(role, AuthUtil.getSessionUser());
role = sysRoleService.insertSysRole(role);
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(role);
} catch (ImppBusiException busExcep) { } catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep); LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep.getErrorShow()); return ResultBean.fail(busExcep.getErrorShow()).build();
} catch (Exception e) { } catch (Exception e) {
LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}", e.getMessage(), e); return ResultBean.fail(e.getMessage()).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
} }
} }
@PutMapping(value = "/update") @PutMapping(value = "/update")
@ApiOperation(value = "修改系统角色", notes = "系统角色") @ApiOperation(value = "修改系统角色", notes = "系统角色")
public ResultBean updateSysRole(SysRole sysRole) { public ResultBean updateSysRole(SysRole role) {
sysRoleService.updateSysRole(sysRole); try {
return new ResultBean(true, "操作成功", sysRole); // 数据校验
ValidatorBean.beginValid(role)
.notNull("id", role.getId())
.notNull("name", role.getName());
ConvertBean.modelUpdate(role, AuthUtil.getSessionUser());
sysRoleService.updateSysRole(role);
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());
}
} }
@DeleteMapping(value = "/delete") @DeleteMapping(value = "/delete")
@ApiOperation(value = "删除系统角色", notes = "删除系统角色") @ApiOperation(value = "删除系统角色", notes = "删除系统角色")
public ResultBean deleteSysRole(long id) { public ResultBean deleteSysRole(String id) {
try {
// 数据校验
ValidatorBean.checkNotNull(id, "角色id 不能为空");
sysRoleService.deleteSysRoleById(id); sysRoleService.deleteSysRoleById(id);
return new ResultBean(true, "操作成功"); 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());
}
} }
@GetMapping(value = "/findSysRoleAll") @GetMapping(value = "/list")
@ApiOperation(value = "查询SysRole", notes = "查询所有系统角色") @ApiOperation(value = "查询SysRole", notes = "查询所有系统角色")
public ResultBean findSysRoleAll() { public ResultBean findAll() {
try {
List<SysRole> list = sysRoleService.findSysRoleAll(); List<SysRole> list = sysRoleService.findSysRoleAll();
return new ResultBean(true, "操作成功", list); 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());
}
} }
@GetMapping(value = "/getSysRole/{id}") @GetMapping(value = "/get/{id}")
@ApiOperation(value = "查询系统角色", notes = "查询根据ID查询系统角色") @ApiOperation(value = "查询系统角色", notes = "查询根据ID查询系统角色")
public ResultBean getBySysRoleId(@PathVariable("id") long id) { public ResultBean getById(@PathVariable("id") String id) {
SysRole sysRole = sysRoleService.getSysRoleById(id); try {
return new ResultBean(true, "操作成功", sysRole); // 数据校验
ValidatorBean.checkNotNull(id, "角色id 不能为空");
SysRole role = sysRoleService.getSysRoleById(id);
return ResultBean.success("操作成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultObject(role);
} 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 = "/updateStatus") @PutMapping(value = "/status")
@ApiOperation(value = "修改权限状态", notes = "根据ID修改权限状态") @ApiOperation(value = "修改权限状态", notes = "根据ID修改权限状态")
public ResultBean updateStatus(long id, int status) { public ResultBean updateStatus(String id, int status) {
try { try {
// 数据校验
ValidatorBean.checkNotNull(id, "角色id 不能为空");
ValidatorBean.checkNotZero(status, "角色状态不能为空");
sysRoleService.updateSysRoleStatus(id, status, AuthUtil.getSessionUser()); sysRoleService.updateSysRoleStatus(id, status, AuthUtil.getSessionUser());
return new ResultBean(true); return new ResultBean(true);

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

@ -0,0 +1,165 @@
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());
}
}
}

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

@ -0,0 +1,184 @@
package cn.estsh.i3plus.core.apiservice.controller.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ITaskTimeExpressionService;
import cn.estsh.i3plus.core.api.iservice.busi.ITaskTimeService;
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.*;
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-22 16:58:43.982
* @Modify :
**/
@RestController
@RequestMapping("/task-time")
@Api(description = "定时任务服务")
public class TaskTimeController {
public static final Logger LOGGER = LoggerFactory.getLogger(TaskTimeController.class);
@Autowired
private ITaskTimeService taskTimedService;
@Autowired
private ITaskTimeExpressionService taskTimeExpressionService;
@PostMapping(value = "/insert")
@ApiOperation(value = "新增定时任务", notes = "定时任务")
public ResultBean insertTaskTimed(TaskTime taskTime) {
try {
// 数据校验
ValidatorBean.beginValid(taskTime)
.notNull("timeId", taskTime.getTimeId())
.notNull("name", taskTime.getName())
.notNull("taskDescription", taskTime.getTaskDescription());
TaskTimeExpression taskTimeExpression = taskTimeExpressionService.getTaskTimeExpressionById(taskTime.getTimeId().toString());
ValidatorBean.beginValid(taskTimeExpression);
taskTime.setRedTimeName(taskTimeExpression.getName());
taskTime.setRedTimeExpression(taskTimeExpression.getTimeExpression());
ConvertBean.modelInitialize(taskTime, AuthUtil.getSessionUser());
taskTime = taskTimedService.insertTaskTimed(taskTime);
return ResultBean.success("操作成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultObject(taskTime);
} 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 updateTaskTimed(TaskTime taskTime) {
try {
// 数据校验
ValidatorBean.beginValid(taskTime)
.notNull("id", taskTime.getId())
.notNull("timeId", taskTime.getTimeId())
.notNull("name", taskTime.getName())
.notNull("taskDescription", taskTime.getTaskDescription());
TaskTimeExpression taskTimeExpression = taskTimeExpressionService.getTaskTimeExpressionById(taskTime.getTimeId().toString());
// 数据真实性校验
ValidatorBean.beginValid(taskTimeExpression);
// 数据冗余
taskTime.setRedTimeName(taskTimeExpression.getName());
taskTime.setRedTimeExpression(taskTimeExpression.getTimeExpression());
ConvertBean.modelUpdate(taskTime, AuthUtil.getSessionUser());
taskTimedService.updateTaskTimed(taskTime);
return ResultBean.success("操作成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultObject(taskTime);
} 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 deleteTaskTimed(String id) {
try {
// 数据校验
ValidatorBean.checkNotNull(id, "定时任务id 不能为空");
taskTimedService.deleteTaskTimedById(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());
}
}
@GetMapping(value = "/list")
@ApiOperation(value = "查询TaskTimed", notes = "查询所有定时任务")
public ResultBean findTaskTimedAll() {
try {
List<TaskTime> list = taskTimedService.findTaskTimedAll();
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());
}
}
@GetMapping(value = "/get/{id}")
@ApiOperation(value = "查询定时任务", notes = "查询根据ID查询定时任务")
public ResultBean getByTaskTimedId(@PathVariable("id") String id) {
try {
// 数据校验
ValidatorBean.checkNotNull(id, "定时任务id 不能为空");
TaskTime taskTime = taskTimedService.getTaskTimedById(id);
return ResultBean.success("操作成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultObject(taskTime);
} 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 = "/status")
@ApiOperation(value = "修改定时任务状态", notes = "根据ID修改定时任务状态")
public ResultBean updateStatus(String id,int status) {
try {
// 数据校验
ValidatorBean.checkNotNull(id, "功能id 不能为空");
ValidatorBean.checkNotZero(status, "功能状态不能为空");
taskTimedService.updateTaskTimedStatus(id,status,AuthUtil.getSessionUser());
return new ResultBean(true);
} catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep.getErrorShow());
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
}
}
}

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

@ -0,0 +1,146 @@
package cn.estsh.i3plus.core.apiservice.controller.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ITaskTimeExpressionService;
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.TaskTimeExpression;
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-22 16:58:43.838
* @Modify :
**/
@RestController
@RequestMapping("/sys-time-expression")
@Api(description = "系统时间表达式")
public class TaskTimeExpressionController {
public static final Logger LOGGER = LoggerFactory.getLogger(TaskTimeExpressionController.class);
@Autowired
private ITaskTimeExpressionService taskTimeExpressionService;
@PostMapping(value = "/insert")
@ApiOperation(value = "新增系统时间表达式", notes = "系统时间表达式")
public ResultBean insertTaskTimeExpression(TaskTimeExpression timeExpression) {
try {
// 数据校验
ValidatorBean.beginValid(timeExpression)
.notNull("name", timeExpression.getName())
.notNull("timeExpression", timeExpression.getTimeExpression())
.notNull("timeDescription", timeExpression.getTimeDescription());
ConvertBean.modelInitialize(timeExpression, AuthUtil.getSessionUser());
timeExpression = taskTimeExpressionService.insertTaskTimeExpression(timeExpression);
return ResultBean.success("操作成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultObject(timeExpression);
} 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 updateTaskTimeExpression(TaskTimeExpression timeExpression) {
try {
// 数据校验
ValidatorBean.beginValid(timeExpression)
.notNull("id", timeExpression.getId())
.notNull("name", timeExpression.getName())
.notNull("timeExpression", timeExpression.getTimeExpression())
.notNull("timeDescription", timeExpression.getTimeDescription());
ConvertBean.modelInitialize(timeExpression, AuthUtil.getSessionUser());
taskTimeExpressionService.updateTaskTimeExpression(timeExpression);
return ResultBean.success("操作成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultObject(timeExpression);
} 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 deleteTaskTimeExpression(String id) {
try {
// 数据校验
ValidatorBean.checkNotNull(id, "时间表达式id 不能为空");
taskTimeExpressionService.deleteTaskTimeExpressionById(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());
}
}
@GetMapping(value = "/list")
@ApiOperation(value = "查询时间表达式所有", notes = "查询所有系统时间表达式")
public ResultBean findTaskTimeExpressionAll() {
try {
List<TaskTimeExpression> list = taskTimeExpressionService.findTaskTimeExpressionAll();
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());
}
}
@GetMapping(value = "/get/{id}")
@ApiOperation(value = "查询系统时间表达式", notes = "查询根据ID查询系统时间表达式")
public ResultBean getByTaskTimeExpressionId(@PathVariable("id") String id) {
try {
// 数据校验
ValidatorBean.checkNotNull(id, "定时任务id 不能为空");
TaskTimeExpression taskTimeExpression = taskTimeExpressionService.getTaskTimeExpressionById(id);
return ResultBean.success("操作成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultObject(taskTimeExpression);
} 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());
}
}
}

19
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/dao/ISysMenuDao.java
Unescape Escape View File

@ -1,19 +0,0 @@
package cn.estsh.i3plus.core.apiservice.dao;
import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.CrudRepository;
import org.springframework.data.repository.query.Param;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @Date : 2018-10-22 23:54
* @Modify :
**/
public interface ISysMenuDao {
@Query("select count(id ) SysMenu sm where sm.parentId = :parentId")
long queryCountByParentId(@Param("id") long parentId);
}

44
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/dao/IUserPermissionDao.java
Unescape Escape View File

@ -0,0 +1,44 @@
package cn.estsh.i3plus.core.apiservice.dao;
import cn.estsh.i3plus.pojo.platform.bean.*;
import java.util.List;
/**
* @Description : 用户权限
* @Reference :
* @Author : wei.peng
* @Date : 2018-10-25 20:24
* @Modify :
**/
public interface IUserPermissionDao {
/**
* 查询用户所有部门
* @param user
* @return
*/
List<Department> findDepartmentByUser(SysUser user);
/**
* 查询用户所有角色
* @param user
* @return
*/
List<SysRole> findSysRoleByUser(SysUser user);
/**
* 查询用户所有功能权限
* @param user
* @return
*/
List<SysMenu> findSysMenuByUser(SysUser user);
/**
* 查询用户所有岗位
* @param user
* @return
*/
List<Position> findPositionByUser(SysUser user);
}

38
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/ISysMenuDaoImpl.java
Unescape Escape View File

@ -1,38 +0,0 @@
package cn.estsh.i3plus.core.apiservice.daoimpl;
import cn.estsh.i3plus.core.apiservice.dao.ISysMenuDao;
import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.persistence.EntityManager;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.ParameterExpression;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @Date : 2018-10-22 23:55
* @Modify :
**/
@Service
public class ISysMenuDaoImpl implements ISysMenuDao {
public static final Logger LOGGER = LoggerFactory.getLogger(ISysMenuDaoImpl.class);
@Autowired
private EntityManager entityManager;
@Override
public long queryCountByParentId(long parentId) {
LOGGER.info(" Parent Id :{}",parentId);
String hql = "select count(id) from SysMenu as sm where parentId =:parentId";
return (long)entityManager.createQuery(hql)
.setParameter("parentId",parentId).getSingleResult();
}
}

70
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/UserPermissionDaoImpl.java
Unescape Escape View File

@ -0,0 +1,70 @@
package cn.estsh.i3plus.core.apiservice.daoimpl;
import cn.estsh.i3plus.core.apiservice.dao.IUserPermissionDao;
import cn.estsh.i3plus.core.apiservice.serviceimpl.busi.CoreTreeServiceImpl;
import cn.estsh.i3plus.pojo.platform.bean.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.persistence.EntityManager;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @Date : 2018-10-25 20:32
* @Modify :
**/
@Service
public class UserPermissionDaoImpl implements IUserPermissionDao {
public static final Logger LOGGER = LoggerFactory.getLogger(UserPermissionDaoImpl.class);
@Autowired
private EntityManager entityManager;
@Override
public List<Department> findDepartmentByUser(SysUser user) {
LOGGER.info(" 查询用户所有部门 user id:{}", user.getId());
String hql = "select d from RefUserDepartment as rud " +
" left join Department as d on d.id = rud.departmentId " +
" where rud.userId =:userId";
return entityManager.createQuery(hql).setParameter("userId",user.getId()).getResultList();
}
@Override
public List<SysRole> findSysRoleByUser(SysUser user) {
LOGGER.info(" 查询用户所有角色 user id:{}", user.getId());
String hql = "select sr from RefUserRole as rur " +
" left join SysRole as sr on sr.id = rur.roleId " +
" where rur.userId =:userId";
//hql = "select rur from RefUserRole as rur,SysRole as where rur.userId =:userId and sr.id = rur.roleId";
return entityManager.createQuery(hql).setParameter("userId",user.getId()).getResultList();
}
@Override
public List<SysMenu> findSysMenuByUser(SysUser user) {
LOGGER.info(" 查询用户所有菜单 user id:{}", user.getId());
String hql = "select sm from RefUserRole as rur " +
" left join RefRoleMenu as rrm on rrm.roleId = rur.roleId" +
" left join SysMenu as sm on sm.id = rrm.menuId" +
" where rur.userId =:userId";
return entityManager.createQuery(hql).setParameter("userId",user.getId()).getResultList();
}
@Override
public List<Position> findPositionByUser(SysUser user) {
LOGGER.info(" 查询用户所有岗位 user id:{}", user.getId());
String hql = "select p from RefUserPosition as rup " +
" left join Position as p on p.id = rup.positionId" +
" where rup.userId =:userId";
return entityManager.createQuery(hql).setParameter("userId",user.getId()).getResultList();
}
}

9
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java
Unescape Escape View File

@ -11,6 +11,7 @@ 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;
@ -83,7 +84,7 @@ public class SystemLoginService implements ISystemLoginService {
* @return * @return
*/ */
public SysUser getUserLoginInfo(String loginName,String pwd){ public SysUser getUserLoginInfo(String loginName,String pwd){
SysUser user = sysUserRDao.getByProperty("loginName",loginName); SysUser user = sysUserRDao.getByProperty("userLoginName",loginName);
if(user == null){ if(user == null){
//用户不存在 //用户不存在
throw ImppExceptionBuilder.newInstance() throw ImppExceptionBuilder.newInstance()
@ -122,10 +123,10 @@ public class SystemLoginService implements ISystemLoginService {
private SessionUser packSessionUser(SysUser user,String userType, String languageCode) { private SessionUser packSessionUser(SysUser user,String userType, String languageCode) {
SessionUser sessionUser = new SessionUser(); SessionUser sessionUser = new SessionUser();
sessionUser.setLanguageCode(languageCode); sessionUser.setLanguageCode(languageCode);
sessionUser.setSiteCode(user.getFactoryCode()); // sessionUser.setSiteCode(user.getFactoryCode());
sessionUser.setUserName(user.getEmployeeNameRdd()); sessionUser.setUserName(user.getName());
sessionUser.setUserType(userType); sessionUser.setUserType(userType);
sessionUser.setUserCode(user.getEmployeeCodeRdd()); sessionUser.setUserCode(user.getUserInfo().getLanguageCode());
return sessionUser; return sessionUser;
} }

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

@ -49,7 +49,7 @@ public class CoreTreeServiceImpl implements ICoreTreeService {
} }
} }
LOGGER.info("【{}】包含子集：{},步长：{}",parent.getName(),childDepList.size(),step); LOGGER.info("【{}】包含子集：{},步长：{}",parent.getDepartmentName(),childDepList.size(),step);
parent.setChildList(childDepList); parent.setChildList(childDepList);
} }
} }

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

@ -1,9 +1,13 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.IOrganizeService; import cn.estsh.i3plus.core.api.iservice.busi.IOrganizeService;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.Organize; import cn.estsh.i3plus.pojo.platform.bean.Organize;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
import cn.estsh.i3plus.pojo.platform.repository.OrganizeRepository; import cn.estsh.i3plus.pojo.platform.repository.OrganizeRepository;
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;
@ -24,39 +28,54 @@ public class OrganizeServiceImpl implements IOrganizeService {
public static final Logger LOGGER = LoggerFactory.getLogger(OrganizeServiceImpl.class); public static final Logger LOGGER = LoggerFactory.getLogger(OrganizeServiceImpl.class);
@Autowired @Autowired
private OrganizeRepository organizeRepository; private OrganizeRepository organizeRDao;
@Override @Override
public void updateOrganize(Organize organize) { public void updateOrganize(Organize organize) {
LOGGER.info("组织 ORGANIZE :{}", organize); LOGGER.info("组织 ORGANIZE :{}", organize);
organizeRepository.update(organize); organizeRDao.update(organize);
} }
@Override @Override
public void deleteOrganizeById(long id,String modifyUser) { public void updateOrganizeStatus(String id, int status, SessionUser user) {
LOGGER.info("组织 ORGANIZE id:{} status:{} user:{}", id,status,user);
Organize organize = organizeRDao.getById(Long.parseLong(id));
organize.setOrganizeStatus(status);
organize.setModifyUser(user.getUserName());
organizeRDao.update(organize);
}
@Override
public void deleteOrganizeById(String id) {
LOGGER.info("组织 ORGANIZE Key:{}", id); LOGGER.info("组织 ORGANIZE Key:{}", id);
//TODO 记录平台用户操作日志 long count = organizeRDao.findByPropertyCount("parentId", Long.parseLong(id));
organizeRepository.deleteById(id); if (count >= 1) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())
.setErrorDetail("该数据有子集")
.setErrorSolution("请先删除子集在操作")
.build();
} }
organizeRDao.deleteById(Long.parseLong(id));
}
@Override @Override
public Organize insertOrganize(Organize organize) { public Organize insertOrganize(Organize organize) {
LOGGER.info("组织 ORGANIZE :{}", organize); LOGGER.info("组织 ORGANIZE :{}", organize);
if(null != organize.getOrganizationTypeId()){ return organizeRDao.insert(organize);
organize.setOrganizationTypeName(ImppEnumUtil.ORGANIZE_YTPE.valueOfCode(organize.getOrganizationTypeId()));
}
return organizeRepository.insert(organize);
} }
@Override @Override
public List<Organize> findOrganizeAll() { public List<Organize> findOrganizeAll() {
LOGGER.info("组织 ORGANIZE find All"); LOGGER.info("组织 ORGANIZE find All");
return organizeRepository.findAll(); return organizeRDao.findAll();
} }
@Override @Override
public Organize getOrganizeById(long id) { public Organize getOrganizeById(String id) {
LOGGER.info("组织 ORGANIZE find id:{}", id); LOGGER.info("组织 ORGANIZE find id:{}", id);
return organizeRepository.getOne(id); return organizeRDao.getOne(Long.parseLong(id));
} }
} }

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

@ -1,14 +1,12 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ISysMenuService; import cn.estsh.i3plus.core.api.iservice.busi.ISysMenuService;
import cn.estsh.i3plus.core.apiservice.dao.ISysMenuDao;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
import cn.estsh.i3plus.pojo.platform.bean.SysMenu; import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
import cn.estsh.i3plus.pojo.platform.repository.SysMenuRepository; import cn.estsh.i3plus.pojo.platform.repository.SysMenuRepository;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import cn.estsh.impp.framework.boot.util.ResultBean;
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;
@ -29,85 +27,61 @@ public class SysMenuServiceImpl implements ISysMenuService {
public static final Logger LOGGER = LoggerFactory.getLogger(SysMenuServiceImpl.class); public static final Logger LOGGER = LoggerFactory.getLogger(SysMenuServiceImpl.class);
@Autowired @Autowired
private SysMenuRepository sysMenuRepository; private SysMenuRepository sysMenuRDao;
@Autowired
private ISysMenuDao iSysMenuDao;
@Override @Override
public void updateSysMenu(SysMenu sysMenu) { public void updateSysMenu(SysMenu sysMenu) {
LOGGER.info("系统功能 SYS_MENU :{}", sysMenu); LOGGER.info("系统功能 SYS_MENU :{}", sysMenu);
if(sysMenu != null){ sysMenuRDao.update(sysMenu);
sysMenuRepository.update(sysMenu);
}
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())
.setErrorDetail("数据不存在")
.setErrorSolution("请重新操作")
.build();
} }
@Override @Override
public void updateSysMenuStatus(long id, int status, SessionUser user) { public void updateSysMenuStatus(String id, int status, SessionUser user) {
LOGGER.info("系统功能 SYS_MENU id:{} status:{} user:{}", id,status,user); LOGGER.info("系统功能 SYS_MENU id:{} status:{} user:{}", id,status,user);
SysMenu menu = sysMenuRepository.getById(id); SysMenu menu = sysMenuRDao.getById(Long.parseLong(id));
if(null != menu){
menu.setMenuStatus(status); menu.setMenuStatus(status);
menu.setModifyUser(user.getUserName()); menu.setModifyUser(user.getUserName());
sysMenuRepository.update(menu); sysMenuRDao.update(menu);
}else{
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())
.setErrorDetail("数据不存在")
.setErrorSolution("请重新操作")
.build();
}
} }
@Override @Override
public void deleteSysMenuById(long id) { public void deleteSysMenuById(String id) {
LOGGER.info("系统功能 SYS_MENU Key:{}", id); LOGGER.info("系统功能 SYS_MENU Key:{}", id);
//TODO 记录平台用户操作日志 long count = sysMenuRDao.findByPropertyCount("parentId",Long.parseLong(id));
long count = iSysMenuDao.queryCountByParentId(id);
if(count >= 1){ if(count >= 1){
throw ImppExceptionBuilder.newInstance() throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()) .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode())
.setErrorCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode()) .setErrorCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode())
.setErrorDetail("数据存在子集") .setErrorDetail("该数据有子集")
.setErrorSolution("请删除子集在操作") .setErrorSolution("请先删除子集在操作")
.build(); .build();
} }
sysMenuRepository.deleteById(id); sysMenuRDao.deleteById(Long.parseLong(id));
} }
@Override @Override
public SysMenu insertSysMenu(SysMenu sysMenu) { public SysMenu insertSysMenu(SysMenu sysMenu) {
LOGGER.info("系统功能 SYS_MENU :{}", sysMenu); LOGGER.info("系统功能 SYS_MENU :{}", sysMenu);
if(null != sysMenu.getMenuTypeId()){
sysMenu.setRedMenuTypeName(CommonEnumUtil.METHOD_LEVEL.valueOf(sysMenu.getMenuTypeId()));
}
if(0 != sysMenu.getParentId()){ if(0 != sysMenu.getParentId()){
SysMenu parent = sysMenuRepository.getById(sysMenu.getParentId()); SysMenu parent = sysMenuRDao.getById(sysMenu.getParentId());
if(null != parent){ if(null != parent){
sysMenu.setRedParentName(parent.getName()); sysMenu.setRedParentName(parent.getName());
} }
} }
return sysMenuRepository.insert(sysMenu); return sysMenuRDao.insert(sysMenu);
} }
@Override @Override
public List<SysMenu> findSysMenuAll() { public List<SysMenu> findSysMenuAll() {
LOGGER.info("系统功能 SYS_MENU find All"); LOGGER.info("系统功能 SYS_MENU find All");
return sysMenuRepository.findAll(); return sysMenuRDao.findAll();
} }
@Override @Override
public SysMenu getSysMenuById(long id) { public SysMenu getSysMenuById(String id) {
LOGGER.info("系统功能 SYS_MENU find id:{}", id); LOGGER.info("系统功能 SYS_MENU find id:{}", id);
return sysMenuRepository.getOne(id); return sysMenuRDao.getOne(Long.parseLong(id));
} }
} }

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

@ -27,54 +27,46 @@ public class SysRoleServiceImpl implements ISysRoleService {
public static final Logger LOGGER = LoggerFactory.getLogger(SysRoleServiceImpl.class); public static final Logger LOGGER = LoggerFactory.getLogger(SysRoleServiceImpl.class);
@Autowired @Autowired
private SysRoleRepository sysRoleRepository; private SysRoleRepository sysRoleRDao;
@Override @Override
public void updateSysRole(SysRole sysRole) { public void updateSysRole(SysRole sysRole) {
LOGGER.info("系统角色 SYS_ROLE :{}", sysRole); LOGGER.info("系统角色 SYS_ROLE :{}", sysRole);
sysRoleRepository.update(sysRole); sysRoleRDao.update(sysRole);
} }
@Override @Override
public void updateSysRoleStatus(long id, int status, SessionUser user) { public void updateSysRoleStatus(String id, int status, SessionUser user) {
LOGGER.info("系统角色 SYS_MENU id:{} status:{} user:{}", id,status,user); LOGGER.info("系统角色 SYS_MENU id:{} status:{} user:{}", id,status,user);
SysRole role = sysRoleRepository.getById(id); SysRole role = sysRoleRDao.getById(Long.parseLong(id));
if(null != role){
role.setRoleStatus(status); role.setRoleStatus(status);
role.setModifyUser(user.getUserName()); role.setModifyUser(user.getUserName());
sysRoleRepository.update(role); sysRoleRDao.update(role);
}else {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())
.setErrorDetail("数据不存在")
.setErrorSolution("请重新操作")
.build();
}
} }
@Override @Override
public void deleteSysRoleById(long id) { public void deleteSysRoleById(String id) {
LOGGER.info("系统角色 SYS_ROLE Key:{}", id); LOGGER.info("系统角色 SYS_ROLE Key:{}", id);
sysRoleRepository.deleteById(id); sysRoleRDao.deleteById(Long.parseLong(id));
} }
@Override @Override
public SysRole insertSysRole(SysRole sysRole) { public SysRole insertSysRole(SysRole sysRole) {
LOGGER.info("系统角色 SYS_ROLE :{}", sysRole); LOGGER.info("系统角色 SYS_ROLE :{}", sysRole);
return sysRoleRepository.insert(sysRole); return sysRoleRDao.insert(sysRole);
} }
@Override @Override
public List<SysRole> findSysRoleAll() { public List<SysRole> findSysRoleAll() {
LOGGER.info("系统角色 SYS_ROLE find All"); LOGGER.info("系统角色 SYS_ROLE find All");
return sysRoleRepository.findAll(); return sysRoleRDao.findAll();
} }
@Override @Override
public SysRole getSysRoleById(long id) { public SysRole getSysRoleById(String id) {
LOGGER.info("系统角色 SYS_ROLE find id:{}", id); LOGGER.info("系统角色 SYS_ROLE find id:{}", id);
return sysRoleRepository.getOne(id); return sysRoleRDao.getOne(Long.parseLong(id));
} }
} }

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

@ -0,0 +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();
}
}
}

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

@ -0,0 +1,62 @@
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;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @Description : 定时任务时间表达式 业务逻辑实现
* @Reference :
* @Author : wei.peng
* @Date : 2018-10-24 20:40
* @Modify :
**/
@Service
public class TaskTimeExpressionServiceImpl implements ITaskTimeExpressionService {
public static final Logger LOGGER = LoggerFactory.getLogger(TaskTimeExpressionServiceImpl.class);
@Autowired
private TaskTimeExpressionRepository taskTimeRecordingRDao;
@Override
public void updateTaskTimeExpression(TaskTimeExpression taskTimeExpression) {
LOGGER.info("定时任务时间表达式 Task_TIME_EXPRESSION :{}", taskTimeExpression);
taskTimeRecordingRDao.update(taskTimeExpression);
}
@Override
public void deleteTaskTimeExpressionById(String id) {
LOGGER.info("定时任务时间表达式 Task_TIME_EXPRESSION :{}", id);
taskTimeRecordingRDao.deleteById(Long.parseLong(id));
}
@Override
public TaskTimeExpression insertTaskTimeExpression(TaskTimeExpression taskTimeExpression) {
LOGGER.info("定时任务时间表达式 Task_TIME_EXPRESSION :{}", taskTimeExpression);
return taskTimeRecordingRDao.insert(taskTimeExpression);
}
@Override
public List<TaskTimeExpression> findTaskTimeExpressionAll() {
LOGGER.info("定时任务时间表达式 Task_TIME_EXPRESSION find All");
return taskTimeRecordingRDao.findAll();
}
@Override
public TaskTimeExpression getTaskTimeExpressionById(String id) {
LOGGER.info("定时任务时间表达式 Task_TIME_EXPRESSION :{}" ,id);
return taskTimeRecordingRDao.getById(Long.parseLong(id));
}
}

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

@ -0,0 +1,61 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ITaskTimeRecordingService;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
import cn.estsh.i3plus.pojo.platform.bean.TaskTimeRecording;
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;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @Description : 定时任务执行记录业务接口实现
* @Reference :
* @Author : wei.peng
* @Date : 2018-10-22 16:58:44.011
* @Modify :
**/
@Service
public class TaskTimeRecordingServiceImpl implements ITaskTimeRecordingService {
public static final Logger LOGGER = LoggerFactory.getLogger(TaskTimeRecordingServiceImpl.class);
@Autowired
private TaskTimeRecordingRepository taskTimeRecordingRDao;
@Override
public void updateTaskTimedRecording(TaskTimeRecording taskTimeRecording) {
LOGGER.info("定时任务执行记录 TASK_TIMED_RECORDING :{}", taskTimeRecording);
taskTimeRecordingRDao.update(taskTimeRecording);
}
@Override
public void deleteTaskTimedRecordingById(String id) {
LOGGER.info("定时任务执行记录 TASK_TIMED_RECORDING Key:{}", id);
taskTimeRecordingRDao.deleteById(Long.parseLong(id));
}
@Override
public TaskTimeRecording insertTaskTimedRecording(TaskTimeRecording taskTimeRecording) {
LOGGER.info("定时任务执行记录 TASK_TIMED_RECORDING :{}", taskTimeRecording);
return taskTimeRecordingRDao.insert(taskTimeRecording);
}
@Override
public List<TaskTimeRecording> findTaskTimedRecordingAll() {
LOGGER.info("定时任务执行记录 TASK_TIMED_RECORDING find All");
return taskTimeRecordingRDao.findAll();
}
@Override
public TaskTimeRecording getTaskTimedRecordingById(String id) {
LOGGER.info("定时任务执行记录 TASK_TIMED_RECORDING find id:{}", id);
return taskTimeRecordingRDao.getOne(Long.parseLong(id));
}
}

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

@ -0,0 +1,71 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ITaskTimeService;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
import cn.estsh.i3plus.pojo.platform.bean.TaskTime;
import cn.estsh.i3plus.pojo.platform.repository.TaskTimeRepository;
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;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @Description : 定时任务业务接口实现
* @Reference :
* @Author : wei.peng
* @Date : 2018-10-22 16:58:43.974
* @Modify :
**/
@Service
public class TaskTimeServiceImpl implements ITaskTimeService {
public static final Logger LOGGER = LoggerFactory.getLogger(TaskTimeServiceImpl.class);
@Autowired
private TaskTimeRepository taskTimeRDao;
@Override
public void updateTaskTimed(TaskTime taskTime) {
LOGGER.info("定时任务 TASK_TIMED :{}", taskTime);
taskTimeRDao.update(taskTime);
}
@Override
public void updateTaskTimedStatus(String id, int status, SessionUser user) {
LOGGER.info("定时任务 SYS_MENU id:{} status:{} user:{}", id,status,user);
TaskTime taskTime = taskTimeRDao.getById(Long.parseLong(id));
taskTime.setTaskStatus(status);
taskTime.setModifyUser(user.getUserName());
taskTimeRDao.update(taskTime);
}
@Override
public void deleteTaskTimedById(String id) {
LOGGER.info("定时任务 TASK_TIMED Key:{}", id);
taskTimeRDao.deleteById(Long.parseLong(id));
}
@Override
public TaskTime insertTaskTimed(TaskTime taskTime) {
LOGGER.info("定时任务 TASK_TIMED :{}", taskTime);
return taskTimeRDao.insert(taskTime);
}
@Override
public List<TaskTime> findTaskTimedAll() {
LOGGER.info("定时任务 TASK_TIMED find All");
return taskTimeRDao.findAll();
}
@Override
public TaskTime getTaskTimedById(String id) {
LOGGER.info("定时任务 TASK_TIMED find id:{}", id);
return taskTimeRDao.getOne(Long.parseLong(id));
}
}
Write Preview
Loading…
Cancel
Save