Commit 23552786e9f8aaf8ebaf18fe633f033b1f06cf47
1 parent
6e795d9ef1
Exists in
master
and in
6 other branches
操作日志
Showing 8 changed files with 342 additions and 3 deletions
- platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IOperateLogDao.java
- platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/OperateLogImpl.java
- platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/OperateLogService.java
- platform-common/src/main/java/com/lyms/platform/common/enums/OptActionEnums.java
- platform-dal/src/main/java/com/lyms/platform/pojo/OperateLogModel.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OperateLogController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/OperateLogFacade.java
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IOperateLogDao.java
View file @
2355278
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/OperateLogImpl.java
View file @
2355278
| 1 | +package com.lyms.platform.biz.dal.impl; | |
| 2 | + | |
| 3 | +import com.lyms.platform.biz.dal.IOperateLogDao; | |
| 4 | +import com.lyms.platform.common.dao.BaseMongoDAOImpl; | |
| 5 | +import com.lyms.platform.pojo.OperateLogModel; | |
| 6 | +import org.springframework.stereotype.Repository; | |
| 7 | + | |
| 8 | + | |
| 9 | +/** | |
| 10 | + * | |
| 11 | + */ | |
| 12 | +@Repository("iOperateLogDao") | |
| 13 | +public class OperateLogImpl extends BaseMongoDAOImpl<OperateLogModel> implements IOperateLogDao { | |
| 14 | + | |
| 15 | + @Override | |
| 16 | + public void addOptLog(OperateLogModel model) { | |
| 17 | + save(model); | |
| 18 | + } | |
| 19 | +} |
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/OperateLogService.java
View file @
2355278
| 1 | +package com.lyms.platform.biz.service; | |
| 2 | + | |
| 3 | +import com.lyms.platform.biz.dal.IOperateLogDao; | |
| 4 | +import com.lyms.platform.biz.dal.IReferralApplyOrderDao; | |
| 5 | +import com.lyms.platform.biz.dal.ISieveApplyOrderDao; | |
| 6 | +import com.lyms.platform.common.dao.operator.MongoQuery; | |
| 7 | +import com.lyms.platform.pojo.OperateLogModel; | |
| 8 | +import com.lyms.platform.pojo.ReferralApplyOrderModel; | |
| 9 | +import com.lyms.platform.pojo.SieveApplyOrderModel; | |
| 10 | +import com.lyms.platform.query.ReferralApplyOrderQuery; | |
| 11 | +import com.lyms.platform.query.SieveApplyOrderQuery; | |
| 12 | +import org.apache.commons.lang.StringUtils; | |
| 13 | +import org.springframework.beans.factory.annotation.Autowired; | |
| 14 | +import org.springframework.data.domain.Sort; | |
| 15 | +import org.springframework.stereotype.Service; | |
| 16 | + | |
| 17 | +import java.util.Date; | |
| 18 | +import java.util.List; | |
| 19 | + | |
| 20 | +/** | |
| 21 | + */ | |
| 22 | +@Service | |
| 23 | +public class OperateLogService { | |
| 24 | + | |
| 25 | + @Autowired | |
| 26 | + private IOperateLogDao iOperateLogDao; | |
| 27 | + | |
| 28 | + public void addOptLog(OperateLogModel model) { | |
| 29 | + iOperateLogDao.addOptLog(model); | |
| 30 | + } | |
| 31 | +} |
platform-common/src/main/java/com/lyms/platform/common/enums/OptActionEnums.java
View file @
2355278
| 1 | +package com.lyms.platform.common.enums; | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | +/** | |
| 6 | + * 操作日志action | |
| 7 | + */ | |
| 8 | +public enum OptActionEnums { | |
| 9 | + | |
| 10 | + ADD("add","添加"),UPDATE("update","修改"),DELETE("delete","删除"),EXPORT("export","导出"); | |
| 11 | + | |
| 12 | + OptActionEnums(String id, String name) { | |
| 13 | + this.id = id; | |
| 14 | + this.name = name; | |
| 15 | + } | |
| 16 | + | |
| 17 | + private String id; | |
| 18 | + private String name; | |
| 19 | + | |
| 20 | + public String getName() { | |
| 21 | + return name; | |
| 22 | + } | |
| 23 | + | |
| 24 | + public void setName(String name) { | |
| 25 | + this.name = name; | |
| 26 | + } | |
| 27 | + | |
| 28 | + public String getId() { | |
| 29 | + return id; | |
| 30 | + } | |
| 31 | + | |
| 32 | + public void setId(String id) { | |
| 33 | + this.id = id; | |
| 34 | + } | |
| 35 | + | |
| 36 | + public static String getNameById(String id) { | |
| 37 | + for (OptActionEnums e : OptActionEnums.values()) { | |
| 38 | + if(e.getId().equals(id)) | |
| 39 | + { | |
| 40 | + return e.getName(); | |
| 41 | + } | |
| 42 | + } | |
| 43 | + return ""; | |
| 44 | + } | |
| 45 | +} |
platform-dal/src/main/java/com/lyms/platform/pojo/OperateLogModel.java
View file @
2355278
| 1 | +package com.lyms.platform.pojo; | |
| 2 | + | |
| 3 | +import com.lyms.platform.beans.SerialIdEnum; | |
| 4 | +import com.lyms.platform.common.result.BaseModel; | |
| 5 | +import org.springframework.data.mongodb.core.mapping.Document; | |
| 6 | + | |
| 7 | +import java.util.Date; | |
| 8 | +import java.util.List; | |
| 9 | +import java.util.Map; | |
| 10 | + | |
| 11 | +/** | |
| 12 | + * 操作日志模型 | |
| 13 | + * | |
| 14 | + */ | |
| 15 | +@Document(collection = "lyms_operatelog") | |
| 16 | +public class OperateLogModel extends BaseModel { | |
| 17 | + | |
| 18 | + private static final long serialVersionUID = SerialIdEnum.OperateLogModel.getCid(); | |
| 19 | + | |
| 20 | + private String id; | |
| 21 | + | |
| 22 | + //操作人id | |
| 23 | + private Integer operateId; | |
| 24 | + | |
| 25 | + | |
| 26 | + //操作人账号 | |
| 27 | + private String operateAccount; | |
| 28 | + | |
| 29 | + //操作人姓名 | |
| 30 | + private String operateName; | |
| 31 | + | |
| 32 | + //操作医院id | |
| 33 | + private Integer operateHospitalId; | |
| 34 | + | |
| 35 | + //操作前内容 | |
| 36 | + private Object operateBeforeContent; | |
| 37 | + | |
| 38 | + //操作后内容 | |
| 39 | + private Object operateAfterContent; | |
| 40 | + | |
| 41 | + //操作动作 | |
| 42 | + private String operateAction; | |
| 43 | + | |
| 44 | + //操作时间 | |
| 45 | + private Date created; | |
| 46 | + | |
| 47 | + //操作备注 | |
| 48 | + private String operateRemark; | |
| 49 | + | |
| 50 | + public String getId() { | |
| 51 | + return id; | |
| 52 | + } | |
| 53 | + | |
| 54 | + public void setId(String id) { | |
| 55 | + this.id = id; | |
| 56 | + } | |
| 57 | + | |
| 58 | + public Integer getOperateId() { | |
| 59 | + return operateId; | |
| 60 | + } | |
| 61 | + | |
| 62 | + public void setOperateId(Integer operateId) { | |
| 63 | + this.operateId = operateId; | |
| 64 | + } | |
| 65 | + | |
| 66 | + public String getOperateAccount() { | |
| 67 | + return operateAccount; | |
| 68 | + } | |
| 69 | + | |
| 70 | + public void setOperateAccount(String operateAccount) { | |
| 71 | + this.operateAccount = operateAccount; | |
| 72 | + } | |
| 73 | + | |
| 74 | + public String getOperateName() { | |
| 75 | + return operateName; | |
| 76 | + } | |
| 77 | + | |
| 78 | + public void setOperateName(String operateName) { | |
| 79 | + this.operateName = operateName; | |
| 80 | + } | |
| 81 | + | |
| 82 | + public Integer getOperateHospitalId() { | |
| 83 | + return operateHospitalId; | |
| 84 | + } | |
| 85 | + | |
| 86 | + public void setOperateHospitalId(Integer operateHospitalId) { | |
| 87 | + this.operateHospitalId = operateHospitalId; | |
| 88 | + } | |
| 89 | + | |
| 90 | + public Object getOperateBeforeContent() { | |
| 91 | + return operateBeforeContent; | |
| 92 | + } | |
| 93 | + | |
| 94 | + public void setOperateBeforeContent(Object operateBeforeContent) { | |
| 95 | + this.operateBeforeContent = operateBeforeContent; | |
| 96 | + } | |
| 97 | + | |
| 98 | + public Object getOperateAfterContent() { | |
| 99 | + return operateAfterContent; | |
| 100 | + } | |
| 101 | + | |
| 102 | + public void setOperateAfterContent(Object operateAfterContent) { | |
| 103 | + this.operateAfterContent = operateAfterContent; | |
| 104 | + } | |
| 105 | + | |
| 106 | + public String getOperateAction() { | |
| 107 | + return operateAction; | |
| 108 | + } | |
| 109 | + | |
| 110 | + public void setOperateAction(String operateAction) { | |
| 111 | + this.operateAction = operateAction; | |
| 112 | + } | |
| 113 | + | |
| 114 | + public Date getCreated() { | |
| 115 | + return created; | |
| 116 | + } | |
| 117 | + | |
| 118 | + public void setCreated(Date created) { | |
| 119 | + this.created = created; | |
| 120 | + } | |
| 121 | + | |
| 122 | + public String getOperateRemark() { | |
| 123 | + return operateRemark; | |
| 124 | + } | |
| 125 | + | |
| 126 | + public void setOperateRemark(String operateRemark) { | |
| 127 | + this.operateRemark = operateRemark; | |
| 128 | + } | |
| 129 | +} |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OperateLogController.java
View file @
2355278
| 1 | +package com.lyms.platform.operate.web.controller; | |
| 2 | + | |
| 3 | +import com.lyms.platform.common.annotation.TokenRequired; | |
| 4 | +import com.lyms.platform.common.base.BaseController; | |
| 5 | +import com.lyms.platform.common.base.LoginContext; | |
| 6 | +import com.lyms.platform.common.result.BaseResponse; | |
| 7 | +import com.lyms.platform.operate.web.facade.AreaCountFacade; | |
| 8 | +import com.lyms.platform.operate.web.facade.OperateLogFacade; | |
| 9 | +import org.springframework.beans.factory.annotation.Autowired; | |
| 10 | +import org.springframework.stereotype.Controller; | |
| 11 | +import org.springframework.web.bind.annotation.RequestMapping; | |
| 12 | +import org.springframework.web.bind.annotation.RequestMethod; | |
| 13 | +import org.springframework.web.bind.annotation.RequestParam; | |
| 14 | +import org.springframework.web.bind.annotation.ResponseBody; | |
| 15 | + | |
| 16 | +import javax.servlet.http.HttpServletRequest; | |
| 17 | +import javax.servlet.http.HttpServletResponse; | |
| 18 | + | |
| 19 | +/** | |
| 20 | + * | |
| 21 | + * 操作日志 | |
| 22 | + * lqy | |
| 23 | + */ | |
| 24 | +@Controller | |
| 25 | +public class OperateLogController extends BaseController { | |
| 26 | + | |
| 27 | + @Autowired | |
| 28 | + private OperateLogFacade operateLogFacade; | |
| 29 | + | |
| 30 | + | |
| 31 | + @RequestMapping(method = RequestMethod.GET,value = "/getOptLogList") | |
| 32 | + @ResponseBody | |
| 33 | + @TokenRequired | |
| 34 | + public BaseResponse getOptLogList(HttpServletRequest request) { | |
| 35 | + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); | |
| 36 | + return null; | |
| 37 | + } | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | +} |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
View file @
2355278
| ... | ... | @@ -107,10 +107,11 @@ |
| 107 | 107 | private SieveService sieveService; |
| 108 | 108 | @Autowired |
| 109 | 109 | private OrganizationGroupsFacade groupsFacade; |
| 110 | -// @Autowired | |
| 111 | -// private OperateLogFacade operateLogFacade; | |
| 112 | 110 | |
| 113 | 111 | @Autowired |
| 112 | + private OperateLogFacade operateLogFacade; | |
| 113 | + | |
| 114 | + @Autowired | |
| 114 | 115 | private AutoIncermentService autoIncermentService; |
| 115 | 116 | |
| 116 | 117 | @Autowired |
| ... | ... | @@ -251,7 +252,7 @@ |
| 251 | 252 | patient.setOperator(userId); |
| 252 | 253 | Patients p = yunBookbuildingService.addPregnantBookbuilding(patient); |
| 253 | 254 | |
| 254 | -// operateLogFacade.addOptLog(userId,Integer.valueOf(yunRequest.getHospitalId()),JsonUtil.array2JsonString(p),"",OptActionEnums.ADD.getId(),""); | |
| 255 | + operateLogFacade.addOptLog(userId,Integer.valueOf(yunRequest.getHospitalId()),JsonUtil.array2JsonString(p),"",OptActionEnums.ADD.getId(),""); | |
| 255 | 256 | |
| 256 | 257 | /** 孕妇建档后把所有以前未使用的优惠券作废 */ |
| 257 | 258 | couponService.invalid(p.getPid(), "1,2,3,4,5,6,7,8"); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/OperateLogFacade.java
View file @
2355278
| 1 | +package com.lyms.platform.operate.web.facade; | |
| 2 | + | |
| 3 | + | |
| 4 | +import com.lyms.platform.biz.service.OperateLogService; | |
| 5 | +import com.lyms.platform.permission.model.Users; | |
| 6 | +import com.lyms.platform.permission.model.UsersQuery; | |
| 7 | +import com.lyms.platform.permission.service.UsersService; | |
| 8 | +import com.lyms.platform.pojo.OperateLogModel; | |
| 9 | +import org.apache.commons.collections.CollectionUtils; | |
| 10 | +import org.springframework.beans.factory.annotation.Autowired; | |
| 11 | +import org.springframework.stereotype.Component; | |
| 12 | + | |
| 13 | +import java.util.Date; | |
| 14 | +import java.util.List; | |
| 15 | + | |
| 16 | + | |
| 17 | +/** | |
| 18 | + * | |
| 19 | + */ | |
| 20 | +@Component | |
| 21 | +public class OperateLogFacade { | |
| 22 | + | |
| 23 | + @Autowired | |
| 24 | + private OperateLogService operateLogService; | |
| 25 | + | |
| 26 | + @Autowired | |
| 27 | + private UsersService usersService; | |
| 28 | + | |
| 29 | + public void addOptLog(Integer userId,Integer hospitalId, | |
| 30 | + Object operateBeforeContent, | |
| 31 | + Object operateAfterContent, | |
| 32 | + String operateAction, | |
| 33 | + String operateRemark) | |
| 34 | + { | |
| 35 | + | |
| 36 | + OperateLogModel model = new OperateLogModel(); | |
| 37 | + | |
| 38 | + UsersQuery usersQuery = new UsersQuery(); | |
| 39 | + usersQuery.setId(userId); | |
| 40 | + List<Users> list = usersService.queryUsers(usersQuery); | |
| 41 | + if (CollectionUtils.isNotEmpty(list)) | |
| 42 | + { | |
| 43 | + Users users = list.get(0); | |
| 44 | + model.setOperateId(users.getId()); | |
| 45 | + model.setOperateAccount(users.getAccount()); | |
| 46 | + model.setOperateName(users.getName()); | |
| 47 | + } | |
| 48 | + | |
| 49 | + model.setOperateAction(operateAction); | |
| 50 | + model.setOperateAfterContent(operateAfterContent); | |
| 51 | + model.setOperateBeforeContent(operateBeforeContent); | |
| 52 | + model.setOperateRemark(operateRemark); | |
| 53 | + | |
| 54 | + model.setOperateHospitalId(hospitalId); | |
| 55 | + | |
| 56 | + model.setCreated(new Date()); | |
| 57 | + | |
| 58 | + operateLogService.addOptLog(model); | |
| 59 | + } | |
| 60 | + | |
| 61 | +} |