操作手册

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CooperationOrganServiceImpl.java

@@ -82,16 +82,13 @@ public class CooperationOrganServiceImpl extends BaseServiceImpl<Integer, Cooper
 			List<MusicGroup> musicGroupList = musicGroupDao.findByCooperationId(cooperationOrgan.getId());
 			if(musicGroupList.size() > 0){
 				for (MusicGroup musicGroup : musicGroupList) {
-					//乐团主管有变更
-					if(!cooperationOrgan.getEducationUserId().equals(musicGroup.getEducationalTeacherId())){
-						//不是导入的乐团
-						if(musicGroup.getId().length() > 10){
-							//是否有预报名的群聊
-							ImGroup imGroup = imGroupService.get(Long.parseLong(musicGroup.getId()));
-							if(imGroup != null){
-								imGroupMemberService.quit(Long.parseLong(musicGroup.getId()),musicGroup.getEducationalTeacherId());
-								imGroupMemberService.join(Long.parseLong(musicGroup.getId()),cooperationOrgan.getEducationUserId(),"乐团主管",false);
-							}
+					//不是导入的乐团
+					if(musicGroup.getId().length() > 10){
+						//是否有预报名的群聊
+						ImGroup imGroup = imGroupService.get(Long.parseLong(musicGroup.getId()));
+						if(imGroup != null){
+							imGroupMemberService.quit(Long.parseLong(musicGroup.getId()),musicGroup.getEducationalTeacherId());
+							imGroupMemberService.join(Long.parseLong(musicGroup.getId()),cooperationOrgan.getEducationUserId(),"乐团主管",false);
 						}
 					}
 				}

mec-common/audit-log/src/main/java/com/yonge/log/dal/dao/OperationLogDao.java

@@ -0,0 +1,15 @@
+package com.yonge.log.dal.dao;
+
+import com.yonge.log.dal.model.OperationLog;
+import com.yonge.mongodb.dao.BaseDaoWithMongo;
+import org.springframework.stereotype.Component;
+
+@Component
+public class OperationLogDao extends BaseDaoWithMongo<String, OperationLog> {
+
+	@Override
+	public Class<OperationLog> getClassEntity() {
+		return OperationLog.class;
+	}
+
+}

mec-common/audit-log/src/main/java/com/yonge/log/dal/model/OperationLog.java

@@ -0,0 +1,81 @@
+package com.yonge.log.dal.model;
+
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+import java.io.Serializable;
+
+@Document(collection = "sys_operation_log")
+public class OperationLog implements Serializable {
+
+	@Id
+	private String id;
+
+	private String username;
+
+	private Integer userId;
+
+	private String operateName;
+
+	private String interfaceUrl;
+
+	private String operateTime;
+
+	private String token;
+
+	public Integer getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Integer userId) {
+		this.userId = userId;
+	}
+
+	public String getToken() {
+		return token;
+	}
+
+	public void setToken(String token) {
+		this.token = token;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getUsername() {
+		return username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	public String getOperateName() {
+		return operateName;
+	}
+
+	public void setOperateName(String operateName) {
+		this.operateName = operateName;
+	}
+
+	public String getInterfaceUrl() {
+		return interfaceUrl;
+	}
+
+	public void setInterfaceUrl(String interfaceUrl) {
+		this.interfaceUrl = interfaceUrl;
+	}
+
+	public String getOperateTime() {
+		return operateTime;
+	}
+
+	public void setOperateTime(String operateTime) {
+		this.operateTime = operateTime;
+	}
+}

mec-common/audit-log/src/main/java/com/yonge/log/service/OperationLogService.java

@@ -0,0 +1,8 @@
+package com.yonge.log.service;
+
+import com.yonge.log.dal.model.OperationLog;
+import com.yonge.mongodb.service.BaseServiceWithMongo;
+
+public interface OperationLogService extends BaseServiceWithMongo<String, OperationLog> {
+
+}

mec-common/audit-log/src/main/java/com/yonge/log/service/impl/AuditLogServiceImpl.java

@@ -2,7 +2,6 @@ package com.yonge.log.service.impl;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
 import com.yonge.log.dal.dao.AuditLogDao;
 import com.yonge.log.dal.model.AuditLog;
 import com.yonge.log.service.AuditLogService;

mec-common/audit-log/src/main/java/com/yonge/log/service/impl/OperationLogServiceImpl.java

@@ -0,0 +1,22 @@
+package com.yonge.log.service.impl;
+
+import com.yonge.log.dal.dao.OperationLogDao;
+import com.yonge.log.dal.model.OperationLog;
+import com.yonge.log.service.OperationLogService;
+import com.yonge.mongodb.dao.BaseDaoWithMongo;
+import com.yonge.mongodb.service.impl.BaseServiceImplWithMongo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class OperationLogServiceImpl extends BaseServiceImplWithMongo<String, OperationLog> implements OperationLogService {
+
+	@Autowired
+	private OperationLogDao operationLogDao;
+
+	@Override
+	public BaseDaoWithMongo<String, OperationLog> getDAO() {
+		return operationLogDao;
+	}
+
+}

mec-web/src/main/java/com/ym/mec/web/controller/OperationLogController.java

@@ -0,0 +1,37 @@
+package com.ym.mec.web.controller;
+
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.util.date.DateUtil;
+import com.yonge.log.dal.model.OperationLog;
+import com.yonge.log.service.OperationLogService;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+
+@RequestMapping("operationLog")
+@Api(tags = "操作手册日志")
+@RestController
+public class OperationLogController extends BaseController {
+
+	@Autowired
+	private OperationLogService operationLogService;
+	@Autowired
+	private SysUserFeignService sysUserFeignService;
+
+	@GetMapping("/save")
+	public Object save(OperationLog operationLog) {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		operationLog.setUserId(sysUser.getId());
+		operationLog.setUsername(sysUser.getRealName());
+		operationLog.setOperateTime(DateUtil.format(new Date(),DateUtil.EXPANDED_DATE_TIME_FORMAT));
+		operationLogService.insert(operationLog);
+		return succeed();
+	}
+
+}