From 23552786e9f8aaf8ebaf18fe633f033b1f06cf47 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 25 Oct 2017 09:58:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/biz/dal/IOperateLogDao.java | 11 ++ .../lyms/platform/biz/dal/impl/OperateLogImpl.java | 19 +++ .../platform/biz/service/OperateLogService.java | 31 +++++ .../lyms/platform/common/enums/OptActionEnums.java | 45 +++++++ .../com/lyms/platform/pojo/OperateLogModel.java | 129 +++++++++++++++++++++ .../web/controller/OperateLogController.java | 42 +++++++ .../operate/web/facade/BookbuildingFacade.java | 7 +- .../operate/web/facade/OperateLogFacade.java | 61 ++++++++++ 8 files changed, 342 insertions(+), 3 deletions(-) create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IOperateLogDao.java create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/OperateLogImpl.java create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/OperateLogService.java create mode 100644 platform-common/src/main/java/com/lyms/platform/common/enums/OptActionEnums.java create mode 100644 platform-dal/src/main/java/com/lyms/platform/pojo/OperateLogModel.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OperateLogController.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/OperateLogFacade.java diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IOperateLogDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IOperateLogDao.java new file mode 100644 index 0000000..61d06b3 --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IOperateLogDao.java @@ -0,0 +1,11 @@ +package com.lyms.platform.biz.dal; + + +import com.lyms.platform.pojo.OperateLogModel; + +/** + */ +public interface IOperateLogDao { + + void addOptLog(OperateLogModel model); +} diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/OperateLogImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/OperateLogImpl.java new file mode 100644 index 0000000..1ab6690 --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/OperateLogImpl.java @@ -0,0 +1,19 @@ +package com.lyms.platform.biz.dal.impl; + +import com.lyms.platform.biz.dal.IOperateLogDao; +import com.lyms.platform.common.dao.BaseMongoDAOImpl; +import com.lyms.platform.pojo.OperateLogModel; +import org.springframework.stereotype.Repository; + + +/** + * + */ +@Repository("iOperateLogDao") +public class OperateLogImpl extends BaseMongoDAOImpl implements IOperateLogDao { + + @Override + public void addOptLog(OperateLogModel model) { + save(model); + } +} diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/OperateLogService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/OperateLogService.java new file mode 100644 index 0000000..aa2a090 --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/OperateLogService.java @@ -0,0 +1,31 @@ +package com.lyms.platform.biz.service; + +import com.lyms.platform.biz.dal.IOperateLogDao; +import com.lyms.platform.biz.dal.IReferralApplyOrderDao; +import com.lyms.platform.biz.dal.ISieveApplyOrderDao; +import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.pojo.OperateLogModel; +import com.lyms.platform.pojo.ReferralApplyOrderModel; +import com.lyms.platform.pojo.SieveApplyOrderModel; +import com.lyms.platform.query.ReferralApplyOrderQuery; +import com.lyms.platform.query.SieveApplyOrderQuery; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Sort; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; + +/** + */ +@Service +public class OperateLogService { + + @Autowired + private IOperateLogDao iOperateLogDao; + + public void addOptLog(OperateLogModel model) { + iOperateLogDao.addOptLog(model); + } +} diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/OptActionEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/OptActionEnums.java new file mode 100644 index 0000000..3edf533 --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/OptActionEnums.java @@ -0,0 +1,45 @@ +package com.lyms.platform.common.enums; + + + +/** + * 操作日志action + */ +public enum OptActionEnums { + + ADD("add","添加"),UPDATE("update","修改"),DELETE("delete","删除"),EXPORT("export","导出"); + + OptActionEnums(String id, String name) { + this.id = id; + this.name = name; + } + + private String id; + private String name; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public static String getNameById(String id) { + for (OptActionEnums e : OptActionEnums.values()) { + if(e.getId().equals(id)) + { + return e.getName(); + } + } + return ""; + } +} diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/OperateLogModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/OperateLogModel.java new file mode 100644 index 0000000..d112114 --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/OperateLogModel.java @@ -0,0 +1,129 @@ +package com.lyms.platform.pojo; + +import com.lyms.platform.beans.SerialIdEnum; +import com.lyms.platform.common.result.BaseModel; +import org.springframework.data.mongodb.core.mapping.Document; + +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + * 操作日志模型 + * + */ +@Document(collection = "lyms_operatelog") +public class OperateLogModel extends BaseModel { + + private static final long serialVersionUID = SerialIdEnum.OperateLogModel.getCid(); + + private String id; + + //操作人id + private Integer operateId; + + + //操作人账号 + private String operateAccount; + + //操作人姓名 + private String operateName; + + //操作医院id + private Integer operateHospitalId; + + //操作前内容 + private Object operateBeforeContent; + + //操作后内容 + private Object operateAfterContent; + + //操作动作 + private String operateAction; + + //操作时间 + private Date created; + + //操作备注 + private String operateRemark; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Integer getOperateId() { + return operateId; + } + + public void setOperateId(Integer operateId) { + this.operateId = operateId; + } + + public String getOperateAccount() { + return operateAccount; + } + + public void setOperateAccount(String operateAccount) { + this.operateAccount = operateAccount; + } + + public String getOperateName() { + return operateName; + } + + public void setOperateName(String operateName) { + this.operateName = operateName; + } + + public Integer getOperateHospitalId() { + return operateHospitalId; + } + + public void setOperateHospitalId(Integer operateHospitalId) { + this.operateHospitalId = operateHospitalId; + } + + public Object getOperateBeforeContent() { + return operateBeforeContent; + } + + public void setOperateBeforeContent(Object operateBeforeContent) { + this.operateBeforeContent = operateBeforeContent; + } + + public Object getOperateAfterContent() { + return operateAfterContent; + } + + public void setOperateAfterContent(Object operateAfterContent) { + this.operateAfterContent = operateAfterContent; + } + + public String getOperateAction() { + return operateAction; + } + + public void setOperateAction(String operateAction) { + this.operateAction = operateAction; + } + + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + } + + public String getOperateRemark() { + return operateRemark; + } + + public void setOperateRemark(String operateRemark) { + this.operateRemark = operateRemark; + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OperateLogController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OperateLogController.java new file mode 100644 index 0000000..b7b447b --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OperateLogController.java @@ -0,0 +1,42 @@ +package com.lyms.platform.operate.web.controller; + +import com.lyms.platform.common.annotation.TokenRequired; +import com.lyms.platform.common.base.BaseController; +import com.lyms.platform.common.base.LoginContext; +import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.operate.web.facade.AreaCountFacade; +import com.lyms.platform.operate.web.facade.OperateLogFacade; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * + * 操作日志 + * lqy + */ +@Controller +public class OperateLogController extends BaseController { + + @Autowired + private OperateLogFacade operateLogFacade; + + + @RequestMapping(method = RequestMethod.GET,value = "/getOptLogList") + @ResponseBody + @TokenRequired + public BaseResponse getOptLogList(HttpServletRequest request) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return null; + } + + + + +} \ No newline at end of file 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 b8c44f0..3b488ef 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 @@ -107,8 +107,9 @@ public class BookbuildingFacade { private SieveService sieveService; @Autowired private OrganizationGroupsFacade groupsFacade; -// @Autowired -// private OperateLogFacade operateLogFacade; + + @Autowired + private OperateLogFacade operateLogFacade; @Autowired private AutoIncermentService autoIncermentService; @@ -251,7 +252,7 @@ public class BookbuildingFacade { patient.setOperator(userId); Patients p = yunBookbuildingService.addPregnantBookbuilding(patient); -// operateLogFacade.addOptLog(userId,Integer.valueOf(yunRequest.getHospitalId()),JsonUtil.array2JsonString(p),"",OptActionEnums.ADD.getId(),""); + operateLogFacade.addOptLog(userId,Integer.valueOf(yunRequest.getHospitalId()),JsonUtil.array2JsonString(p),"",OptActionEnums.ADD.getId(),""); /** 孕妇建档后把所有以前未使用的优惠券作废 */ couponService.invalid(p.getPid(), "1,2,3,4,5,6,7,8"); 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 new file mode 100644 index 0000000..3c92b42 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/OperateLogFacade.java @@ -0,0 +1,61 @@ +package com.lyms.platform.operate.web.facade; + + +import com.lyms.platform.biz.service.OperateLogService; +import com.lyms.platform.permission.model.Users; +import com.lyms.platform.permission.model.UsersQuery; +import com.lyms.platform.permission.service.UsersService; +import com.lyms.platform.pojo.OperateLogModel; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.Date; +import java.util.List; + + +/** + * + */ +@Component +public class OperateLogFacade { + + @Autowired + private OperateLogService operateLogService; + + @Autowired + private UsersService usersService; + + public void addOptLog(Integer userId,Integer hospitalId, + Object operateBeforeContent, + Object operateAfterContent, + String operateAction, + String operateRemark) + { + + 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.setOperateAfterContent(operateAfterContent); + model.setOperateBeforeContent(operateBeforeContent); + model.setOperateRemark(operateRemark); + + model.setOperateHospitalId(hospitalId); + + model.setCreated(new Date()); + + operateLogService.addOptLog(model); + } + +} \ No newline at end of file -- 1.8.3.1