Commit 63421083d5f9739219bd5b84ca8d42b27d4a7cce
1 parent
259fb1faa5
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 41 additions and 41 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/OperateLogFacade.java
View file @
6342108
| ... | ... | @@ -60,44 +60,44 @@ |
| 60 | 60 | final String operateRemark) |
| 61 | 61 | { |
| 62 | 62 | |
| 63 | -// commonThreadPool.execute(new Runnable() { | |
| 64 | -// @Override | |
| 65 | -// public void run() { | |
| 66 | -// OperateLogModel model = new OperateLogModel(); | |
| 67 | -// UsersQuery usersQuery = new UsersQuery(); | |
| 68 | -// usersQuery.setId(userId); | |
| 69 | -// List<Users> list = usersService.queryUsers(usersQuery); | |
| 70 | -// if (CollectionUtils.isNotEmpty(list)) | |
| 71 | -// { | |
| 72 | -// Users users = list.get(0); | |
| 73 | -// model.setOperateId(users.getId()); | |
| 74 | -// model.setOperateAccount(users.getAccount()); | |
| 75 | -// model.setOperateName(users.getName()); | |
| 76 | -// } | |
| 77 | -// | |
| 78 | -// model.setOperateAction(operateAction); | |
| 79 | -// | |
| 80 | -// model.setOperateBeforeContent(JsonUtil.obj2Str(operateBeforeContent)); | |
| 81 | -// model.setOperateAfterContent(JsonUtil.obj2Str(operateAfterContent)); | |
| 82 | -// model.setOperateRemark(operateRemark); | |
| 83 | -// | |
| 84 | -// if (operateAfterContent != null && operateBeforeContent != null) | |
| 85 | -// { | |
| 86 | -// String json = JsonUtil.obj2Str(getChangeItems(operateBeforeContent,operateAfterContent)); | |
| 87 | -// model.setModifyContent(json); | |
| 88 | -// } | |
| 89 | -// if (operateAfterContent != null) | |
| 90 | -// { | |
| 91 | -// model.set_class(operateAfterContent.getClass().getName()); | |
| 92 | -// } | |
| 93 | -// | |
| 94 | -// model.setOperateHospitalId(hospitalId); | |
| 95 | -// model.setCreated(new Date()); | |
| 96 | -// operateLogService.addOptLog(model); | |
| 97 | -// } | |
| 98 | -// }); | |
| 63 | + commonThreadPool.execute(new Runnable() { | |
| 64 | + @Override | |
| 65 | + public void run() { | |
| 66 | + OperateLogModel model = new OperateLogModel(); | |
| 67 | + UsersQuery usersQuery = new UsersQuery(); | |
| 68 | + usersQuery.setId(userId); | |
| 69 | + List<Users> list = usersService.queryUsers(usersQuery); | |
| 70 | + if (CollectionUtils.isNotEmpty(list)) | |
| 71 | + { | |
| 72 | + Users users = list.get(0); | |
| 73 | + model.setOperateId(users.getId()); | |
| 74 | + model.setOperateAccount(users.getAccount()); | |
| 75 | + model.setOperateName(users.getName()); | |
| 76 | + } | |
| 99 | 77 | |
| 78 | + model.setOperateAction(operateAction); | |
| 100 | 79 | |
| 80 | + model.setOperateBeforeContent(JsonUtil.obj2Str(operateBeforeContent)); | |
| 81 | + model.setOperateAfterContent(JsonUtil.obj2Str(operateAfterContent)); | |
| 82 | + model.setOperateRemark(operateRemark); | |
| 83 | + | |
| 84 | + if (operateAfterContent != null && operateBeforeContent != null) | |
| 85 | + { | |
| 86 | + String json = JsonUtil.obj2Str(getChangeItems(operateBeforeContent,operateAfterContent)); | |
| 87 | + model.setModifyContent(json); | |
| 88 | + } | |
| 89 | + if (operateAfterContent != null) | |
| 90 | + { | |
| 91 | + model.set_class(operateAfterContent.getClass().getName()); | |
| 92 | + } | |
| 93 | + | |
| 94 | + model.setOperateHospitalId(hospitalId); | |
| 95 | + model.setCreated(new Date()); | |
| 96 | + operateLogService.addOptLog(model); | |
| 97 | + } | |
| 98 | + }); | |
| 99 | + | |
| 100 | + | |
| 101 | 101 | } |
| 102 | 102 | |
| 103 | 103 | /** |
| ... | ... | @@ -114,11 +114,11 @@ |
| 114 | 114 | String operateRemark) |
| 115 | 115 | { |
| 116 | 116 | |
| 117 | -// addModifyOptLog( userId, hospitalId, | |
| 118 | -// null, | |
| 119 | -// operateAfterContent, | |
| 120 | -// operateAction, | |
| 121 | -// operateRemark); | |
| 117 | + addModifyOptLog( userId, hospitalId, | |
| 118 | + null, | |
| 119 | + operateAfterContent, | |
| 120 | + operateAction, | |
| 121 | + operateRemark); | |
| 122 | 122 | } |
| 123 | 123 | |
| 124 | 124 |