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

操作日志 完成

Browse Source 
系统日志 完成
系统消息 完成
yun-zuoyi
yunhao.wang 7 years ago
parent d4deede0a9
commit 8cfa440e92
17 changed files with 148 additions and 55 deletions
Show Stats Download Patch File Download Diff File

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

@ -36,7 +36,7 @@ public interface ILogOperateService {
* 查找所有操作日志
* @return
*/
List<LogOperate> findLogOperateAll();
List<LogOperate> listLogOperate();
/**
* 根据id查找操作日志

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

@ -35,7 +35,7 @@ public interface ILogSystemService {
* 查询全部日志
* @return
*/
List<LogSystem> findLogSystemAll();
List<LogSystem> listLogSystem();
/**
* 根据id查询系统日志

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

@ -35,7 +35,7 @@ public interface ISysFileService {
* 查询全部文件资源信息
* @return
*/
List<SysFile> findSysFileAll();
List<SysFile> listSysFile();
/**
* 根据id查询文件资源信息

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

@ -35,7 +35,7 @@ public interface ISysMessageService {
* 查询全部信息
* @return
*/
List<SysMessage> findSysMessageAll();
List<SysMessage> listSysMessage();
/**
* 根据id查询消息

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

@ -39,7 +39,7 @@ public class DepartmentController {
public IDepartmentService departmentService;
@PutMapping(value = "/insert")
@PostMapping(value = "/insert")
@ApiOperation(value = "添加部门", notes = "返回内容添加部门")
public ResultBean insertDepartment(Department department) {
try {
@ -70,7 +70,6 @@ public class DepartmentController {
@ApiOperation(value = "修改部门", notes = "根据部门id修改信息")
public ResultBean updateDepartmentById(Department department) {
try {
//登陆用户
SessionUser user = AuthUtil.getSessionUser();
@ -78,7 +77,8 @@ public class DepartmentController {
ValidatorBean.beginValid(department)
.checkNotZero("id", department.getId())
.notNull("departmentName", department.getDepartmentName())
.notNull("departmentCode", department.getDepartmentCode());
.notNull("departmentCode", department.getDepartmentCode())
.checkNotZero("organizeId",department.getOrganizeId());
//修改初始化
ConvertBean.modelUpdate(department, user);
@ -96,7 +96,7 @@ public class DepartmentController {
@DeleteMapping(value = "/delete/{id}")
@ApiOperation(value = "删除部门", notes = "根据部门id删除信息")
public ResultBean deleteDepartment(String id) {
public ResultBean deleteDepartment(@PathVariable("id") String id) {
try {
//条件验证
ValidatorBean.checkNotNull(id, "id为空。");
@ -168,7 +168,7 @@ public class DepartmentController {
}
}
@DeleteMapping(value = "/delete")
@DeleteMapping(value = "/batch-delete")
@ApiOperation(value = "根据id批量删除", notes = "根据id批量删除")
public ResultBean deleteDepartmentByIds(@RequestBody String[] ids) {
try {

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

@ -65,4 +65,60 @@ public class EnumController {
Arrays.asList(CommonEnumUtil.USER_STATUS.values()));
}
@GetMapping("/log-level")
@ApiOperation(value = "日志等级", notes = "日志等级")
public ResultBean getLogLevel(){
return new ResultBean(true, "操作成功",
Arrays.asList(ImppEnumUtil.LOG_LEVEL.values()));
}
@GetMapping("/soft-type")
@ApiOperation(value = "软件类型", notes = "软件类型")
public ResultBean getSoftType(){
return new ResultBean(true, "操作成功",
Arrays.asList(CommonEnumUtil.SOFT_TYPE.values()));
}
@GetMapping("/log-type")
@ApiOperation(value = "操作日志类型", notes = "操作日志类型")
public ResultBean getLogType(){
return new ResultBean(true, "操作成功",
Arrays.asList(ImppEnumUtil.LOG_TYPE.values()));
}
@GetMapping("/user-message-status")
@ApiOperation(value = "用户消息状态", notes = "用户消息状态")
public ResultBean getUserMessageStatus(){
return new ResultBean(true, "操作成功",
Arrays.asList(ImppEnumUtil.USER_MESSAGE_STATUS.values()));
}
@GetMapping("/user-message-type")
@ApiOperation(value = "用户消息类型", notes = "用户消息类型")
public ResultBean getUserMessageType(){
return new ResultBean(true, "操作成功",
Arrays.asList(ImppEnumUtil.USER_MESSAGE_TYPE.values()));
}
@GetMapping("/tool-conn-type")
@ApiOperation(value = "硬件连接类型", notes = "硬件连接类型")
public ResultBean getToolConnType(){
return new ResultBean(true, "操作成功",
Arrays.asList(ImppEnumUtil.TOOL_CONN_TYPE.values()));
}
@GetMapping("/tool-data-type")
@ApiOperation(value = "硬件数据类型", notes = "硬件数据类型")
public ResultBean getToolDataType(){
return new ResultBean(true, "操作成功",
Arrays.asList(ImppEnumUtil.TOOL_DATA_TYPE.values()));
}
@GetMapping("/sys-param-type")
@ApiOperation(value = "系统参数类型", notes = "系统参数类型")
public ResultBean getSysParamType(){
return new ResultBean(true, "操作成功",
Arrays.asList(ImppEnumUtil.SYS_PARAM_TYPE.values()));
}
}

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

@ -36,7 +36,7 @@ public class LogOperateController {
@Autowired
private ILogOperateService logOperateService;
@PutMapping(value = "/insert")
@PostMapping(value = "/insert")
@ApiOperation(value = "添加操作日志",notes = "添加操作日志")
public ResultBean insertLogOperateController(LogOperate logOperate){
try {
@ -99,7 +99,7 @@ public class LogOperateController {
@ApiOperation(value = "查询全部操作日志",notes = "查询全部操作日志")
public ResultBean findLogOperateAll(){
try {
List<LogOperate> logOperateList = logOperateService.findLogOperateAll();
List<LogOperate> logOperateList = logOperateService.listLogOperate();
return ResultBean.success("查询成功")
.setResultList(logOperateList)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());

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

@ -36,7 +36,7 @@ public class LogSystemController {
private ILogSystemService logSystemService;
@PutMapping(value = "/insert")
@PostMapping(value = "/insert")
@ApiOperation(value="新增系统日志",notes = "新增系统日志")
public ResultBean insertLogSystem(LogSystem logSystem) {
try {
@ -96,11 +96,11 @@ public class LogSystemController {
}
}
@GetMapping(value = "/find-all")
@GetMapping(value = "/list")
@ApiOperation(value = "查询全部系统日志",notes = "查询全部系统日志")
public ResultBean findLogSystemAll(){
try {
List<LogSystem> logSystemList = logSystemService.findLogSystemAll();
List<LogSystem> logSystemList = logSystemService.listLogSystem();
return ResultBean.success("查询成功")
.setResultList(logSystemList)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());

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

@ -49,7 +49,7 @@ public class PositionController {
//条件验证
ValidatorBean.beginValid(position)
.notNull("positionName",position.getName())
.notNull("name",position.getName())
.notNull("positionCode",position.getPositionCode());
//新增初始化

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

@ -15,10 +15,7 @@ import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@ -39,7 +36,7 @@ public class SysFileController {
private ISysFileService sysFileService;
@PutMapping(value = "/insert")
@PostMapping(value = "/insert")
@ApiOperation(value = "添加文件资源",notes = "添加文件资源")
public ResultBean insertSysFile(SysFile sysFile){
try {
@ -84,11 +81,11 @@ public class SysFileController {
}
}
@GetMapping(value = "/find-all")
@GetMapping(value = "/list")
@ApiOperation(value = "查询全部文件资源",notes = "查询全部文件资源")
public ResultBean findSysFileAll(SysFile sysFile){
try {
List<SysFile> sysFileList = sysFileService.findSysFileAll();
List<SysFile> sysFileList = sysFileService.listSysFile();
return ResultBean.success("查询成功")
.setResultList(sysFileList)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());

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

@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService;
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
import cn.estsh.i3plus.pojo.platform.bean.SysMessage;
@ -35,7 +36,7 @@ public class SysMessageController {
@Autowired
private ISysMessageService sysMessageService;
@PutMapping(value = "/insert")
@PostMapping(value = "/insert")
@ApiOperation(value = "新增消息",notes = "新增消息")
public ResultBean insertSysMessage(SysMessage sysMessage){
try {
@ -46,11 +47,14 @@ public class SysMessageController {
ValidatorBean.beginValid(sysMessage)
.notNull("messageTitle",sysMessage.getMessageTitle())
.notNull("messageContent",sysMessage.getMessageContent())
.notNull("messageSendId",sysMessage.getMessageSendId())
.notNull("messageAcceptId",sysMessage.getMessageAcceptId());
.checkNotZero("messageType",sysMessage.getMessageType())
.notNull("messageRecipientId",sysMessage.getMessageRecipientId());
// 添加初始化
ConvertBean.modelInitialize(sysMessage,user);
// sysMessage.setMessageSendId(user.getUser().getId());
// sysMessage.setRedSendName(user.getUser().getName());
sysMessage.setMessageStatus(ImppEnumUtil.USER_MESSAGE_STATUS.UNREAD.getValue());
// TODO 状态 status
sysMessageService.insertSysMessage(sysMessage);
@ -64,9 +68,9 @@ public class SysMessageController {
}
}
@DeleteMapping("/delete")
@DeleteMapping("/delete/{id}")
@ApiOperation(value = "根据id删除消息",notes = "根据id删除消息")
public ResultBean deleteSysMessageById(String id){
public ResultBean deleteSysMessageById(@PathVariable("id") String id){
try {
// 条件校验
ValidatorBean.checkNotNull(id,"id不能为空");
@ -93,11 +97,13 @@ public class SysMessageController {
ValidatorBean.beginValid(sysMessage)
.notNull("messageTitle",sysMessage.getMessageTitle())
.notNull("messageContent",sysMessage.getMessageContent())
.notNull("messageSendId",sysMessage.getMessageSendId())
.notNull("messageAcceptId",sysMessage.getMessageAcceptId());
.checkNotZero("messageType",sysMessage.getMessageType())
.notNull("messageRecipientId",sysMessage.getMessageRecipientId());
// 添加初始化
ConvertBean.modelUpdate(sysMessage,user);
// sysMessage.setMessageSendId(user.getUser().getId());
// sysMessage.setRedSendName(user.getUser().getName());
// TODO 状态 status
sysMessageService.updateSysMessage(sysMessage);
@ -111,11 +117,11 @@ public class SysMessageController {
}
}
@GetMapping(value = "/find-all")
@GetMapping(value = "/list")
@ApiOperation(value = "查询全部消息",notes = "查询全部消息")
public ResultBean findSysConfigAll(){
try {
List<SysMessage> sysMessageList = sysMessageService.findSysMessageAll();
List<SysMessage> sysMessageList = sysMessageService.listSysMessage();
return ResultBean.success("查询成功")
.setResultList(sysMessageList)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());

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

@ -18,6 +18,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Arrays;
import java.util.List;
/**
@ -40,7 +41,7 @@ public class DepartmentServiceImpl implements IDepartmentService {
@Override
public void insertDepartment(Department department) {
// 查询父级部门名称
if (department.getParentId() != null && department.getParentId() > 0) {
if (department.getParentId() != null && department.getParentId() > 0) {
LOGGER.info("部门信息 DEPARTMENT :{}", department.getParentId());
Department parentPosition = departmentRDao.getById(department.getParentId());
ValidatorBean.checkNotNull(parentPosition);
@ -49,11 +50,11 @@ public class DepartmentServiceImpl implements IDepartmentService {
}
// 查询所属组织名称
LOGGER.info("组织信息 ORGANIZE :{}", department.getOrganizeId());
Organize organize = organizeRDao.getById(department.getOrganizeId());
ValidatorBean.checkNotNull(organize);
LOGGER.info("组织信息 ORGANIZE :{}", department.getOrganizeId());
Organize organize = organizeRDao.getById(department.getOrganizeId());
ValidatorBean.checkNotNull(organize);
department.setRedOrganizeName(organize.getName());
department.setRedOrganizeName(organize.getName());
// 新增部门
LOGGER.info("部门信息 DEPARTMENT {}",department);
@ -64,7 +65,7 @@ public class DepartmentServiceImpl implements IDepartmentService {
public void deleteDepartmentById(String id) {
// 查询是否存在子级
LOGGER.info("部门信息 DEPARTMENT :{}", id);
if (departmentRDao.findByPropertyCount("parentId",id) > 0) {
if (departmentRDao.findByPropertyCount("parentId",Long.parseLong(id)) > 0) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
@ -81,7 +82,7 @@ public class DepartmentServiceImpl implements IDepartmentService {
@Override
public void updateDepartment(Department department) {
// 查询父级部门名称
if (department.getParentId() != null && department.getParentId() > 0) {
if (department.getParentId() != null && department.getParentId() > 0) {
LOGGER.info("部门信息 DEPARTMENT :{}", department.getParentId());
Department parentPosition = departmentRDao.getById(department.getParentId());
ValidatorBean.checkNotNull(parentPosition);
@ -90,14 +91,14 @@ public class DepartmentServiceImpl implements IDepartmentService {
}
// 查询所属组织名称
LOGGER.info("组织信息 ORGANIZE :{}", department.getOrganizeId());
LOGGER.info("组织信息 ORGANIZE organizeId:{}", department.getOrganizeId());
Organize organize = organizeRDao.getById(department.getOrganizeId());
ValidatorBean.checkNotNull(organize);
department.setRedOrganizeName(organize.getName());
// 新增部门
LOGGER.info("部门信息 DEPARTMENT :{}",department);
LOGGER.info("部门信息 DEPARTMENT department:{}",department);
departmentRDao.update(department);
}
@ -126,4 +127,5 @@ public class DepartmentServiceImpl implements IDepartmentService {
return new ListPager(departmentRDao.findByHqlWherePage(hqlPack + department.getOrderByParam(),pager),pager);
}
}
}

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

@ -43,9 +43,9 @@ public class LogOperateServiceImpl implements ILogOperateService {
}
@Override
public List<LogOperate> findLogOperateAll() {
LOGGER.info("操作日志 LOG_ACTION find-all");
return logOperateRDao.findAll();
public List<LogOperate> listLogOperate() {
LOGGER.info("操作日志 LOG_ACTION list");
return logOperateRDao.list();
}
@Override

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

@ -43,9 +43,9 @@ public class LogSystemServiceImpl implements ILogSystemService {
}
@Override
public List<LogSystem> findLogSystemAll() {
LOGGER.info("系统日志 LOG_SYSTEM find-all");
return logSystemRDao.findAll();
public List<LogSystem> listLogSystem() {
LOGGER.info("系统日志 LOG_SYSTEM list");
return logSystemRDao.list();
}
@Override

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

@ -12,10 +12,13 @@ import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
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 org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import java.lang.reflect.Array;
import java.util.Arrays;
@ -38,9 +41,11 @@ public class PositionServiceImpl implements IPositionService {
@Override
public Position insertPosition(Position position) {
// 查询父级岗位名称
if (position.getParentId() != null) {
if (position.getParentId() != null && position.getParentId() > 0) {
LOGGER.info("岗位信息 POSITION parentId:{}", position.getParentId());
Position parentPosition = positionRDao.getById(position.getParentId());
ValidatorBean.checkNotNull(parentPosition);
position.setRedParentName(parentPosition.getName());
}
@ -52,9 +57,11 @@ public class PositionServiceImpl implements IPositionService {
@Override
public void updatePosition(Position position) {
// 查询父级岗位名称
if (position.getParentId() != null) {
if (position.getParentId() != null && position.getParentId() > 0) {
LOGGER.info("岗位信息 POSITION parentId:{}", position.getParentId());
Position parentPosition = positionRDao.getById(position.getParentId());
ValidatorBean.checkNotNull(parentPosition);
position.setRedParentName(parentPosition.getName());
}
@ -67,7 +74,7 @@ public class PositionServiceImpl implements IPositionService {
public void deletePositionById(String id) {
// 查询是否存在子级
LOGGER.info("岗位信息 POSITION id:{}", id);
long positionCount = positionRDao.findByPropertyCount("parentId",id);
long positionCount = positionRDao.findByPropertyCount("parentId",Long.parseLong(id));
if (positionCount >= 1) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())

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

@ -43,9 +43,9 @@ public class SysFileServiceImpl implements ISysFileService {
}
@Override
public List<SysFile> findSysFileAll() {
LOGGER.info("文件资源 SYS_FILE find-aLl");
return sysFileRDao.findAll();
public List<SysFile> listSysFile() {
LOGGER.info("文件资源 SYS_FILE list");
return sysFileRDao.list();
}
@Override

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

@ -1,8 +1,12 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService;
import cn.estsh.i3plus.pojo.platform.bean.Department;
import cn.estsh.i3plus.pojo.platform.bean.SysMessage;
import cn.estsh.i3plus.pojo.platform.bean.SysUser;
import cn.estsh.i3plus.pojo.platform.repository.SysMessageRepository;
import cn.estsh.i3plus.pojo.platform.repository.SysUserRepository;
import cn.estsh.impp.framework.boot.util.ValidatorBean;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@ -24,8 +28,20 @@ public class SysMessageServiceImpl implements ISysMessageService {
@Autowired
public SysMessageRepository sysMessageRDao;
@Autowired
public SysUserRepository sysUserRDao;
@Override
public void insertSysMessage(SysMessage sysMessage) {
// 查询接收人名称
if (sysMessage.getMessageRecipientId() != null && sysMessage.getMessageRecipientId() > 0) {
LOGGER.info("用户信息 SYSUSER id:{}", sysMessage.getMessageRecipientId());
SysUser acceptUser = sysUserRDao.getById(sysMessage.getMessageRecipientId());
ValidatorBean.checkNotNull(acceptUser);
sysMessage.setRedMessageRecipientName(acceptUser.getName());
}
LOGGER.info("系统信息 SYS_MESSAGE :{}",sysMessage);
sysMessageRDao.insert(sysMessage);
}
@ -39,14 +55,23 @@ public class SysMessageServiceImpl implements ISysMessageService {
@Override
public void updateSysMessage(SysMessage sysMessage) {
// 查询接收人名称
if (sysMessage.getMessageRecipientId() != null && sysMessage.getMessageRecipientId() > 0) {
LOGGER.info("用户信息 SYSUSER id:{}", sysMessage.getMessageRecipientId());
SysUser acceptUser = sysUserRDao.getById(sysMessage.getMessageRecipientId());
ValidatorBean.checkNotNull(acceptUser);
sysMessage.setRedMessageRecipientName(acceptUser.getName());
}
LOGGER.info("系统信息 SYS_MESSAGE :{}",sysMessage);
sysMessageRDao.update(sysMessage);
}
@Override
public List<SysMessage> findSysMessageAll() {
LOGGER.info("系统信息 SYS_MESSAGE find-all");
return sysMessageRDao.findAll();
public List<SysMessage> listSysMessage() {
LOGGER.info("系统信息 SYS_MESSAGE list");
return sysMessageRDao.list();
}
@Override

Write Preview
Loading…
Cancel
Save