diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/OperateLogFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/OperateLogFacade.java index cfbb340..75f6480 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/OperateLogFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/OperateLogFacade.java @@ -60,42 +60,42 @@ public class OperateLogFacade { final String operateRemark) { -// commonThreadPool.execute(new Runnable() { -// @Override -// public void run() { -// OperateLogModel model = new OperateLogModel(); -// UsersQuery usersQuery = new UsersQuery(); -// usersQuery.setId(userId); -// List list = usersService.queryUsers(usersQuery); -// if (CollectionUtils.isNotEmpty(list)) -// { -// Users users = list.get(0); -// model.setOperateId(users.getId()); -// model.setOperateAccount(users.getAccount()); -// model.setOperateName(users.getName()); -// } -// -// model.setOperateAction(operateAction); -// -// model.setOperateBeforeContent(JsonUtil.obj2Str(operateBeforeContent)); -// model.setOperateAfterContent(JsonUtil.obj2Str(operateAfterContent)); -// model.setOperateRemark(operateRemark); -// -// if (operateAfterContent != null && operateBeforeContent != null) -// { -// String json = JsonUtil.obj2Str(getChangeItems(operateBeforeContent,operateAfterContent)); -// model.setModifyContent(json); -// } -// if (operateAfterContent != null) -// { -// model.set_class(operateAfterContent.getClass().getName()); -// } -// -// model.setOperateHospitalId(hospitalId); -// model.setCreated(new Date()); -// operateLogService.addOptLog(model); -// } -// }); + commonThreadPool.execute(new Runnable() { + @Override + public void run() { + OperateLogModel model = new OperateLogModel(); + UsersQuery usersQuery = new UsersQuery(); + usersQuery.setId(userId); + List list = usersService.queryUsers(usersQuery); + if (CollectionUtils.isNotEmpty(list)) + { + Users users = list.get(0); + model.setOperateId(users.getId()); + model.setOperateAccount(users.getAccount()); + model.setOperateName(users.getName()); + } + + model.setOperateAction(operateAction); + + model.setOperateBeforeContent(JsonUtil.obj2Str(operateBeforeContent)); + model.setOperateAfterContent(JsonUtil.obj2Str(operateAfterContent)); + model.setOperateRemark(operateRemark); + + if (operateAfterContent != null && operateBeforeContent != null) + { + String json = JsonUtil.obj2Str(getChangeItems(operateBeforeContent,operateAfterContent)); + model.setModifyContent(json); + } + if (operateAfterContent != null) + { + model.set_class(operateAfterContent.getClass().getName()); + } + + model.setOperateHospitalId(hospitalId); + model.setCreated(new Date()); + operateLogService.addOptLog(model); + } + }); } @@ -114,11 +114,11 @@ public class OperateLogFacade { String operateRemark) { -// addModifyOptLog( userId, hospitalId, -// null, -// operateAfterContent, -// operateAction, -// operateRemark); + addModifyOptLog( userId, hospitalId, + null, + operateAfterContent, + operateAction, + operateRemark); }