liupeng 4 years ago
parent
commit
b917f3edbf

+ 6 - 1
code/sapparent/sapservice/src/main/java/org/fouram/job/MessageJob.java

@@ -3,7 +3,9 @@ package org.fouram.job;
 import java.util.List;
 
 import org.fouram.core.util.LoggerUtil;
+import org.fouram.entity.SapMessageUser;
 import org.fouram.entity.SapUser;
+import org.fouram.service.SapMessageUserService;
 import org.fouram.service.SapUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -13,9 +15,12 @@ public class MessageJob {
 
 	@Autowired
 	private SapUserService sapUserService;
+	@Autowired
+	private SapMessageUserService sapMessageUserService;
 
 	public void taskBiz() {
 		try {
+			List<SapMessageUser> messageUsers = sapMessageUserService.selectList();
 			List<SapUser> sapUsers = sapUserService.selectNotSendEntryMessageList();
 			StringBuffer messageContent = null;
 			for (SapUser sapUser : sapUsers) {
@@ -23,7 +28,7 @@ public class MessageJob {
 				messageContent.append("有一个新员工入职,待同步企业微信").append("\n").append("员工姓名:").append(sapUser.getName())
 						.append("\n").append("手机号:").append(sapUser.getFormatMobile()).append("\n").append("邮箱:")
 						.append(sapUser.getRealEmail()).append("\n").append(getSyncUrl());
-				sapUserService.sendEntryMessage(messageContent.toString(), sapUser);
+				sapUserService.sendEntryMessage(messageContent.toString(), sapUser, messageUsers);
 			}
 		} catch (Exception e) {
 			LoggerUtil.error(e);

+ 6 - 2
code/sapparent/sapservice/src/main/java/org/fouram/service/SapUserService.java

@@ -23,6 +23,7 @@ import org.fouram.dto.input.GetIngoreListDTO;
 import org.fouram.dto.input.GetToBeConfirmedListDTO;
 import org.fouram.dto.output.GetIngoreListOutput;
 import org.fouram.dto.output.GetToBeConfirmedListOutput;
+import org.fouram.entity.SapMessageUser;
 import org.fouram.entity.SapOrg;
 import org.fouram.entity.SapUser;
 import org.fouram.entity.WxUser;
@@ -488,8 +489,11 @@ public class SapUserService extends BaseService {
 	}
 
 	@Transactional
-	public void sendEntryMessage(String messageContent, SapUser sapUser) throws Exception {
-		WXCpMessageUtil.send(messageContent, "1000001");
+	public void sendEntryMessage(String messageContent, SapUser sapUser, List<SapMessageUser> sapMessageUsers)
+			throws Exception {
+		for (SapMessageUser sapMessageUser : sapMessageUsers) {
+			WXCpMessageUtil.send(messageContent, sapMessageUser.getUserId());
+		}
 		updateSendEntryMessageFlag(sapUser.getUserId(), true);
 	}