liupeng 4 years ago
parent
commit
69f4046d5c

+ 8 - 0
code/sapparent/sapservice/src/main/java/org/fouram/entity/SapMessageUser.java

@@ -1,9 +1,12 @@
 package org.fouram.entity;
 
 import java.io.Serializable;
+import java.util.Date;
 
 import org.apache.ibatis.type.Alias;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -18,4 +21,9 @@ public class SapMessageUser implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	private String userId;
+	
+	private String name;
+	
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private Date createDate;
 }

+ 2 - 5
code/sapparent/sapservice/src/main/java/org/fouram/job/MessageSchedule.java

@@ -30,15 +30,12 @@ public class MessageSchedule {
 				messageContent = new StringBuffer();
 				messageContent.append("有一个新员工入职,待同步企业微信").append("\n").append("员工姓名:").append(sapUser.getName())
 						.append("\n").append("手机号:").append(sapUser.getFormatMobile()).append("\n").append("邮箱:")
-						.append(sapUser.getRealEmail()).append("\n").append(getSyncUrl());
+						.append(sapUser.getRealEmail()).append("\n")
+						.append("<a href=\"https://studybom.suggest.vip/#/userSync/list\">立即同步</a>");
 				sapUserService.sendEntryMessage(messageContent.toString(), sapUser, messageUsers);
 			}
 		} catch (Exception e) {
 			LoggerUtil.error(e);
 		}
 	}
-
-	private static String getSyncUrl() {
-		return String.format("<a href=\"%s\">立即同步</a>", "https://studybom.suggest.vip/#/userSync/list");
-	}
 }

+ 2 - 1
code/sapparent/sapservice/src/main/java/org/fouram/mapper/SapMessageUserMapper.xml

@@ -6,7 +6,8 @@
 	</select>
 
 	<insert id="saveOne">
-		insert into sap_message_user(userId) values (#{userId})
+		insert into sap_message_user(userId, name, createDate)
+		 values (#{userId}, #{name}, #{createDate})
 	</insert>
 	
 	<select id="selectByUserId" resultType="SapMessageUser">

+ 12 - 5
code/sapparent/sapservice/src/main/java/org/fouram/service/SapMessageUserService.java

@@ -1,26 +1,33 @@
 package org.fouram.service;
 
+import java.util.Date;
 import java.util.List;
 
 import org.fouram.core.base.service.BaseService;
 import org.fouram.entity.SapMessageUser;
+import org.fouram.entity.SapUser;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
 public class SapMessageUserService extends BaseService {
-	
+
+	@Autowired
+	private SapUserService sapUserService;
+
 	@SuppressWarnings("unchecked")
 	public List<SapMessageUser> selectList() throws Exception {
 		return (List<SapMessageUser>) findList("SapMessageUserMapper.selectList", null);
 	}
 
 	public void saveOne(String userId) throws Exception {
-		SapMessageUser entity = selectByUserId(userId);
-		if(entity != null) {
+		SapMessageUser sapMessageUser = selectByUserId(userId);
+		if (sapMessageUser != null) {
 			throwPromptException("该用户已保存");
 		}
-		entity = SapMessageUser.builder().userId(userId).build();
-		save("SapMessageUserMapper.saveOne", entity);
+		SapUser sapUser = sapUserService.selectByUserId(userId);
+		sapMessageUser = SapMessageUser.builder().userId(userId).name(sapUser.getName()).createDate(new Date()).build();
+		save("SapMessageUserMapper.saveOne", sapMessageUser);
 	}
 
 	public SapMessageUser selectByUserId(String userId) throws Exception {