diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index e41a47f..e84509a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -609,7 +609,7 @@ public class BabyBookbuildingFacade { patient.setPid(pm.getId()); patient.setCreated(new Date()); patients = yunBookbuildingService.addPregnantBookbuilding(patient); - operateLogFacade.addOptLog(userId,Integer.valueOf(patients.getHospitalId()),patients,OptActionEnums.ADD.getId(),"儿童建档时候添加孕妇建档"); + operateLogFacade.addAddOptLog(userId, Integer.valueOf(patients.getHospitalId()), patients, OptActionEnums.ADD.getId(), "儿童建档时候添加孕妇建档"); } } @@ -636,7 +636,7 @@ public class BabyBookbuildingFacade { patient.setCreated(new Date()); patients = yunBookbuildingService.addPregnantBookbuilding(patient); - operateLogFacade.addOptLog(userId,Integer.valueOf(patients.getHospitalId()),patients,OptActionEnums.ADD.getId(),"儿童建档时候添加孕妇建档"); + operateLogFacade.addAddOptLog(userId, Integer.valueOf(patients.getHospitalId()), patients, OptActionEnums.ADD.getId(), "儿童建档时候添加孕妇建档"); } @@ -672,7 +672,7 @@ public class BabyBookbuildingFacade { // String hospitalName = organizationService.getOrganization(Integer.valueOf(request.getHospitalId())).getName(); model = babyBookbuildingService.addBabyBookbuilding(model); - operateLogFacade.addOptLog(userId,Integer.valueOf(request.getHospitalId()),model,OptActionEnums.ADD.getId(),"儿童建档"); + operateLogFacade.addAddOptLog(userId,Integer.valueOf(request.getHospitalId()),model,OptActionEnums.ADD.getId(),"儿童建档"); if (model == null || model.getId() == null) { br.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 1f0e162..b9d7cac 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -252,7 +252,7 @@ public class BookbuildingFacade { patient.setOperator(userId); Patients p = yunBookbuildingService.addPregnantBookbuilding(patient); - operateLogFacade.addOptLog(userId,Integer.valueOf(yunRequest.getHospitalId()),p,OptActionEnums.ADD.getId(),"孕妇建档"); + operateLogFacade.addAddOptLog(userId,Integer.valueOf(yunRequest.getHospitalId()),p,OptActionEnums.ADD.getId(),"孕妇建档"); /** 孕妇建档后把所有以前未使用的优惠券作废 */ couponService.invalid(p.getPid(), "1,2,3,4,5,6,7,8"); @@ -1391,7 +1391,7 @@ public class BookbuildingFacade { String hospital = autoMatchFacade.getHospitalId(userId); Patients patients = yunBookbuildingService.findOneById(id); - operateLogFacade.addDelteOptLog(userId,Integer.valueOf(patients.getHospitalId()),patients,OptActionEnums.DELETE.getId(),"删除孕妇建档"); + operateLogFacade.addDelteOptLog(userId, Integer.valueOf(patients.getHospitalId()), patients, OptActionEnums.DELETE.getId(), "删除孕妇建档"); if (!deleteProcessHandler.deleteBookBuild(patients.getPid(), patients.getBookbuildingDate(), hospital)) { return new BaseResponse().setErrorcode(ErrorCodeConstants.DONT_DELETE).setErrormsg("孕妇存在检查记录,不能删除建档"); 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 691116f..95ef4e2 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 @@ -38,6 +38,15 @@ public class OperateLogFacade { private UsersService usersService; + /** + * 添加修改的操作日志记录 + * @param userId + * @param hospitalId + * @param operateBeforeContent 修改前的对象 + * @param operateAfterContent 修改后的对象 + * @param operateAction + * @param operateRemark + */ public void addModifyOptLog(Integer userId,Integer hospitalId, Object operateBeforeContent, Object operateAfterContent, @@ -58,39 +67,72 @@ public class OperateLogFacade { } model.setOperateAction(operateAction); - model.setOperateAfterContent(JsonUtil.array2JsonString(operateAfterContent)); - model.setOperateBeforeContent(JsonUtil.array2JsonString(operateBeforeContent)); + model.setOperateBeforeContent(JsonUtil.obj2Str(operateBeforeContent)); + model.setOperateAfterContent(JsonUtil.obj2Str(operateAfterContent)); model.setOperateRemark(operateRemark); - if (operateAfterContent != null && operateBeforeContent != null ) + if (operateAfterContent != null && operateBeforeContent != null) { String json = JsonUtil.obj2Str(getChangeItems(operateAfterContent, operateBeforeContent)); System.out.print(json); model.setModifyContent(json); } - model.setOperateHospitalId(hospitalId); - model.setCreated(new Date()); - operateLogService.addOptLog(model); } - public void addOptLog(Integer userId,Integer hospitalId, - Object operateBeforeContent, + /** + * 新增的操作日志记录 + * @param userId + * @param hospitalId + * @param operateAfterContent 添加的对象 + * @param operateAction + * @param operateRemark + */ + public void addAddOptLog(Integer userId,Integer hospitalId, + Object operateAfterContent, String operateAction, String operateRemark) { addModifyOptLog( userId, hospitalId, - operateBeforeContent, null, + operateAfterContent, operateAction, operateRemark); } + /** + * 添加导出操作日志 + * @param userId + * @param hospitalId + * @param exportContet 导出内容 + * @param operateAction + * @param operateRemark + */ + public void addExportOptLog(Integer userId,Integer hospitalId, + Object exportContet, + String operateAction, + String operateRemark) + { + addModifyOptLog( userId, hospitalId, + null, + exportContet, + operateAction, + operateRemark); + } + + /** + * 删除对象 + * @param userId + * @param hospitalId + * @param operateBeforeContent 删除的对象 + * @param operateAction + * @param operateRemark 备注 + */ public void addDelteOptLog(Integer userId,Integer hospitalId, Object operateBeforeContent, String operateAction, @@ -172,24 +214,8 @@ public class OperateLogFacade { String result = text.substring(0, 22) + ":" + text.substring(22); return result; } - -// -// public static void main(String[] args) -// { -// -// BabyModel model1 = new BabyModel(); -// model1.setId("bbb"); -// model1.setBlNo("111"); -// -// BabyModel model2 = new BabyModel(); -// model2.setId("bbb"); -// model2.setBlNo("222"); -// List list = getChangeItems(model1, model2); -// System.out.println(JsonUtil.obj2Str(list)); -// } } - class ChangeItem { private String field;